Commit Graph

76 Commits

Author SHA1 Message Date
dad01f7f85 解决冲突 2025-07-08 16:12:50 +08:00
383a64077d 添加手续费 2025-07-08 16:12:16 +08:00
1dada43e0c 解决冲突 2025-07-07 19:34:57 +08:00
402a7644e6 fix: 提交支持自动创建用户和订单代码 2025-07-07 13:31:17 +08:00
d5e4c9590f Merge branch 'jng' 2025-07-03 16:11:44 +08:00
bda31412ee Merge branch 'jng' into dev 2025-07-03 14:31:35 +08:00
e9f12cd0eb 111 2025-07-03 14:28:09 +08:00
e7a5e19472 添加手续费字段 2025-07-03 14:02:25 +08:00
76e2b893a1 解决冲突 2025-07-02 15:30:51 +08:00
641c10aec2 解决冲突 2025-07-02 14:01:44 +08:00
0f40072e22 添加支付时间筛选 2025-07-02 14:00:54 +08:00
57a3154634 fix: 拦截重复回调 2025-06-27 20:03:21 +08:00
f3e29cb7e8 解决冲突 2025-06-26 17:32:53 +08:00
lzh
bfc409ed70 Merge branch 'dev-lzh' 2025-06-26 17:18:58 +08:00
46ffdc0d0d Merge branch 'jng' into dev 2025-06-26 13:53:41 +08:00
7c0027f624 修改 2025-06-26 13:53:16 +08:00
c25157b661 Merge branch 'jng' into dev 2025-06-26 13:41:07 +08:00
397dd56761 修改 2025-06-26 13:40:03 +08:00
24a6fd1eba Merge branch 'jng' into dev 2025-06-25 16:58:31 +08:00
26eb0df464 修改 2025-06-25 16:57:57 +08:00
66f70eb643 修改 2025-06-25 15:31:42 +08:00
b9313b9ba2 添加状态筛选 2025-06-25 15:29:37 +08:00
58a066315b 解决冲突 2025-06-24 13:42:22 +08:00
f02601e5e8 修改 2025-06-24 13:41:10 +08:00
19aa5b8955 解决冲突 2025-06-20 15:47:25 +08:00
5753c952f4 修改 2025-06-20 15:45:58 +08:00
190faad47f Merge branch 'jng' into dev 2025-06-20 13:24:13 +08:00
53a407cc1c 修改 2025-06-20 13:23:47 +08:00
044f79575c 解决冲突 2025-06-19 15:29:41 +08:00
c537e1e50c 修改 2025-06-19 15:26:08 +08:00
38f03838a5 fix: 根据orderNo只查询增值服务接口的source写错了 2025-06-16 13:25:22 +08:00
8fe2ea816f fix: 调整order-detail接口,可以根据token直接捞到子订单 2025-06-16 11:08:16 +08:00
fb413f80bc fix: 新增接口,根据对账单流水号更新对账单支付状态和支付时间。创建对账单根据对账单流水号去重 2025-06-16 09:52:20 +08:00
cb21e13c4e fix: 新增接口,根据orderNo,仅查询它单独购买的增值服务 2025-06-15 19:15:30 +08:00
5205119945 fix: 处理bug 2025-06-15 18:49:06 +08:00
50b4009043 fix: detail接口增加addBundle的字段 2025-06-15 18:29:01 +08:00
f3eb2eef59 修改 2025-06-15 15:58:49 +08:00
681589cf4d 解决冲突 2025-06-15 13:20:43 +08:00
d4b8be90ea 修改 2025-06-15 13:20:14 +08:00
9c7d3f1435 fix: listV2查询增加两个字段CheckoutSessionId和CustomerID,UpdateOrderRecordByOrderNO方法能够改checkSessionId和checkSessionUrl 2025-06-15 13:00:21 +08:00
b72b7e17ec 修改 2025-06-15 10:08:40 +08:00
1f0a6c2082 111 2025-06-14 15:09:15 +08:00
7f28aeb349 修改 2025-06-14 11:29:33 +08:00
53d67eef82 修改 2025-06-14 10:21:05 +08:00
b8dadc0ee0 修改 2025-06-13 22:36:54 +08:00
2238689f11 修改 2025-06-13 19:25:00 +08:00
581d005eff 修改 2025-06-13 14:01:29 +08:00
a619c45aa7 修改 2025-06-12 18:13:57 +08:00
8694d6b52d 修改 2025-06-12 16:37:22 +08:00
af14bcf74b 修改 2025-06-11 14:32:51 +08:00