Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0514bec994
							
						
					 | 
					
						
						
							
							管理端权限模块校验完善
						
						
						
						
						
						
					 | 
					
						2021-07-25 17:46:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e99aeeede5
							
						
					 | 
					
						
						
							
							热词功能处理,提供redis自定义增加权重值的方法
						
						
						
						
						
						
					 | 
					
						2021-07-25 17:45:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							280c5dec39
							
						
					 | 
					
						
						
							
							注解包调整
						
						
						
						
						
						
					 | 
					
						2021-07-22 17:33:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							58d41775cf
							
						
					 | 
					
						
						
							
							店铺请求不记录PV统计
						
						
						
						
						
						
					 | 
					
						2021-07-22 17:26:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6b59c23af
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-22 12:17:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdb55bc426
							
						
					 | 
					
						
						
							
							Merge branch 'backup'
						
						
						
						
						
						
						
						# Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java 
						
						
					 | 
					
						2021-07-22 12:07:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							66e9a4f4cc
							
						
					 | 
					
						
						
							
							解决店铺-商品列表页面库存与Sku库存不对应问题
						
						
						
						
						
						
					 | 
					
						2021-07-22 10:47:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c0a420515
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-22 09:17:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f02a398f6
							
						
					 | 
					
						
						
							
							线下退款判断错误
						
						
						
						
						
						
					 | 
					
						2021-07-22 09:17:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							41835aaece
							
						
					 | 
					
						
						
							
							站内信消息优化
						
						
						
						
						
						
					 | 
					
						2021-07-21 19:38:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f3a4dbf68
							
						
					 | 
					
						
						
							
							去掉无用代码以及对站内信模版等进行了优化
						
						
						
						
						
						
					 | 
					
						2021-07-21 19:36:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ccdc94644
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-21 17:46:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd3aceaeac
							
						
					 | 
					
						
						
							
							完善方法注释
						
						
						
						
						
						
					 | 
					
						2021-07-21 17:46:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							79da543d57
							
						
					 | 
					
						
						
							
							修改会员评价店铺图片字段类型
						
						
						
						
						
						
					 | 
					
						2021-07-21 15:54:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							c459a9086a
							
						
					 | 
					
						
						
							
							退款金额单价计算错误
						
						
						
						
						
						
					 | 
					
						2021-07-21 15:43:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc6abdbf1a
							
						
					 | 
					
						
						
							
							初步调整结构完成
						
						
						
						
						
						
					 | 
					
						2021-07-21 15:23:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd491e38e5
							
						
					 | 
					
						
						
							
							进行中的满减活动可以关闭
						
						
						
						
						
						
					 | 
					
						2021-07-21 15:13:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							b851de488b
							
						
					 | 
					
						
						
							
							解决店铺导出待发货订单重复问题。
						
						
						
						
						
						
					 | 
					
						2021-07-21 13:38:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ff2f50b8f
							
						
					 | 
					
						
						
							
							解决问题:关闭优惠券后,商品页面还是展示优惠券
						
						
						
						
						
						
					 | 
					
						2021-07-21 12:51:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f1aa6e3d5
							
						
					 | 
					
						
						
							
							使用hutool做String非空判断
						
						
						
						
						
						
					 | 
					
						2021-07-21 12:00:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9663434a2
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-21 11:56:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bbd2f8bb8
							
						
					 | 
					
						
						
							
							!16 sql 中 添加分词管理菜单
						
						
						
						
						
						
						
						Merge pull request !16 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-07-21 00:04:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							13ecd5815b
							
						
					 | 
					
						
						
							
							sql 中 添加分词管理菜单
						
						
						
						
						
						
					 | 
					
						2021-07-21 08:04:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							3576c968cf
							
						
					 | 
					
						
						
							
							!15 修复商品搜索为分词搜索
						
						
						
						
						
						
						
						Merge pull request !15 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-07-21 00:02:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdbf4589ea
							
						
					 | 
					
						
						
							
							修复商品搜索为分词搜索
						
						
						
						
						
						
					 | 
					
						2021-07-21 07:59:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							44fb0601a6
							
						
					 | 
					
						
						
							
							解决商品购买但是商品页面的库存显示不正确的问题
						
						
						
						
						
						
					 | 
					
						2021-07-20 20:25:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							37348335b2
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
						
						修正优惠券提示语 
						
						
					 | 
					
						2021-07-20 19:41:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f351fdb8b
							
						
					 | 
					
						
						
							
							对消息增加默认状态码
						
						
						
						
						
						
					 | 
					
						2021-07-20 19:38:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							f35ae5b1ee
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-20 19:27:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a13351bc3
							
						
					 | 
					
						
						
							
							满折优惠活动+满折优惠券价格计算不正确。
						
						
						
						
						
						
					 | 
					
						2021-07-20 19:27:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							ecfe856fa7
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-20 17:59:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c1d3236e8
							
						
					 | 
					
						
						
							
							商品读取缓存
						
						
						
						
						
						
					 | 
					
						2021-07-20 17:57:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6d0afa23a
							
						
					 | 
					
						
						
							
							String 类型转换使用hutool
						
						
						
						
						
						
					 | 
					
						2021-07-20 17:29:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe021f8a11
							
						
					 | 
					
						
						
							
							暂时备份一下代码,准备切换master
						
						
						
						
						
						
					 | 
					
						2021-07-20 15:44:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b7ab94ba4
							
						
					 | 
					
						
						
							
							批量调整目录结构
						
						
						
						
						
						
					 | 
					
						2021-07-19 16:07:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							15ab6bfda4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-19 15:01:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							06212c073d
							
						
					 | 
					
						
						
							
							调整目录结构
						
						
						
						
						
						
					 | 
					
						2021-07-19 15:01:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							eda1e841bb
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-18 18:32:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							9de55088ea
							
						
					 | 
					
						
						
							
							新增站内消息通知模版
						
						
						
						
						
						
					 | 
					
						2021-07-18 17:12:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4642d85dd
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-18 13:43:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9c79eedd4
							
						
					 | 
					
						
						
							
							代码结构优化,缩减。一个多次判定问题处理
						
						
						
						
						
						
					 | 
					
						2021-07-16 10:40:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac5d04ddc2
							
						
					 | 
					
						
						
							
							调整代码结构
						
						
						
						
						
						
					 | 
					
						2021-07-16 09:55:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							caacb9e201
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-15 14:17:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							844bff971f
							
						
					 | 
					
						
						
							
							无效代码去除
						
						
						
						
						
						
					 | 
					
						2021-07-15 14:17:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ee5b4515a
							
						
					 | 
					
						
						
							
							修改积分参数命名规范
						
						
						
						
						
						
					 | 
					
						2021-07-13 19:55:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							2246b498d9
							
						
					 | 
					
						
						
							
							解决如果是扣减积分 积分变化错误
						
						
						
						
						
						
					 | 
					
						2021-07-13 19:43:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							93e4998b87
							
						
					 | 
					
						
						
							
							修改积分类型字段类型
						
						
						
						
						
						
					 | 
					
						2021-07-13 18:48:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a360fd2eda
							
						
					 | 
					
						
						
							
							maven规范补充
						
						
						
						
						
						
					 | 
					
						2021-07-13 10:39:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0ca366431
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-13 10:28:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d3be0b283
							
						
					 | 
					
						
						
							
							查看店铺经营范围
						
						
						
						
						
						
					 | 
					
						2021-07-13 10:28:04 +08:00 | 
					
					
						
						
							
							
							
						
					 |