| 
							
							
								 Hacker_Lei | 6d0dd09b5b | Merge pull request #35 feature/pg | 2022-01-21 19:05:22 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | 38469d42ef | !120 修复促销优惠券获取时,活动优惠券查询问题;修复手机登录后,手机号为脱敏后问题 Merge pull request !120 from OceansDeep/feature/pg | 2022-01-21 11:05:03 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | 696bfe0a2c | 增加默认不脱敏 | 2022-01-21 19:03:43 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 3de2b9834d | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg | 2022-01-21 19:01:10 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | d5fdc47936 | 修复促销优惠券获取时,活动优惠券查询问题 | 2022-01-21 19:01:02 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 27e82423f0 | 修复手机登录后,手机号为脱敏后问题 | 2022-01-21 19:00:20 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 576b5b213e | 调整图片地址 | 2022-01-21 17:00:10 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 145406be32 | 对商品名称包含逗号可能导致的问题处理 | 2022-01-21 16:31:06 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | a65f0ad384 | 积分设置相关优化 | 2022-01-21 16:18:16 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 5051fc7b0b | 赠品订单无法核销问题处理 | 2022-01-21 15:39:18 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 7164036d4c | 修改订单价格时,订单update price字段问题处理 | 2022-01-21 14:34:05 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | cb0a9121e5 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop | 2022-01-21 12:08:40 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 96e779eb28 | 对交易状态的判定问题处理 | 2022-01-21 12:07:16 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | 27397f1602 | !119 优化consumer延时任务执行器(修复一个高版本的redis可能导致redis连接不上问题) Merge pull request !119 from OceansDeep/feature/pg | 2022-01-20 08:22:33 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | 2d1cfde76b | 优化consumer延时任务执行器(修复一个高版本的redis可能导致redis连接不上问题) | 2022-01-20 16:19:52 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 007d69a887 | 支付完成判定 | 2022-01-20 15:59:26 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | f3965cecd5 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop | 2022-01-20 11:04:57 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 4fb170e5c7 | 支付宝支付结果校验 | 2022-01-20 11:01:24 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 8e1ade5423 | 支付参数判定重复代码处理 | 2022-01-20 09:27:07 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | 0b081c2d85 | !118 优化编辑商品时的生成索引和操作促销活动时更新索引促销信息,增加事务监听在事务提交后发 Merge pull request !118 from OceansDeep/feature/pg | 2022-01-19 06:17:35 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | ab1e9f806f | 优化编辑商品时的生成索引和操作促销活动时更新索引促销信息,增加事务监听在事务提交后发送mq信息 | 2022-01-19 14:16:02 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | e961711dcb | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg | 2022-01-19 10:21:19 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 90185d8c32 | 优化编辑商品时的生成索引和操作促销活动时更新索引促销信息,增加事务监听在事务提交后发送mq信息 | 2022-01-19 10:18:33 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 68ef46195c | 升级依赖包版本,解决安全问题 | 2022-01-19 10:16:15 +08:00 |  | 
			
				
					| 
							
							
								 chopper711 | 0c234e78af | !117 压测期间对代码进行性能优化,以及部分代码优化 Merge pull request !117 from chopper711/test | 2022-01-19 02:03:47 +00:00 |  | 
			
				
					| 
							
							
								 Chopper | ca1851570b | 还原下单接口代码,这里存在规范问题日后与前端一起协调修改 | 2022-01-19 10:02:22 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | cf0d1378c8 | 压测相关还原 | 2022-01-18 11:03:15 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | b13a5d5f2a | Merge branch 'master' into test | 2022-01-18 09:51:09 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 575458afb3 | 1、去除非必要事务 2、对分布式多节点并发时可能存在生成相同的雪花算法id问题进行处理
3、其他问题优化 | 2022-01-18 09:50:26 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | b2d4b7bb23 | !116 优化管理端登录和xss Merge pull request !116 from OceansDeep/feature/pg | 2022-01-17 10:01:58 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | def6247e9f | 优化管理端登录和xss | 2022-01-17 17:42:42 +08:00 |  | 
			
				
					| 
							
							
								 fengtianyangyang | 6409d0dc2d | '更新' | 2022-01-14 11:47:56 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | f253ae9c31 | !115 修复店铺优惠券为部分商品分类。部分商品分类使用优惠券无效 Merge pull request !115 from OceansDeep/feature/pg | 2022-01-13 09:39:10 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | b93d10eeea | 修复店铺优惠券为部分商品分类。部分商品分类使用优惠券无效 | 2022-01-13 17:38:36 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | 801f1cbd4c | !114 修复店铺优惠券为部分商品。部分商品使用优惠券无效 Merge pull request !114 from OceansDeep/feature/pg | 2022-01-13 09:12:00 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | f8260c3b29 | 修复店铺优惠券为部分商品。部分商品使用优惠券无效 | 2022-01-13 17:04:01 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 9e74c15413 | 代码优化 | 2022-01-12 19:46:07 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 65e7f9750a | 增加获取uuid的方法,为压测环境的同一token购物车重复问题处理 | 2022-01-12 11:20:27 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 62804941c2 | Merge remote-tracking branch 'origin/feature/pg' into test # Conflicts:
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java | 2022-01-11 17:39:46 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 05818baf7a | 优化一些配置项,优化部分路基 | 2022-01-11 17:34:48 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 1c28e0bd5f | 优化结算时获取用户优惠券信息(增加redis存储) | 2022-01-11 17:34:00 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 0460e219f9 | 购物车创建时减少一次redis的读写 | 2022-01-11 16:34:18 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | eec3611218 | 优化sql | 2022-01-11 15:16:02 +08:00 |  | 
			
				
					| 
							
							
								 fengtianyangyang | 87f637099c | '合并master' | 2022-01-11 14:50:06 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 5f0241768d | 去除事务注解 | 2022-01-11 14:48:11 +08:00 |  | 
			
				
					| 
							
							
								 fengtianyangyang | 60b4ab5c5b | '路径问题' | 2022-01-11 14:32:01 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | bbed7afdcb | !113 修复商品审核和编辑商品缺失对es操作问题 Merge pull request !113 from OceansDeep/feature/pg | 2022-01-11 04:11:31 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | 459a736ebc | 修复商品审核和编辑商品缺失对es操作问题 | 2022-01-11 12:10:54 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | bdbc620515 | !112 优化es商品索引的mapping的促销存储结构 Merge pull request !112 from OceansDeep/feature/pg | 2022-01-11 03:39:13 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | 3c905ffd8b | 优化es商品索引的mapping的促销存储结构(解决促销过多时,mapping explosion问题) | 2022-01-11 11:38:30 +08:00 |  |