paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							002163fbdc
							
						
					 | 
					
						
						
							
							修复商品索引生成报错问题
						
						
						
						
						
						
					 | 
					
						2022-08-02 15:21:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							da9ea504fb
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2022-08-02 15:15:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb171f6e23
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
						
						# Conflicts:
#	framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java 
						
						
					 | 
					
						2022-08-02 10:57:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b860c2eed0
							
						
					 | 
					
						
						
							
							优化结构
						
						
						
						
						
						
					 | 
					
						2022-08-02 10:52:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdf81d1b39
							
						
					 | 
					
						
						
							
							分词问题优化
						
						
						
						
						
						
					 | 
					
						2022-08-02 10:51:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							40bf6d3010
							
						
					 | 
					
						
						
							
							优化获取秒杀活动
						
						
						
						
						
						
					 | 
					
						2022-07-27 22:13:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed976e90dc
							
						
					 | 
					
						
						
							
							优化促销验证商品,检查商品是否可以参与促销
						
						
						
						
						
						
					 | 
					
						2022-07-27 17:21:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2a923809e
							
						
					 | 
					
						
						
							
							add transactional
						
						
						
						
						
						
					 | 
					
						2022-07-27 12:06:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							99479e722a
							
						
					 | 
					
						
						
							
							修复小程序注册用户没有发送会员注册信息问题
						
						
						
						
						
						
					 | 
					
						2022-07-26 19:18:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0eebc544a6
							
						
					 | 
					
						
						
							
							修复积分商品购买时,价格问题
						
						
						
						
						
						
					 | 
					
						2022-07-25 20:52:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ec2c1b943
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2022-07-21 11:52:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6edb93403
							
						
					 | 
					
						
						
							
							优化代码,修复自动生成的es分词无效问题
						
						
						
						
						
						
					 | 
					
						2022-07-21 11:52:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3236a05ae9
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2022-07-19 18:45:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							5576ae7305
							
						
					 | 
					
						
						
							
							解决 lilishop4.2.4中存在序列化购物车,促销信息会在序列化后丢失,无法反序列化。
						
						
						
						
						
						
					 | 
					
						2022-07-19 18:45:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5aadf6926
							
						
					 | 
					
						
						
							
							店铺入驻分批保存可能存在无法入住问题解决
						
						
						
						
						
						
					 | 
					
						2022-07-19 18:38:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							2eb469b228
							
						
					 | 
					
						
						
							
							improve code
						
						
						
						
						
						
					 | 
					
						2022-07-19 15:24:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							088c6faae1
							
						
					 | 
					
						
						
							
							店铺保存问题处理,解决可能存在多次入驻店铺无法申请失败问题
						
						
						
						
						
						
					 | 
					
						2022-07-19 15:15:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							950274f6be
							
						
					 | 
					
						
						
							
							优化商品索引的促销信息生成。优化批量生成分词
						
						
						
						
						
						
					 | 
					
						2022-07-18 19:06:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cbbc57514
							
						
					 | 
					
						
						
							
							更新部分es日志
						
						
						
						
						
						
					 | 
					
						2022-07-18 12:11:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8041a4a4fc
							
						
					 | 
					
						
						
							
							店铺退款流水金额计算错误
						
						
						
						
						
						
					 | 
					
						2022-07-15 14:27:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7de49dcfb8
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2022-07-13 20:03:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b21e307640
							
						
					 | 
					
						
						
							
							优化保存楼层装修。优化管理端优惠券搜索
						
						
						
						
						
						
					 | 
					
						2022-07-13 20:03:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							aae7eedd49
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2022-07-13 19:06:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bce60310c5
							
						
					 | 
					
						
						
							
							minio增加字段,可配置前端访问地址。endpoint可以继续走局域网ip
						
						
						
						
						
						
					 | 
					
						2022-07-13 19:05:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b25a03b1d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2022-07-12 17:13:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							682433efe4
							
						
					 | 
					
						
						
							
							修复批发商品订单下单时,订单单项价格错误问题
						
						
						
						
						
						
					 | 
					
						2022-07-12 17:13:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6f28d67eb
							
						
					 | 
					
						
						
							
							代码格式化一下
						
						
						
						
						
						
					 | 
					
						2022-07-12 10:17:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c663aa2799
							
						
					 | 
					
						
						
							
							minio上传失败前端无感知问题处理
						
						
						
						
						
						
					 | 
					
						2022-07-11 18:53:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c02b816b5
							
						
					 | 
					
						
						
							
							一个分销时间展示以及一个字段没有正确的存储值问题处理
						
						
						
						
						
						
					 | 
					
						2022-07-11 18:52:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zypy333
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d185b548f7
							
						
					 | 
					
						
						
							
							update framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java.
						
						
						
						
						
						
						
						抛出返回码错误 
						
						
					 | 
					
						2022-07-08 03:57:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							13a7a875a4
							
						
					 | 
					
						
						
							
							优化取消订单生成店铺流水
						
						
						
						
						
						
					 | 
					
						2022-07-07 18:10:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8792e9e27
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2022-07-07 17:25:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							82a0cd0336
							
						
					 | 
					
						
						
							
							增加取消订单生成店铺流水,优化代码
						
						
						
						
						
						
					 | 
					
						2022-07-07 17:25:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							60ae5b8965
							
						
					 | 
					
						
						
							
							后台用户编辑问题处理
						
						
						
						
						
						
					 | 
					
						2022-07-06 17:30:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d4b54ec36
							
						
					 | 
					
						
						
							
							分销订单0元佣金记录订单问题处理
						
						
						
						
						
						
					 | 
					
						2022-07-06 16:41:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							53f6910a34
							
						
					 | 
					
						
						
							
							积分商品不允许使用优惠券
						
						
						
						
						
						
					 | 
					
						2022-07-06 15:57:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							727ddd3198
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2022-07-04 18:31:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b535434ae
							
						
					 | 
					
						
						
							
							代码优化,修复订单投诉问题
						
						
						
						
						
						
					 | 
					
						2022-07-04 18:31:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							40e9d6f392
							
						
					 | 
					
						
						
							
							时间不归零导致无法展示订单统计历史数据
						
						
						
						
						
						
					 | 
					
						2022-07-01 15:36:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zypy333
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a28547c581
							
						
					 | 
					
						
						
							
							update framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java.
						
						
						
						
						
						
						
						修正错别字 
						
						
					 | 
					
						2022-06-29 03:10:05 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							60a210a45f
							
						
					 | 
					
						
						
							
							优化生成索引时,自动将分词信息添加到分词表
						
						
						
						
						
						
					 | 
					
						2022-06-29 09:33:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							170aa01946
							
						
					 | 
					
						
						
							
							变更购物车会导致优惠券金额错误问题处理
						
						
						
						
						
						
					 | 
					
						2022-06-27 17:57:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f4c8e5d493
							
						
					 | 
					
						
						
							
							!200 优化商品索引,如数据库中无当前商品则删除商品索引
						
						
						
						
						
						
						
						Merge pull request !200 from OceansDeep/feature/pg 
						
						
					 | 
					
						2022-06-23 01:58:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3a0a402d7
							
						
					 | 
					
						
						
							
							优化监听事务提交发送mq事件,为订单变更发送mq增加事务提交监听
						
						
						
						
						
						
					 | 
					
						2022-06-23 09:55:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8fbc7b9f5c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2022-06-23 09:11:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c2e73b5f5
							
						
					 | 
					
						
						
							
							调整es日志级别
						
						
						
						
						
						
					 | 
					
						2022-06-23 09:11:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a221eefe3
							
						
					 | 
					
						
						
							
							优化商品索引,如数据库中无当前商品则删除商品索引
						
						
						
						
						
						
					 | 
					
						2022-06-22 18:42:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f01236cc96
							
						
					 | 
					
						
						
							
							优化监听事务提交发送mq事件,为订单变更发送mq增加事务提交监听
						
						
						
						
						
						
					 | 
					
						2022-06-22 17:44:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad1f5a297e
							
						
					 | 
					
						
						
							
							修复获取会员钱包可能发生的异常
						
						
						
						
						
						
					 | 
					
						2022-06-22 17:32:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							96697e11fd
							
						
					 | 
					
						
						
							
							优化监听事务提交发送mq事件,为订单变更发送mq增加事务提交监听
						
						
						
						
						
						
					 | 
					
						2022-06-22 17:31:26 +08:00 | 
					
					
						
						
							
							
							
						
					 |