Commit Graph

156 Commits

Author SHA1 Message Date
Guoqs
ed604022a1 如果总耗电量大于0, 并且各个时段耗电量总和为0, 则优惠后金额等于优惠前金额 2025-04-11 16:54:47 +08:00
Guoqs
9be4a65e03 判断耗电量大于0 2025-04-11 11:28:15 +08:00
Guoqs
05d35978cc 折扣后电费不能大于原始电费金额, 折扣后服务费不能大于原始服务费金额 2025-04-11 11:17:09 +08:00
Guoqs
a84d5dcd9a 折扣后电费不能大于原始电费金额, 折扣后服务费不能大于原始服务费金额 2025-04-11 10:31:17 +08:00
Guoqs
8b917f0285 电费折扣金额和服务费折扣金额 应该大于等于0, 如小于0, 则设置为0 2025-04-11 10:14:39 +08:00
Guoqs
5e1563bdae update 计算订单优惠金额 2025-04-11 08:47:47 +08:00
Guoqs
8e0042a7bb update 计算订单优惠金额 2025-04-10 16:32:04 +08:00
Guoqs
58549f4a04 打印日志 2025-04-10 16:20:13 +08:00
Guoqs
cd42805c21 结算订单添加try catch 2025-04-07 09:30:52 +08:00
Guoqs
c225ebf3ec update 打印日志 2025-04-03 11:57:59 +08:00
Guoqs
33d54875c2 【公共方法】 returnUpdateOrderBasicInfo 与 returnUpdateOrderDetail 逻辑合并 2025-04-03 11:49:39 +08:00
Guoqs
2a660e31e5 退款金额小于等于0, 不执行退款 2025-04-02 11:15:22 +08:00
Guoqs
7b88280d14 如果totalElectricityAmount + totalServiceAmount != dataOrderAmount,则totalElectricityAmount = dataOrderAmount - totalServiceAmount 2025-04-02 11:02:01 +08:00
Guoqs
0658e67930 打印日志 2025-04-02 10:23:25 +08:00
Guoqs
2d949e57cc 打印日志 2025-04-02 10:15:54 +08:00
Guoqs
a1d0fbedd0 打印日志 2025-04-02 10:14:24 +08:00
Guoqs
3967f987fa 如果算出来的 电费金额 + 服务费金额 != 总消费金额,并且尖峰平谷总用电量大于0, 则使用平台计算金额 2025-03-31 15:05:06 +08:00
Guoqs
3a0493dca8 测试希晓结算订单逻辑 2025-03-31 13:41:09 +08:00
Guoqs
fdee4a7d8c testSettleOrderLogicV2 2025-03-26 20:32:12 +08:00
Guoqs
063c4f494f 优化结算订单逻辑 2025-03-26 19:37:05 +08:00
Guoqs
5fc11ac45d 优化结算订单逻辑 2025-03-26 19:26:06 +08:00
Guoqs
03ed70e58a 优化结算订单逻辑 2025-03-26 19:12:22 +08:00
Guoqs
87a84c020a 优化结算订单逻辑 2025-03-26 17:15:54 +08:00
Guoqs
99a39bce5f 优化结算订单逻辑 2025-03-26 16:25:52 +08:00
Guoqs
738854e2a6 不使用交易记录中的时段金额 2025-03-26 16:10:50 +08:00
Guoqs
72b99da831 打印日志 2025-03-26 15:52:08 +08:00
Guoqs
94c3f33b5e 优化结算订单逻辑 2025-03-26 15:30:39 +08:00
Guoqs
c5be09a3e3 打印日志 2025-03-26 14:32:28 +08:00
Guoqs
2121e540aa 打印日志 2025-03-26 14:19:34 +08:00
Guoqs
06cac74a18 优化结算订单逻辑 2025-03-26 13:49:31 +08:00
Guoqs
8c8cb42ba8 优化结算订单逻辑 2025-03-26 11:49:33 +08:00
Guoqs
c5bc4d194f 优化结算订单逻辑 2025-03-25 17:06:10 +08:00
Guoqs
0e0f6d6823 优化结算订单逻辑 2025-03-25 17:05:25 +08:00
Guoqs
8459098231 打印日志 2025-03-25 16:43:08 +08:00
Guoqs
74c5828ed1 打印日志 2025-03-25 16:41:42 +08:00
Guoqs
9c9d4632e0 手动结算电单车订单逻辑update 2025-02-19 09:05:32 +08:00
Guoqs
154a7f35b6 配置充电停车优惠 2025-02-18 09:42:37 +08:00
Guoqs
f53eb97c0f totalElectricity = sumUsedElectricity与totalElectricity, 取最大的值 2025-01-21 11:07:04 +08:00
Guoqs
b0e6cd6219 不在新分账逻辑站点列表中的, 可以走退款逻辑 2024-12-30 14:46:49 +08:00
Guoqs
1f9554b814 订单实时监测记录, 电流为0的不保存到数据库中 2024-12-30 14:37:03 +08:00
Guoqs
729c47cc0c Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
2024-12-30 13:58:40 +08:00
Guoqs
e8e85af444 希晓余额支付bug修复 2024-12-30 11:41:03 +08:00
Guoqs
fdad5e218c Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/test/java/PaymentTestController.java
2024-12-19 13:30:11 +08:00
Guoqs
d90ece633f 保存0x13, 0x17, 0x19, 0x23中的soc 2024-12-12 13:39:31 +08:00
Guoqs
df356558b5 更新注释 2024-11-29 16:22:27 +08:00
Guoqs
7a70db75ac test方法 2024-11-29 15:21:14 +08:00
Guoqs
c09d43f164 update 重构 2024-11-29 13:33:12 +08:00
Guoqs
c773da3653 update 2024-11-16 16:05:40 +08:00
Guoqs
ac33d967f8 update 2024-11-06 15:09:09 +08:00
Guoqs
5a1cf19699 发送rabbitmq消息 2024-11-05 15:39:17 +08:00