1592 Commits

Author SHA1 Message Date
Chopper
b61cfe8b6b 虚拟商品设置物流模版问题兼容处理 2022-09-06 19:16:26 +08:00
Chopper711
28d57dff72
update README.md.
Signed-off-by: Chopper711 <1814994716@qq.com>
2022-09-06 02:39:07 +00:00
Chopper
a45f9e7843 特喵的 mybatis bug方法名重复会出现问题,唉服了 2022-09-02 20:43:18 +08:00
Chopper
37cfcde476 参数无法识别问题处理 2022-09-02 20:02:39 +08:00
Chopper
9517f0eedf 统计占位符问题处理 2022-09-02 19:45:52 +08:00
Chopper
a9da0cdcc8 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-09-02 19:09:22 +08:00
Chopper
b3c537d034 订单统计付款人数bug处理 2022-09-02 19:09:17 +08:00
OceansDeep
46dfe4650e
!230 优化规格信息存储顺序,HashMap 替换为 LinkedHashMap
Merge pull request !230 from OceansDeep/feature/pg
2022-09-01 09:37:12 +00:00
paulGao
7eca11d51b 优化规格信息存储顺序,HashMap 替换为 LinkedHashMap 2022-09-01 17:27:13 +08:00
Chopper711
43022a9838
!229 bug 优惠券领取数量错误 from @Fxz
Merge pull request !229 from Fxz/N/A
2022-09-01 01:59:23 +00:00
Fxz
18f8718de2
bug 优惠券领取数量错误
对于每一张优惠券扣减数量应该是会员数量 * 每张优惠券发放的数量 
即memberList.size()*couponActivityItem.getNum() 也就是memberCouponList.size()

![](https://minio.pigx.vip/oss/2022/08/nb5p9Y.png)
![](https://minio.pigx.vip/oss/2022/08/eMZZnl.png)

如演示环境,3人没人领取3张,应该是9张

Signed-off-by: Fxz <2235602974@qq.com>
2022-08-31 09:11:06 +00:00
OceansDeep
c6c0801d14
!228 优惠券折扣条件判断不可能同时成立
Merge pull request !228 from Fxz/N/A
2022-08-30 09:18:23 +00:00
Chopper
196d27b7c5 店铺入驻问题处理 2022-08-29 15:48:39 +08:00
Fxz
daed961a99
优惠券折扣条件判断不可能同时成立
Signed-off-by: Fxz <2235602974@qq.com>
2022-08-27 06:07:44 +00:00
OceansDeep
8387e03254
!227 修复consumer每日任务更新会员评价异常问题;优化生成每日秒杀活动
Merge pull request !227 from OceansDeep/feature/pg
2022-08-25 02:48:55 +00:00
paulGao
b6d43a069f a 2022-08-25 10:47:31 +08:00
paulGao
558eea94e2 修复consumer每日任务更新会员评价异常问题;优化生成每日秒杀活动 2022-08-25 10:43:56 +08:00
OceansDeep
f5f99efff6
!226 增加商品sku参数空值判断
Merge pull request !226 from OceansDeep/feature/pg
2022-08-19 09:47:26 +00:00
paulGao
cc95fa92e7 增加商品sku参数空值判断 2022-08-19 17:46:12 +08:00
OceansDeep
9eba3287b2
!225 增加订单取消返还优惠券
Merge pull request !225 from OceansDeep/feature/pg
2022-08-16 00:36:58 +00:00
paulGao
46845dd4b9 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-08-15 09:42:52 +08:00
paulGao
c3be2cdfe5 增加订单取消返还优惠券 2022-08-12 17:35:42 +08:00
OceansDeep
443cf1829e
!224 修复秒杀活动商品时间不正确问题
Merge pull request !224 from OceansDeep/feature/pg
2022-08-12 03:02:33 +00:00
paulGao
ae833b245e 修复秒杀活动商品时间不正确问题 2022-08-12 11:00:33 +08:00
OceansDeep
88338877b0
!223 优化秒杀活动获取时,当前时间大于活动最后一个时间时,显示最后一个时间
Merge pull request !223 from OceansDeep/feature/pg
2022-08-11 12:25:57 +00:00
paulGao
0d74a4aecc 优化秒杀活动获取时,当前时间大于活动最后一个时间时,显示最后一个时间。优化订单促销类型显示 2022-08-11 20:17:58 +08:00
OceansDeep
1cf0496cd1
!222 优化清除无效促销活动任务,改为批量清除
Merge pull request !222 from OceansDeep/feature/pg
2022-08-11 04:01:38 +00:00
paulGao
050b026166 优化清除无效促销活动任务,改为批量清除 2022-08-11 11:57:58 +08:00
Chopper
8d95319e39 每日任务日志前缀修复 2022-08-11 10:16:53 +08:00
OceansDeep
fe12b0a665
!221 修复新增编辑商品时,生成商品索引时,参数没有传递问题。优化商品新增编辑代码
Merge pull request !221 from OceansDeep/feature/pg
2022-08-10 12:37:17 +00:00
paulGao
93dd2e06d8 修复新增编辑商品时,生成商品索引时,参数没有传递问题。优化商品新增编辑代码 2022-08-10 20:27:38 +08:00
Chopper
72c58059bd 优惠券活动创建限制 2022-08-09 16:08:54 +08:00
Chopper
c38a8c0475 地址重复存在的问题处理 2022-08-08 09:14:15 +08:00
Chopper
98b863be6f 后台操作店铺验证存在问题处理 2022-08-05 17:14:20 +08:00
Chopper
ecd40523d4 演示站点限制修改密码 2022-08-04 11:17:14 +08:00
OceansDeep
7f6de6e64e
!218 修复商品索引生成报错问题
Merge pull request !218 from OceansDeep/feature/pg
2022-08-02 07:22:56 +00:00
paulGao
002163fbdc 修复商品索引生成报错问题 2022-08-02 15:21:00 +08:00
paulGao
da9ea504fb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-08-02 15:15:43 +08:00
Chopper
bb171f6e23 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
# Conflicts:
#	framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
2022-08-02 10:57:31 +08:00
Chopper
b860c2eed0 优化结构 2022-08-02 10:52:47 +08:00
Chopper
fdf81d1b39 分词问题优化 2022-08-02 10:51:10 +08:00
paulGao
40bf6d3010 优化获取秒杀活动 2022-07-27 22:13:56 +08:00
OceansDeep
2d63d36f51
!217 优化促销验证商品,检查商品是否可以参与促销
Merge pull request !217 from OceansDeep/feature/pg
2022-07-27 09:22:37 +00:00
paulGao
ed976e90dc 优化促销验证商品,检查商品是否可以参与促销 2022-07-27 17:21:48 +08:00
OceansDeep
6f4994b5da
!216 add transactional
Merge pull request !216 from OceansDeep/feature/pg
2022-07-27 04:07:29 +00:00
paulGao
a2a923809e add transactional 2022-07-27 12:06:47 +08:00
OceansDeep
8d06ccace9
!215 修复小程序注册用户没有发送会员注册信息问题
Merge pull request !215 from OceansDeep/feature/pg
2022-07-26 11:30:20 +00:00
paulGao
99479e722a 修复小程序注册用户没有发送会员注册信息问题 2022-07-26 19:18:01 +08:00
OceansDeep
70890cdc19
!214 修复积分商品购买时,价格问题
Merge pull request !214 from OceansDeep/feature/pg
2022-07-25 13:00:47 +00:00
paulGao
0eebc544a6 修复积分商品购买时,价格问题 2022-07-25 20:52:03 +08:00