597 Commits

Author SHA1 Message Date
pikachu
a0638f0f23 修改在已有秒杀商品情况下添加新的秒杀商品 数据保存错误问题 2021-08-16 19:54:02 +08:00
Chopper
f3e0fd7bf5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-08-13 18:18:18 +08:00
Chopper
db56984cf3 结算页优惠券金额错误问题处理。
购物车相关金额渲染代码优化
2021-08-13 18:18:01 +08:00
lifenlong
7aa99497e5 添加导出结算单功能 2021-08-13 18:16:13 +08:00
lifenlong
7941b74efb 积分订单取消回退积分 2021-08-13 10:36:15 +08:00
lifenlong
c1d5673837 运营后台,平台审核售后 2021-08-13 09:20:45 +08:00
lifenlong
6c95679ad2 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-08-12 21:11:18 +08:00
lifenlong
ebeec5e8a4 订单退单扣除积分错误 2021-08-12 21:11:12 +08:00
Chopper
ee77ee6731 变动积分如果为0,则直接返回 2021-08-12 17:30:26 +08:00
OceansDeep
dbc5305ea7 !20 add elasticsearch progress
Merge pull request !20 from OceansDeep/feature/pg
2021-08-11 18:18:15 +00:00
paulGao
48146edee9 add elasticsearch progress 2021-08-12 02:16:20 +08:00
lifenlong
8532400b82 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-08-12 00:35:50 +08:00
lifenlong
100d5d3317 解决分销佣金冻结错误 2021-08-12 00:35:39 +08:00
Chopper
4d83b63f82 增加订单管理端查看物流接口 2021-08-12 00:30:55 +08:00
Chopper
522ca6f157 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-08-12 00:29:11 +08:00
Chopper
9e3eb1f74e 订单申诉完成是,无需进行撤销申诉操作 2021-08-12 00:28:46 +08:00
lifenlong
d8155b2c15 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-08-11 23:18:08 +08:00
lifenlong
700d2eb401 快递鸟调用测试接口,正式版接口为8002/8001 2021-08-11 23:17:58 +08:00
Chopper
d5b6ba5d00 分销订单后台无法查询问题处理 2021-08-11 23:02:33 +08:00
lifenlong
9e8aa7f223 商品评分默认为100 2021-08-11 22:52:42 +08:00
Chopper
99160abd37 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-08-11 21:19:00 +08:00
Chopper
1195349ebf 分类规格无法读取问题处理 2021-08-11 21:18:54 +08:00
lifenlong
38124a702a 分类去除图片必填 2021-08-11 21:12:21 +08:00
lifenlong
e1ec2b9b27 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-08-11 20:15:01 +08:00
lifenlong
64e45c10b1 增加店铺企业信息接口
增加删除商品
修复:修改订单金额售后金额不正确
2021-08-11 20:14:56 +08:00
Chopper
69d712c4b1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-08-11 20:12:22 +08:00
Chopper
f12c8a1aec 活动时间校验问题处理 2021-08-11 20:12:17 +08:00
pikachu
2c054f27d3 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-08-11 19:49:36 +08:00
pikachu
28cde4817a 充值订单超时取消功能 2021-08-11 19:49:22 +08:00
Chopper
74cc360900 促销活动创建,时间错误问题处理 2021-08-11 19:13:45 +08:00
Chopper
dd7af218a4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-08-11 12:19:44 +08:00
Chopper
f9a18ffbe1 super权限无法获取问题处理,拼团表单校验问题,购物车渲染流程优化 2021-08-11 12:18:42 +08:00
chopper711
6464d68133 update framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java.
重复权限去除
2021-08-11 03:12:04 +00:00
lifenlong
fc76e74d34 拼团 2021-08-11 09:52:25 +08:00
pikachu
7b7bab44c7 删除积分修复数据 2021-08-10 19:25:30 +08:00
pikachu
0a17fa9f53 修复会员总获得积分api 2021-08-10 19:21:11 +08:00
pikachu
2f48def734 修改分销提现记录文案 2021-08-10 19:05:17 +08:00
lifenlong
e2592a6c38 运营后台添加会员,密码进行二次加密 2021-08-10 16:42:34 +08:00
lifenlong
2da7d51eeb 使用hutool判断string非空 2021-08-10 16:10:03 +08:00
Chopper
45e65e71e1 后台确认收款,订单库存双倍扣除问题处理 2021-08-10 09:53:12 +08:00
Chopper
50dcc461b1 商品分类缓存问题,以及商品页面无法展示完整的平台分类问题处理,店铺分类缓存key优化,逻辑优化 2021-08-09 15:08:53 +08:00
Chopper
50f27e57d4 商品缓存问题处理 2021-08-09 11:46:12 +08:00
Chopper
8ceb214252 订单价格问题处理 2021-08-09 09:50:31 +08:00
Chopper
d6b05d4ff1 订单金额详情全部限制大于0,以防止负数出现 2021-08-09 09:32:22 +08:00
Chopper
bf2882b566 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-08-09 09:14:08 +08:00
Chopper
9a10d2aa7f 修复可能出现订单批量发货需要每次读取数据库的问题 2021-08-09 09:14:04 +08:00
pikachu
17705188e0 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-08-06 19:17:31 +08:00
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