| 
							
							
								 pikachu | 3648929ed3 | 积分类型修改 | 2021-08-06 19:17:16 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 6c22bf24a6 | 楼层保存时,如果是演示站点则不能开启楼层 | 2021-08-06 17:51:36 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | c3b6c88471 | 权限判定处理 | 2021-08-06 12:02:30 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | e01586b394 | 权限为空问题处理 | 2021-08-06 11:46:23 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | ba81cc5ece | 参数被写死问题还原 | 2021-08-05 20:03:30 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 9b7f5f30fa | 关闭店铺,如果商品id集合为空,则不做处理,解决空指针问题。 | 2021-08-05 18:13:43 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | bb7ea5881e | 店铺收藏点击问题处理 | 2021-08-05 18:05:27 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 74beaf0cf0 | 去除无效配置 | 2021-08-05 12:50:19 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 4498d63f6c | 修复积分类型修改引发的积分对不上问题 | 2021-08-05 08:26:35 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 86d0ecc89e | 积分相关小问题处理 | 2021-08-04 18:58:56 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | b0b9420a8e | 店铺分类维护信息错误问题处理。 | 2021-08-04 17:59:40 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | d93e11b302 | 缓存判定问题处理 | 2021-08-04 16:01:20 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 5ee25262aa | 注释补充 | 2021-08-04 09:47:15 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | dbe0821ecf | 恢复代码 | 2021-08-04 09:29:05 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 77a30459cd | 恢复代码 | 2021-08-04 09:27:23 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | c1025b7268 | 代码还原 | 2021-08-04 09:26:49 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | ce22c9b7ff | 初始化索引,按照规格去生成索引 | 2021-08-03 23:28:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 99f93b516a | 处理分词可能为空的情况 | 2021-08-03 21:33:56 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 60cf5c92dd | 解决没有关键词显示错误 | 2021-08-03 17:54:04 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 3a2d4e6c91 | DTO对象命名规范问题处理 | 2021-08-03 15:11:04 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 7632cf325d | 店铺运费模版问题处理 | 2021-08-03 14:24:59 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | cd7fc4d7ac | 订单可能没有订单类型问题,兼容之前代码 | 2021-08-03 11:38:08 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 644de06172 | 订单平台佣金bug修复,价格计算相关优化 | 2021-08-02 18:44:05 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 083b90a04a | 积分商品价格计算在后续已经渲染,所以这个地方代码可以去掉 | 2021-07-30 18:10:23 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 3a4d08980f | 代码非空处理,这块需要优化,将积分相关逻辑脱离购物车通用逻辑 | 2021-07-30 18:04:17 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 26c67c72fa | 文章分类默认值问题处理 | 2021-07-30 16:17:44 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 829472c6a3 | Merge remote-tracking branch 'origin/qiuqiu' 合并砍价/积分相关
# Conflicts:
#	consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
#	update-sql/version4.2to4.3.sql | 2021-07-30 15:50:36 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 8deaef09d7 | 热词排序count下标从0开始,所以计算时候进行-1处理 | 2021-07-30 14:59:00 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 0760c72ef8 | 热词获取改为根据数量,传递count获取系统热搜词语 | 2021-07-30 14:27:41 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 02327402a8 | 代码接口,异常规范问题处理。 | 2021-07-29 17:00:15 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 8e30ae435f | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop | 2021-07-28 11:19:38 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | f00386c81d | 继续优化代码,调整依赖关系,缩减无效代码 | 2021-07-28 11:19:33 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 0dd8488e19 | Merge branch 'master' into pipi | 2021-07-27 19:44:36 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | a7f26ff19e | 站内信消息完善 | 2021-07-27 19:43:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 0cad52cfa6 | 同步master | 2021-07-27 17:26:12 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | cd1b67ba84 | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop | 2021-07-27 17:17:19 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 4ac7c038f2 | 评价列表展示店铺的评分 | 2021-07-27 17:17:11 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | ceea01ccf8 | 评价列表展示店铺的评分 | 2021-07-27 17:15:52 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 5999b5f217 | 权限改版完成 | 2021-07-27 17:03:31 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 1b60079481 | 取消订单,恢复积分 | 2021-07-27 16:58:38 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 02f3bde2b4 | 积分订单、用户下单积分数值判断 | 2021-07-27 15:33:11 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 5a7440c5bf | 同步master,解决冲突 | 2021-07-27 10:00:34 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 8b861e8fe7 | 热词自定义分数线功能完善 | 2021-07-26 16:02:03 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | fe8523ca3f | Merge branch 'backup' # Conflicts:
#	manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
#	manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
#	manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
#	manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
#	manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
#	manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java | 2021-07-25 17:51:05 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | e99aeeede5 | 热词功能处理,提供redis自定义增加权重值的方法 | 2021-07-25 17:45:46 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 2e2ba961d9 | 去掉订单中存入砍价、积分商品的促销商品ID | 2021-07-24 17:56:43 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 094212e6a2 | 提现审核 | 2021-07-24 17:39:49 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 7c48413d6b | 结算单添加积分、砍价商品结算价 | 2021-07-24 17:06:24 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 3acdb7733e | 添加商品新增视频字段 | 2021-07-24 11:47:15 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | abdc74c773 | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop | 2021-07-23 19:45:21 +08:00 |  |