Commit Graph

1681 Commits

Author SHA1 Message Date
Lemon
5c5f8c565c update 人工结算订单添加查询交易记录逻辑 2025-11-06 11:32:43 +08:00
bl\GQS02
1068c4c5dd Merge branch 'master' into dev 2025-11-06 11:27:56 +08:00
Lemon
7ef90d05c2 update 2025-11-06 11:26:05 +08:00
Lemon
87c5373430 update 启动失败设置结算时间、debugOrder接口新增修改订单状态 2025-11-06 11:17:05 +08:00
bl\GQS02
2ce7468e0d update 2025-11-06 10:53:07 +08:00
Lemon
ca6b1b43da update pre数据库切换为正式环境数据 2025-10-31 13:24:05 +08:00
Lemon
f6f7185f4f update 2025-10-31 11:56:27 +08:00
Lemon
920ed93d44 update 2025-10-31 11:47:51 +08:00
Lemon
f6be15704b update pre数据库环境改为阿里云测试服务器 2025-10-31 11:40:09 +08:00
Lemon
8dccc7d036 update pre数据库环境改为阿里云测试服务器 2025-10-31 11:26:32 +08:00
Lemon
5df6dd9d20 新增 移动充电桩到另一个站点接口 2025-10-30 15:48:39 +08:00
YAS\29473
b1e64a8be9 update 校验用户(管理员,普通用户),不可重复绑定同一台桩 2025-10-30 10:48:44 +08:00
YAS\29473
cdf476cfc0 update 2025-10-23 14:28:45 +08:00
YAS\29473
56229e5fa1 update 2025-10-23 14:22:33 +08:00
YAS\29473
b06a119ab3 update 2025-10-23 14:07:58 +08:00
YAS\29473
2c7b56b1d7 update 2025-10-16 16:36:46 +08:00
YAS\29473
4bb4665460 update 2025-10-16 16:26:14 +08:00
Guoqs
65a26e1faf 查询订单分账配置 2025-10-14 11:50:21 +08:00
Guoqs
25be44af31 打印日志 2025-10-13 16:41:05 +08:00
bl\GQS02
1ec364e456 使用retryMerchantSplitV2 2025-10-11 21:04:18 +08:00
bl\GQS02
f3a200600a update 检查订单分账记录 2025-10-11 20:50:07 +08:00
Lemon
2b9801228d Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-10-11 16:07:42 +08:00
Lemon
ca83cffffa add 后管新增退款保险金额按钮 2025-10-11 16:07:37 +08:00
Guoqs
17873f5405 检查订单分账记录 2025-10-11 15:29:29 +08:00
Guoqs
da5664b7bf 根据paymentIdList查询分账信息 2025-10-11 14:12:32 +08:00
Guoqs
f59201129f update 重试运营商分账 2025-10-11 13:06:11 +08:00
Lemon
2cdd16b5c1 Revert "Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev"
This reverts commit ee55e3c3cf, reversing
changes made to befffda063.
2025-10-11 11:37:02 +08:00
Lemon
d8c1cdebcd update 重试运营商分账接口 2025-10-11 11:26:55 +08:00
Guoqs
2e7d7cebbc Merge branch 'dev' 2025-10-10 16:26:42 +08:00
Guoqs
5b800cbc01 处理OrderSplitRecord中值为0的数据 2025-10-10 16:26:01 +08:00
Guoqs
bd4b615729 Merge branch 'dev' 2025-10-10 16:04:46 +08:00
Guoqs
e7c780822c 处理OrderSplitRecord中值为0的数据 2025-10-10 16:03:46 +08:00
Lemon
6a937c1801 update 格式化开始时间、结束时间 2025-10-10 15:33:10 +08:00
Guoqs
cf5a02d56a update 重试运营商分账方法 2025-10-10 13:39:42 +08:00
Guoqs
cd789f0590 update 重试运营商分账方法 2025-10-10 13:33:51 +08:00
Guoqs
ad405a6710 update 重试运营商分账方法 2025-10-10 13:32:53 +08:00
Lemon
1489505e86 update 重试运营商分账接口 2025-10-10 13:10:56 +08:00
Lemon
28a712637f update 新增重新分账接口 2025-10-10 11:54:35 +08:00
YAS\29473
31fd742a73 update 2025-09-28 17:27:40 +08:00
YAS\29473
2abe7ee27e update 2025-09-28 17:16:37 +08:00
YAS\29473
e25a230058 update 新电途实现类接口 2025-09-28 16:18:24 +08:00
YAS\29473
58a7bbfd8e 新增新电途推送接口 2025-09-28 15:10:46 +08:00
YAS\29473
79bd34d9f6 update 2025-09-27 13:46:26 +08:00
YAS\29473
0e76aabd45 Merge remote-tracking branch 'origin/dev' into dev 2025-09-26 14:56:16 +08:00
YAS\29473
60ced96cb5 update 2025-09-26 14:55:18 +08:00
Lemon
5c86e525d2 update 小程序关闭待支付订单接口 2025-09-25 11:02:59 +08:00
Lemon
d4e7a665a9 update 新增小程序关闭待支付订单接口 2025-09-25 10:06:36 +08:00
Lemon
625a577aeb Merge branch 'dev-zza' into dev
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
2025-09-23 10:46:38 +08:00
Lemon
896f69f496 update 电池充电报告Service 2025-09-23 10:44:29 +08:00
Lemon
4088313277 update 方法注释 2025-09-18 14:32:14 +08:00