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
|
2018457c28
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-07-30 14:28:11 +08:00 |
|
Chopper
|
0760c72ef8
|
热词获取改为根据数量，传递count获取系统热搜词语
|
2021-07-30 14:27:41 +08:00 |
|
chopper711
|
0c87c6f080
|
update update-sql/version4.2to4.3.sql.
sql格式化问题存在错误，重新导入
|
2021-07-30 03:23:23 +00:00 |
|
Chopper
|
6e611d3464
|
推送github脚本更新
|
2021-07-30 09:04:07 +08:00 |
|
Chopper
|
f71facf72a
|
补充注释规范。补充异常消息打印
|
2021-07-29 18:06:54 +08:00 |
|
Chopper
|
b804fa68cf
|
鉴权写入前对权限的非空校验
|
2021-07-29 17:52:42 +08:00 |
|
Chopper
|
363e7f40bf
|
去除sout
|
2021-07-29 17:39:33 +08:00 |
|
Chopper
|
02327402a8
|
代码接口，异常规范问题处理。
|
2021-07-29 17:00:15 +08:00 |
|
Chopper
|
f8ae17b360
|
去除无效代码
|
2021-07-29 15:26:48 +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
|
f798dbf3ec
|
!18 合并
Merge pull request !18 from pikachu/pipi
|
2021-07-27 11:48:19 +00: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
|
b8634e9d59
|
最新菜单结构
|
2021-07-27 17:08:30 +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
|
a407d3a539
|
修改sql中的菜单名称
|
2021-07-26 17:21:02 +08:00 |
|
Chopper
|
ad2640dac9
|
热词菜单处理sql提交
|
2021-07-26 16:12:59 +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
|
0514bec994
|
管理端权限模块校验完善
|
2021-07-25 17:46:24 +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
|
f9d7e9324a
|
!17 提现审核功能
Merge pull request !17 from pikachu/pipi
|
2021-07-24 09:49:56 +00: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
|
1ee60c02d3
|
添加引用
|
2021-07-23 19:58:32 +08:00 |
|
lifenlong
|
abdc74c773
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
|
2021-07-23 19:45:21 +08:00 |
|
lifenlong
|
2c8ac59628
|
优化商品显示逻辑
售后价格判断
|
2021-07-23 19:44: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 |
|