 kuang.yife
|
ea2d9d683b
|
Merge remote-tracking branch 'origin/master'
|
2023-05-17 20:33:09 +08:00 |
|
kuang.yife
|
74a72688db
|
数据隔离
|
2023-05-17 20:32:58 +08:00 |
Hawking
|
d00aaea21c
|
查询师傅银行卡信息时要带上deptId
|
2023-05-17 15:18:56 +08:00 |
|
Hawking
|
40e5098a7e
|
Merge remote-tracking branch 'origin/master'
|
2023-05-16 22:49:20 +08:00 |
|
Hawking
|
063717b4ca
|
师傅退单/商家退单
|
2023-05-16 22:48:43 +08:00 |
|
kuang.yife
|
f9b9653cc6
|
数据隔离
|
2023-05-16 14:44:59 +08:00 |
|
kuang.yife
|
daa1555f62
|
文案修复
|
2023-05-16 11:43:51 +08:00 |
|
kuang.yife
|
feb2bee79e
|
PC 师傅列表分公司数据权限隔离
|
2023-05-16 11:25:14 +08:00 |
donqi
|
9ad2b8cb3b
|
修改订单列表及详情查询是否超时单判断逻辑
|
2023-05-12 22:24:28 +08:00 |
|
kuang.yife
|
c3540575ab
|
子单订单详情
|
2023-05-11 14:45:35 +08:00 |
|
kuang.yife
|
ba8a37c77d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ghy-payment/src/main/resources/mapper/financial/OrderFineRecordMapper.xml
|
2023-05-11 10:58:37 +08:00 |
|
donqi
|
5b1f10fadd
|
超时记录同状态同子单有两条？默认先取时间较晚单那条记录
|
2023-05-10 22:03:29 +08:00 |
|
Hawking
|
e7cdfe188d
|
主订单分账时扣除罚金
|
2023-05-10 21:02:04 +08:00 |
|
Hawking
|
6436dffee0
|
主订单超时罚金
|
2023-05-10 20:47:05 +08:00 |
|
Hawking
|
f64296dec7
|
主订单未派单超时
|
2023-05-10 20:14:07 +08:00 |
|
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 |
|
kuang.yife
|
48986fd44a
|
旧超时状态暂时用limit 1限制，避免报错
|
2023-05-05 11:01:01 +08:00 |
|
kuang.yife
|
ccf9a8bb61
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ghy-payment/src/main/resources/mapper/financial/OrderFineRecordMapper.xml
|
2023-05-05 11:00:42 +08:00 |
|
kuang.yife
|
29588e68d2
|
旧超时状态暂时用limit 1限制，避免报错
|
2023-05-05 10:59:44 +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 |