Hawking
|
6013517d26
|
OrderDetail.deptId 为null，改用 OrderMaster.deptId
|
2023-05-10 14:11:54 +08:00 |
|
Hawking
|
dd43a90d15
|
主单的update_time为null，改为用create_time判断超时
|
2023-05-10 14:01:36 +08:00 |
|
Hawking
|
a500a5581d
|
主单超时逻辑
|
2023-05-09 19:53:44 +08:00 |
|
Hawking
|
5337178504
|
自动完单时主单状态错误
|
2023-05-09 11:05:27 +08:00 |
|
Hawking
|
24a5b2d44f
|
扣款罚金区分公司
|
2023-05-05 22:43:33 +08:00 |
|
Hawking
|
9982b95211
|
Customer自动提现
|
2023-05-05 18:04:58 +08:00 |
|
Hawking
|
acf7a47be6
|
子单分账时抵扣超时罚金
|
2023-05-05 17:20:40 +08:00 |
|
Hawking
|
6b064b7fe1
|
Merge remote-tracking branch 'origin/master'
|
2023-05-05 10:12:34 +08:00 |
|
Hawking
|
2aaab088a6
|
订单超时与扣款记录
|
2023-05-05 10:12:23 +08:00 |
 kuang.yife
|
c25587ffb6
|
分界线退款文案修复
|
2023-05-05 00:42:18 +08:00 |
|
kuang.yife
|
e5a7c1bb99
|
解决微信订阅号授权的问题
|
2023-05-04 23:20:47 +08:00 |
|
kuang.yife
|
cd21ae9d17
|
时间判断。
|
2023-05-04 11:02:49 +08:00 |
|
kuang.yife
|
83754b9d2c
|
流程e+确认发起判断
|
2023-04-26 22:52:03 +08:00 |
|
kuang.yife
|
bc24d8d243
|
修复支付切换微信的问题
|
2023-04-25 23:18:10 +08:00 |
|
Hawking
|
47533e40e0
|
主单分账时金额<=0判断
|
2023-04-25 01:00:39 +08:00 |
|
Hawking
|
132047104b
|
调整一下日志
|
2023-04-25 00:43:13 +08:00 |
|
Hawking
|
5976ab5c54
|
主单分账时金额<=0判断
|
2023-04-25 00:33:21 +08:00 |
|
Hawking
|
d12f2f7eae
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
|
2023-04-25 00:25:14 +08:00 |
|
Hawking
|
7528ee8d28
|
分账失败不回滚主订单了
|
2023-04-25 00:24:45 +08:00 |
|
kuang.yife
|
8034d35fff
|
避免提现造成数据回滚
|
2023-04-25 00:14:34 +08:00 |
|
Hawking
|
af4d4321fe
|
售后日志
|
2023-04-24 23:46:49 +08:00 |
|
Hawking
|
d9e2a782ac
|
补偿提现定时器
|
2023-04-22 22:45:28 +08:00 |
|
Hawking
|
2e5ff5096c
|
分账总金额计算错误
|
2023-04-22 20:59:00 +08:00 |
|
Hawking
|
c1b93ee051
|
主单无法自动完单分账的问题
|
2023-04-22 20:33:58 +08:00 |
|
Hawking
|
43aaede0b6
|
子单售后退错钱了
|
2023-04-20 23:05:22 +08:00 |
|
Hawking
|
5bd28dc039
|
分帐后也能同意退款，修改提示语
|
2023-04-20 22:44:10 +08:00 |
|
Hawking
|
777178cc45
|
分帐后也能同意退款，但是退款0元
|
2023-04-20 22:33:06 +08:00 |
|
Hawking
|
0a82851e2c
|
改支付状态 如果是已支付改退款中 如果是未支付改为取消
|
2023-04-20 21:50:41 +08:00 |
|
Hawking
|
e2dfdd057e
|
未支付的订单可以取消，跳过退款
|
2023-04-20 21:40:22 +08:00 |
|
Hawking
|
2077230be3
|
未支付的订单可以取消，跳过退款
|
2023-04-20 21:04:53 +08:00 |
|
HH
|
67aaad5519
|
判断是否全部派单的逻辑改回
|
2023-04-20 11:58:33 +08:00 |
|
kuang.yife
|
a72d302696
|
退款要判断是否是已付款的单
|
2023-04-20 10:40:12 +08:00 |
|
Hawking
|
fb30737591
|
当客户申请退款大师傅手中所有金额时：
如果派了单给子师傅，就不全退。
如果没有派单给子师傅，就全退。
|
2023-04-20 00:49:09 +08:00 |
|
Hawking
|
8d3a159405
|
手机号去除空格
|
2023-04-19 22:53:53 +08:00 |
|
Hawking
|
ceafb5526c
|
Merge remote-tracking branch 'origin/master'
|
2023-04-19 22:37:32 +08:00 |
|
Hawking
|
439fecbff2
|
售后记录SQL错误
|
2023-04-19 22:37:25 +08:00 |
donqi
|
94852f198a
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2023-04-19 22:35:16 +08:00 |
|
donqi
|
2aca501eaf
|
问题修复
|
2023-04-19 22:34:50 +08:00 |
|
Hawking
|
103b864df2
|
派单金额问题
|
2023-04-19 22:07:51 +08:00 |
|
Hawking
|
bf02f4f7e2
|
Merge remote-tracking branch 'origin/master' into multiple_refund
|
2023-04-19 21:51:12 +08:00 |
|
kuang.yife
|
575d082e2e
|
取消是否要退款，需要判断是否是到付单
|
2023-04-19 20:55:18 +08:00 |
|
kuang.yife
|
8b57f1d4ed
|
修复绑定银行卡判断问题，修复PC端分公司类目编辑按钮问题
|
2023-04-19 09:48:24 +08:00 |
|
Hawking
|
3b4376f8f5
|
Merge remote-tracking branch 'origin/master' into multiple_refund
|
2023-04-18 23:50:50 +08:00 |
|
Hawking
|
39085af80d
|
判断有未完成的售后单时，不允许再次创建售后单
|
2023-04-18 23:50:28 +08:00 |
|
kuang.yife
|
d6f909527f
|
售后记录操作不能在分账后
|
2023-04-18 22:47:59 +08:00 |
|
kuang.yife
|
b1877a0963
|
fix bug
|
2023-04-18 21:10:23 +08:00 |
|
kuang.yife
|
91123b00b8
|
取消状态提示
|
2023-04-18 15:22:01 +08:00 |
|
kuang.yife
|
87baa15f7b
|
Merge remote-tracking branch 'origin/master'
|
2023-04-18 13:43:07 +08:00 |
|
kuang.yife
|
814b74522a
|
取消状态判断
|
2023-04-18 13:42:55 +08:00 |
|
HH
|
0f34e80746
|
已取消/已完成的订单不能再取消
|
2023-04-18 13:26:00 +08:00 |