Hawking
|
8df08d1ff1
|
支付回调调整:
原逻辑: 单直接关联payment_id,当一个单发起了多次支付时,会造成混乱.
现更改为: 由支付成功的payment在回调时通过payment_relation表找到对应的单并关联.
1. FinancialMaster: 保存paymentId,更新支付状态;
2. FinancialChange: 保存paymentId,更新支付状态,并把金额加到FinancialDetail与FinancialMaster里;
3. OrderAddSubtract: 保存paymentId,更新支付状态,并把金额加到FinancialDetail与FinancialMaster里;
|
2023-05-31 23:13:21 +08:00 |
|
Hawking
|
210ade5f47
|
Adapay_payment 支付表
|
2023-05-31 18:50:46 +08:00 |
|
Hawking
|
05265ac17e
|
PaymentRelationMapper 支付关系表
|
2023-05-31 15:32:07 +08:00 |
 kuang.yife
|
d28e6a1b90
|
重构支付流水逻辑
|
2023-05-31 09:38:56 +08:00 |
|
Hawking
|
82a9d1cdbc
|
补充Adapay相关内容
|
2023-05-29 23:26:27 +08:00 |
|
Hawking
|
842793a74e
|
付款二维码接口参数改为String,以便后续支持多个订单ID传参
|
2023-05-29 15:44:40 +08:00 |
|
kuang.yife
|
36aa346c2a
|
Merge remote-tracking branch 'origin/master'
|
2023-05-28 23:56:37 +08:00 |
|
kuang.yife
|
b57a8383d2
|
pc发单流程
|
2023-05-28 23:56:29 +08:00 |
donqi
|
3ec22e2a8e
|
修改派单逻辑
|
2023-05-28 22:46:43 +08:00 |
|
kuang.yife
|
cea7d3301a
|
pc发单扣点
|
2023-05-28 22:43:18 +08:00 |
|
kuang.yife
|
a3168fdb6d
|
Merge remote-tracking branch 'origin/master'
|
2023-05-28 22:16:02 +08:00 |
|
kuang.yife
|
9f6a22a065
|
数据更改，PC发单扣点编辑
|
2023-05-28 22:15:53 +08:00 |
|
donqi
|
7d22d8bd86
|
二维码问题修复
|
2023-05-28 21:51:31 +08:00 |
|
donqi
|
b71f6d5570
|
付款二维码
|
2023-05-28 21:23:46 +08:00 |
|
donqi
|
27a8302c7f
|
生成二维码
|
2023-05-27 23:46:07 +08:00 |
|
donqi
|
6fc928fa34
|
订单管理的条件项
|
2023-05-25 02:06:13 +08:00 |
|
Hawking
|
09a0b0696c
|
子订单追加分账
|
2023-05-24 11:27:49 +08:00 |
|
Hawking
|
352a4323d0
|
保存子订单的追加扣减记录
|
2023-05-23 14:45:22 +08:00 |
|
kuang.yife
|
32a7dc96ea
|
PC下单默认付款方式在线支付
|
2023-05-22 14:43:23 +08:00 |
|
kuang.yife
|
eb8a213cc4
|
PC下单接口
|
2023-05-21 22:14:44 +08:00 |
|
donqi
|
d78b636d6b
|
订单状态
|
2023-05-21 22:14:17 +08:00 |
|
Hawking
|
ea674336ff
|
保存子订单的追加扣减记录
|
2023-05-21 16:02:47 +08:00 |
|
donqi
|
4929fc8d3a
|
模版发单页面样式修改
|
2023-05-21 03:07:18 +08:00 |
|
kuang.yife
|
db11b450a3
|
PC下单接口
|
2023-05-21 02:49:21 +08:00 |
|
kuang.yife
|
7caf7eae18
|
PC下单接口
|
2023-05-21 02:30:53 +08:00 |
|
donqi
|
f574bfed24
|
修改服务上架页面
|
2023-05-21 01:45:09 +08:00 |
|
kuang.yife
|
7d7d7ee584
|
PC下单接口
|
2023-05-21 00:29:24 +08:00 |
|
kuang.yife
|
f7cca0de02
|
Merge remote-tracking branch 'origin/master'
|
2023-05-20 23:49:02 +08:00 |
|
kuang.yife
|
8b7ab3c6fe
|
临时区域接口
|
2023-05-20 23:48:51 +08:00 |
|
Hawking
|
db206b6577
|
补充大师傅的子订单的提现时间
|
2023-05-18 23:45:34 +08:00 |
|
Hawking
|
12438386bd
|
补充大师傅的子订单的提现时间
|
2023-05-18 21:18:43 +08:00 |
|
Hawking
|
08b50407dd
|
订单列表“查看”
|
2023-05-18 16:33:33 +08:00 |
|
donqi
|
6d431cf991
|
订单统计问题修复
|
2023-05-17 21:50:03 +08:00 |
|
Hawking
|
f401676e02
|
后台下单时创建Customer和CustomerAddress
|
2023-05-17 21:31:48 +08:00 |
|
kuang.yife
|
444c532f9a
|
Merge remote-tracking branch 'origin/master'
|
2023-05-17 20:38:16 +08:00 |
|
kuang.yife
|
4a094c256e
|
默认101
|
2023-05-17 20:38:08 +08:00 |
|
donqi
|
92bf1bb533
|
修改订单统计及订单列表查询
|
2023-05-17 20:35:21 +08:00 |
|
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 |