OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							48a2502467
							
						
					 | 
					
						
						
							
							!24 fix seckill abnormal open
						
						
						
						
						
						
						
						Merge pull request !24 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-09-10 02:38:13 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							47620a61ef
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-10 10:37:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f44e787f72
							
						
					 | 
					
						
						
							
							fix seckill abnormal open
						
						
						
						
						
						
					 | 
					
						2021-09-10 10:36:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae745ef518
							
						
					 | 
					
						
						
							
							手机号敏感信息过滤
						
						
						
						
						
						
					 | 
					
						2021-09-09 17:01:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							11baa30a9a
							
						
					 | 
					
						
						
							
							!23 fix XSS and BAC, improve code style
						
						
						
						
						
						
						
						Merge pull request !23 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-09-09 08:50:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b7be69c6c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-09 16:47:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3e1de5620
							
						
					 | 
					
						
						
							
							fix XSS and BAC, improve code style
						
						
						
						
						
						
					 | 
					
						2021-09-09 16:47:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8784da3449
							
						
					 | 
					
						
						
							
							h5 微信登录后支付问题。
						
						
						
						
						
						
					 | 
					
						2021-09-09 14:01:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							006218e15a
							
						
					 | 
					
						
						
							
							活动判定问题,暂时注释处理
						
						
						
						
						
						
					 | 
					
						2021-09-08 15:15:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d470192ac6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-08 11:29:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							97cac9916d
							
						
					 | 
					
						
						
							
							!22 improve and fix
						
						
						
						
						
						
						
						Merge pull request !22 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-09-06 18:06:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf6b1a60f4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-07 02:05:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fcdbe8df9
							
						
					 | 
					
						
						
							
							fix settlement seckill promotion is not punctuality
						
						
						
						
						
						
					 | 
					
						2021-09-07 02:04:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							4063c8b063
							
						
					 | 
					
						
						
							
							improve esGoods parameter selector buckets(not get category and brand from db, add EsGoodsIndex Field BrandName,BrandUrl,CategoryNamePath)
						
						
						
						
						
						
					 | 
					
						2021-09-07 01:55:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d84f3b547b
							
						
					 | 
					
						
						
							
							订单取消会员积分返回判定问题处理
						
						
						
						
						
						
					 | 
					
						2021-09-06 15:11:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							80492903ae
							
						
					 | 
					
						
						
							
							修改数据库文件夹名称
						
						
						
						
						
						
					 | 
					
						2021-09-03 16:13:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c6d7162e8
							
						
					 | 
					
						
						
							
							增加一个sql的readme文件
						
						
						
						
						
						
					 | 
					
						2021-09-03 16:13:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							daa0320d78
							
						
					 | 
					
						
						
							
							尝试解决最新版本打包报错问题
						
						
						
						
						
						
					 | 
					
						2021-09-02 15:18:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							82d7ab1440
							
						
					 | 
					
						
						
							
							代码错误补充
						
						
						
						
						
						
					 | 
					
						2021-09-02 15:05:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							315ab4d132
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-09-02 14:47:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a08373d6a8
							
						
					 | 
					
						
						
							
							使用绑定满减活动的优惠券无法正常使用问题处理
						
						
						
						
						
						
					 | 
					
						2021-09-02 14:38:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ac15d1abe
							
						
					 | 
					
						
						
							
							!21 升级spring boot 版本,完善Elasticsearch搜索
						
						
						
						
						
						
						
						Merge pull request !21 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-09-02 03:44:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f10b6b2a6
							
						
					 | 
					
						
						
							
							improvement generator goods index to asynchronization
						
						
						
						
						
						
					 | 
					
						2021-09-02 11:40:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9f0eac6f7
							
						
					 | 
					
						
						
							
							默认收货地址代码优化。
						
						
						
						
						
						
						
						积分商品/砍价商品库存问题处理 
						
						
					 | 
					
						2021-09-02 10:00:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe675d6ac4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-02 09:07:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb006e13a0
							
						
					 | 
					
						
						
							
							拼团活动同一店铺同一时间限制一个活动取消。
						
						
						
						
						
						
						
						积分订单库存扣减,积分返还处理。
其他促销相关优化 
						
						
					 | 
					
						2021-09-01 19:10:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							318cc04566
							
						
					 | 
					
						
						
							
							add order by goods parameters field sort to aggregation elasticsearch
						
						
						
						
						
						
					 | 
					
						2021-09-01 19:07:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e80478203
							
						
					 | 
					
						
						
							
							upgrade spring boot 2.3 to 2.4
						
						
						
						
						
						
					 | 
					
						2021-09-01 19:03:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							42e9ee06f4
							
						
					 | 
					
						
						
							
							优惠券获取,超出当前时间被渲染问题处理,增加状态和时间判定
						
						
						
						
						
						
					 | 
					
						2021-09-01 14:49:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							88109995bb
							
						
					 | 
					
						
						
							
							打折券计算方式调整
						
						
						
						
						
						
					 | 
					
						2021-09-01 11:35:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c9c3c2c17
							
						
					 | 
					
						
						
							
							店铺商品数量变更问题处理。
						
						
						
						
						
						
					 | 
					
						2021-09-01 10:42:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b78f1e512e
							
						
					 | 
					
						
						
							
							下方qq群问题处理
						
						
						
						
						
						
					 | 
					
						2021-09-01 09:40:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							7492abf4a3
							
						
					 | 
					
						
						
							
							增加qq1群已满提示。
						
						
						
						
						
						
					 | 
					
						2021-09-01 09:39:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							2973bcdc7a
							
						
					 | 
					
						
						
							
							商品审核后,消费者类型转换异常问题处理
						
						
						
						
						
						
					 | 
					
						2021-09-01 09:37:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							98df40a9a1
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-01 09:15:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e35eb6961d
							
						
					 | 
					
						
						
							
							fix elasticseach config injection to @Autowried
						
						
						
						
						
						
					 | 
					
						2021-09-01 09:15:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							36beadbc03
							
						
					 | 
					
						
						
							
							sql 查询参数问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-31 17:56:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9075a94f3
							
						
					 | 
					
						
						
							
							秒杀活动自动创建调整为7天
						
						
						
						
						
						
					 | 
					
						2021-08-31 17:42:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c12dd02f8a
							
						
					 | 
					
						
						
							
							秒杀注释增加,秒杀设置天数变为常量设置
						
						
						
						
						
						
					 | 
					
						2021-08-31 17:20:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb19b8f218
							
						
					 | 
					
						
						
							
							打折优惠券计算错误问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-31 14:55:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							37ec1bf771
							
						
					 | 
					
						
						
							
							退货退款商家端统计问题
						
						
						
						
						
						
					 | 
					
						2021-08-31 10:14:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7e4948447
							
						
					 | 
					
						
						
							
							解决几个阿里规约相关的代码问题
						
						
						
						
						
						
					 | 
					
						2021-08-30 18:00:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e08e187526
							
						
					 | 
					
						
						
							
							去除无效类,版本号切换,准备打版
						
						
						
						
						
						
					 | 
					
						2021-08-30 16:58:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8c1e9d8b8
							
						
					 | 
					
						
						
							
							去除jpa依赖,部分不相关的代码去除。
						
						
						
						
						
						
					 | 
					
						2021-08-30 14:32:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							74f92506d0
							
						
					 | 
					
						
						
							
							修改砍价、积分商品活动库存
						
						
						
						
						
						
					 | 
					
						2021-08-28 07:56:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							b930a598c8
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-08-28 07:16:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f15e8da30
							
						
					 | 
					
						
						
							
							砍价活动修改状态
						
						
						
						
						
						
					 | 
					
						2021-08-28 07:16:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							07fae7a531
							
						
					 | 
					
						
						
							
							商品价格DTO参与活动问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-28 03:42:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							20f1d58386
							
						
					 | 
					
						
						
							
							角色删除,菜单角色关系没有正确的删除问题
						
						
						
						
						
						
					 | 
					
						2021-08-27 17:12:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdfdf483d6
							
						
					 | 
					
						
						
							
							管理员删除时,管理员角色没有同步删除问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-27 16:25:37 +08:00 | 
					
					
						
						
							
							
							
						
					 |