OceansDeep
|
007b145c2e
|
!295 fix & improve
Merge pull request !295 from OceansDeep/pg
|
2023-06-16 09:01:20 +00:00 |
|
misworga831
|
201943994b
|
fix: 修复添加管理员失败无信息提示
|
2023-06-16 16:21:57 +08:00 |
|
misworga831
|
b17f3c08b7
|
Merge pull request #88
pg
|
2023-06-13 10:51:59 +08:00 |
|
OceansDeep
|
c46c59e4a1
|
!294 fix: 修复移除@Resource后的订单每日任务，执行sql错误问题
Merge pull request !294 from OceansDeep/pg
|
2023-06-13 02:49:56 +00:00 |
|
misworga831
|
0bdb39797d
|
fix: 修复移除@Resource后的订单每日任务，执行sql错误问题
|
2023-06-13 10:48:03 +08:00 |
|
Chopper711
|
71061ad861
|
fix:用户足迹的处理sql已经在逻辑中处理好了数据问题，这这里的事务在特殊情况下会导致sql异常，将非必要的事务注解去除即可。
|
2023-06-09 15:42:50 +08:00 |
|
Chopper711
|
f14875e679
|
fix:在redis集群中，促销库存与商品库存不在同一个槽内会导致执行异常
|
2023-06-09 15:27:56 +08:00 |
|
misworga831
|
e8a1f6a02f
|
Merge pull request #87
pg
|
2023-06-07 11:08:31 +08:00 |
|
OceansDeep
|
036035f51b
|
!292 fix & improve
Merge pull request !292 from OceansDeep/pg
|
2023-06-06 11:14:20 +00:00 |
|
misworga831
|
104b6c2f5d
|
fix: 修复权限更新后，登录用户权限没有更新问题。
|
2023-06-06 19:13:52 +08:00 |
|
OceansDeep
|
7dffd7dcb9
|
!291 fix & improve
Merge pull request !291 from OceansDeep/pg
|
2023-06-06 10:07:14 +00:00 |
|
misworga831
|
63f1f0df21
|
fix: 修复权限更新后，登录用户权限没有更新问题。
|
2023-06-06 18:06:41 +08:00 |
|
OceansDeep
|
dda955219a
|
!290 fix & improve
Merge pull request !290 from OceansDeep/pg
|
2023-06-06 09:27:11 +00:00 |
|
misworga831
|
5d6e99dc8a
|
fix: 移除@Resource注解，修复权限更新后，登录用户权限没有更新问题。
|
2023-06-06 17:26:04 +08:00 |
|
Chopper711
|
b61a5e8f7b
|
style: 代码扫描规范问题处理
|
2023-06-05 10:05:40 +08:00 |
|
Chopper711
|
d9018ef317
|
fix:邀新赠券邀请人信息写入代码被删除问题还原
|
2023-06-01 18:51:49 +08:00 |
|
Chopper711
|
9993b9bbf6
|
fix:虚拟成团无法成功触发问题处理
|
2023-05-31 15:42:17 +08:00 |
|
Chopper711
|
03fd9b222a
|
!288 拼团订单延时任务优化
Merge pull request !288 from hucker520
|
2023-05-31 07:41:12 +00:00 |
|
Chopper711
|
3d7cfb1c63
|
fix:描述问题处理，将代码枚举注释更加接近逻辑寓意
|
2023-05-31 15:03:50 +08:00 |
|
Chopper711
|
ca6e45fb92
|
fix: 重复退货时，商品数量问题处理
|
2023-05-31 15:02:22 +08:00 |
|
Chopper711
|
e9950652a6
|
fix:缺少java引用问题处理
|
2023-05-31 13:43:43 +08:00 |
|
Chopper711
|
cddc6571f7
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2023-05-30 18:15:24 +08:00 |
|
Chopper711
|
708ba929f0
|
1
|
2023-05-30 18:15:22 +08:00 |
|
hucker520
|
6e820d745c
|
触发器参数 object 是 PintuanOrderMessage 对象，见第35行，直接转为 Pintuan 对象必为空，须要根据id重新查询
Signed-off-by: hucker520 <505169544@qq.com>
|
2023-05-26 09:02:41 +00:00 |
|
Chopper711
|
ae9e0e27ff
|
!287 分销订单列表查询结束时间优化 from@hucker520
Merge pull request !287 from hucker520/N/A
|
2023-05-26 07:23:46 +00:00 |
|
hucker520
|
3485c5a5dd
|
分销订单列表查询结束日期，默认查询到当天0点，导致当天0点后的订单查询不出来，优化后成查询到结束日期当天23:59:59:999
Signed-off-by: hucker520 <505169544@qq.com>
|
2023-05-26 03:33:55 +00:00 |
|
misworga831
|
62ac16b705
|
Merge pull request #86
pg
|
2023-05-17 14:23:10 +08:00 |
|
OceansDeep
|
048ca0e64a
|
!286 fix & improve
Merge pull request !286 from OceansDeep/pg
|
2023-05-17 06:17:41 +00:00 |
|
misworga831
|
d413de75d3
|
fix: 修复购物车商品促销价格特殊情况处理中优惠券金额为0的情况（购物车商品促销价格特殊情况处理只处理优惠券不足的情况）
|
2023-05-17 14:16:16 +08:00 |
|
Chopper711
|
4f8d4f7a74
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2023-05-11 11:21:34 +08:00 |
|
Chopper711
|
a0619abfc4
|
补充参考配置文档
|
2023-05-11 11:21:27 +08:00 |
|
OceansDeep
|
5e950b9766
|
!285 fix & improve
Merge pull request !285 from OceansDeep/pg
|
2023-05-10 06:53:45 +00:00 |
|
misworga831
|
1f02818692
|
fix: 优化购物车商品促销价格特殊情况处理
|
2023-05-10 14:50:19 +08:00 |
|
Chopper711
|
c0a370ad47
|
fix:交易投诉，交易售后，兼容设置中描述的内容：设置为0则表示不限制
|
2023-05-10 14:44:55 +08:00 |
|
Chopper711
|
a502420c5f
|
refactor: 去除两个无效引用
|
2023-05-10 14:07:30 +08:00 |
|
Chopper711
|
b4aef1461c
|
fix: 订单定时任务可能存在极端情况，影响其他业务流程，做一下兼容处理，以免部分数据导致订单定时任务无法处理
|
2023-05-10 14:03:16 +08:00 |
|
OceansDeep
|
54b40c35f4
|
!284 fix & improve
Merge pull request !284 from OceansDeep/pg
|
2023-05-09 06:01:31 +00:00 |
|
misworga831
|
a33e053bc7
|
fix: 特殊情况处理，如参与多个促销活动，部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额
|
2023-05-09 13:59:55 +08:00 |
|
misworga831
|
ae93661763
|
fix: 优化es搜索，增加如搜索超过10000条信息的处理
|
2023-05-09 13:59:23 +08:00 |
|
OceansDeep
|
349bee7405
|
!283 fix & improve
Merge pull request !283 from OceansDeep/pg
|
2023-05-08 10:50:06 +00:00 |
|
misworga831
|
c286d05ad8
|
fix: 促销状态更新和满减活动范围商品判定
|
2023-05-08 18:49:37 +08:00 |
|
chc
|
49b2c2f7a3
|
fix: 导入商品增加填写验证
|
2023-05-08 18:35:57 +08:00 |
|
chc
|
b469fcfee3
|
Merge remote-tracking branch 'origin/master'
|
2023-05-08 17:59:09 +08:00 |
|
chc
|
5e6fde594b
|
fix: 店铺设置是自提、楼层为空导致无法保存
|
2023-05-08 17:59:01 +08:00 |
|
OceansDeep
|
5d598d9034
|
!282 优化es生成索引sku取分可能为复数问题
Merge pull request !282 from OceansDeep/pg
|
2023-05-08 09:38:19 +00:00 |
|
misworga831
|
8181f2602a
|
fix: 优化es生成索引sku取分可能为复数问题
|
2023-05-08 17:37:29 +08:00 |
|
misworga831
|
3e74697215
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg
|
2023-05-08 16:51:01 +08:00 |
|
Chopper711
|
fac10debd5
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2023-05-06 16:32:48 +08:00 |
|
Chopper711
|
74941f7243
|
feat: 兼容提现失败场景，对失败消息持久化
|
2023-05-06 16:32:42 +08:00 |
|
chc
|
621b2e322c
|
fix: 快递鸟抛出异常
|
2023-05-05 13:40:38 +08:00 |
|