Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1e70ebf12
							
						
					 | 
					
						
						
							
							促销金额大于商品金额的极端情况显示问题处理
						
						
						
						
						
						
					 | 
					
						2021-12-24 15:46:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b648aa94b3
							
						
					 | 
					
						
						
							
							修复首次发布商品不会生成商品索引问题;代码优化;修复bug;
						
						
						
						
						
						
					 | 
					
						2021-12-24 14:59:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e864043a6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-12-24 11:13:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4a07b2911
							
						
					 | 
					
						
						
							
							修复文章内容编辑无格式问题
						
						
						
						
						
						
					 | 
					
						2021-12-23 19:22:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdfeb5dbdc
							
						
					 | 
					
						
						
							
							修复更新订单的售后商品数量时,传递goodsId改成goodsSkuId
						
						
						
						
						
						
					 | 
					
						2021-12-23 17:17:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							40bc890870
							
						
					 | 
					
						
						
							
							空品牌问题处理
						
						
						
						
						
						
					 | 
					
						2021-12-23 15:27:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							18874e3755
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-12-23 13:59:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3d2b84ecb
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-12-23 11:58:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f16a5c791
							
						
					 | 
					
						
						
							
							各个应用微信支付配置分开
						
						
						
						
						
						
					 | 
					
						2021-12-23 11:58:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f086a58096
							
						
					 | 
					
						
						
							
							添加xss过滤sell关键字
						
						
						
						
						
						
					 | 
					
						2021-12-23 10:58:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							dfcf71aec7
							
						
					 | 
					
						
						
							
							移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
						
						
						
						
						
						
					 | 
					
						2021-12-23 10:55:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0736f1c550
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-12-23 08:17:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdd1195d20
							
						
					 | 
					
						
						
							
							修复管理员上下架商品报错问题
						
						
						
						
						
						
					 | 
					
						2021-12-23 08:17:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5511d5c09
							
						
					 | 
					
						
						
							
							订单联合查询将innerjoin 修改为 left join
						
						
						
						
						
						
					 | 
					
						2021-12-22 17:57:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							7634801f7c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
						
						# Conflicts:
#	framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java 
						
						
					 | 
					
						2021-12-22 17:04:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							1db86f2865
							
						
					 | 
					
						
						
							
							es中商品索引信息,以及虚拟商品会携带大量优惠券信息下单问题处理
						
						
						
						
						
						
					 | 
					
						2021-12-22 17:00:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							787617f504
							
						
					 | 
					
						
						
							
							修复结算时促销为空的问题
						
						
						
						
						
						
					 | 
					
						2021-12-22 16:50:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							3fb4e488bb
							
						
					 | 
					
						
						
							
							!85 修复结算时无促销报错问题
						
						
						
						
						
						
						
						Merge pull request !85 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-12-22 07:40:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5187a63b9
							
						
					 | 
					
						
						
							
							修复结算时无促销报错问题
						
						
						
						
						
						
					 | 
					
						2021-12-22 15:34:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5f725cf16
							
						
					 | 
					
						
						
							
							索引初始化对商品删除与否增加判定
						
						
						
						
						
						
					 | 
					
						2021-12-22 12:51:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d56c9cc81
							
						
					 | 
					
						
						
							
							商品非空判定处理
						
						
						
						
						
						
					 | 
					
						2021-12-22 12:42:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ae1ae5df4
							
						
					 | 
					
						
						
							
							如果无法获取到消息,则不记录足迹,不再抛出异常
						
						
						
						
						
						
					 | 
					
						2021-12-22 12:27:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0c530adad
							
						
					 | 
					
						
						
							
							增加对商品为空的判定
						
						
						
						
						
						
					 | 
					
						2021-12-22 12:22:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e962a594ba
							
						
					 | 
					
						
						
							
							商品信息获取逻辑调整
						
						
						
						
						
						
					 | 
					
						2021-12-22 12:13:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dfffd60b8
							
						
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2021-12-21 18:56:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ba4d24041
							
						
					 | 
					
						
						
							
							优化促销。移除结算时促销的依赖。规范部分isxxx字段命名
						
						
						
						
						
						
					 | 
					
						2021-12-21 18:54:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e99d0f45fd
							
						
					 | 
					
						
						
							
							修改一个错误的非空判断
						
						
						
						
						
						
					 | 
					
						2021-12-21 16:59:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							351745d31f
							
						
					 | 
					
						
						
							
							促销类型错误的写入一个促销状态字段问题处理
						
						
						
						
						
						
					 | 
					
						2021-12-21 16:08:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfa960d803
							
						
					 | 
					
						
						
							
							管理端商品上下架问题处理
						
						
						
						
						
						
					 | 
					
						2021-12-21 14:47:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							7572e8d56f
							
						
					 | 
					
						
						
							
							解决如果商品sku参数为空等异常情况导致无法发布的问题
						
						
						
						
						
						
					 | 
					
						2021-12-21 11:33:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							23b3e72579
							
						
					 | 
					
						
						
							
							'商品es初始化索引问题'
						
						
						
						
						
						
					 | 
					
						2021-12-20 14:56:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							bda7a12c2a
							
						
					 | 
					
						
						
							
							'商品es索引初始化问题'
						
						
						
						
						
						
					 | 
					
						2021-12-20 14:38:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8f44ef6f2
							
						
					 | 
					
						
						
							
							短信验证码缓存key未包含uuid问题处理
						
						
						
						
						
						
					 | 
					
						2021-12-20 09:37:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dcdb43acf
							
						
					 | 
					
						
						
							
							优化促销相关代码,修复bug
						
						
						
						
						
						
					 | 
					
						2021-12-16 15:02:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0b43ddd32
							
						
					 | 
					
						
						
							
							修复查询积分商品参数问题
						
						
						
						
						
						
					 | 
					
						2021-12-15 17:58:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ef244b373
							
						
					 | 
					
						
						
							
							移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
						
						
						
						
						
						
					 | 
					
						2021-12-15 17:42:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							2536e3b9f6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-12-15 17:32:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7aed7254a0
							
						
					 | 
					
						
						
							
							修复查询积分商品参数问题
						
						
						
						
						
						
					 | 
					
						2021-12-15 17:31:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							44e061f321
							
						
					 | 
					
						
						
							
							!79 修复商品审核关闭后,修改商品不生成索引问题。升级mybatis-plus和hutool版本
						
						
						
						
						
						
						
						Merge pull request !79 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-12-15 03:37:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9ddcfeb95
							
						
					 | 
					
						
						
							
							修复商品审核关闭后,修改商品不生成索引问题。升级mybatis-plus版本至 3.4.3.4 和hutool版本至 5.7.16。适配新版本mybatis-plus
						
						
						
						
						
						
					 | 
					
						2021-12-15 11:35:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							822e332aaa
							
						
					 | 
					
						
						
							
							!78 移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
						
						
						
						
						
						
						
						Merge pull request !78 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-12-13 10:18:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3fbad7dbf
							
						
					 | 
					
						
						
							
							移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
						
						
						
						
						
						
					 | 
					
						2021-12-13 18:15:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							07348357d0
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-12-13 16:22:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							947fc457f2
							
						
					 | 
					
						
						
							
							修改im平台id字段类型为string
						
						
						
						
						
						
					 | 
					
						2021-12-13 16:21:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							b719e96838
							
						
					 | 
					
						
						
							
							!77 修复获取拼团订单时,搜索条件默认锁定了当前会员id问题
						
						
						
						
						
						
						
						Merge pull request !77 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-12-13 06:50:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							cafeb1f20f
							
						
					 | 
					
						
						
							
							修复获取拼团订单时,搜索条件默认锁定了当前会员id问题
						
						
						
						
						
						
					 | 
					
						2021-12-13 14:49:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ae798a11a
							
						
					 | 
					
						
						
							
							!76 修复无登录用户时,查询报错
						
						
						
						
						
						
						
						Merge pull request !76 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-12-13 04:28:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d188068b10
							
						
					 | 
					
						
						
							
							修复无登录用户时,查询报错
						
						
						
						
						
						
					 | 
					
						2021-12-13 12:27:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							abb4b8cb66
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-12-13 09:32:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef8615cfe5
							
						
					 | 
					
						
						
							
							支付时间为空问题处理
						
						
						
						
						
						
					 | 
					
						2021-12-13 09:32:10 +08:00 | 
					
					
						
						
							
							
							
						
					 |