187 Commits

Author	SHA1	Message	Date
Guoqs	cc2011be18	计算订单折扣	2025-12-23 14:04:32 +08:00
Guoqs	390c4247e8	update 退保险费方法	2025-12-17 09:24:50 +08:00
Lemon	9fd1d645cc	update 退保险费用时判断折扣金额	2025-12-17 09:17:55 +08:00
Guoqs	b130b95545	计算退款金额	2025-12-16 16:55:39 +08:00
Guoqs	ae74c73b11	delete 计算余额退款方法	2025-12-16 14:47:57 +08:00
Guoqs	c5c75503f6	计算余额退款方法	2025-12-15 17:02:46 +08:00
Lemon	c031dd9429	新增 余额支付和在线支付，消费金额小于1元退保险费逻辑	2025-12-15 14:21:05 +08:00
Guoqs	68c947574d	电单车订单，按实际退款	2025-11-14 10:43:48 +08:00
Lemon	997ca3863b	update	2025-11-06 09:15:46 +08:00
YAS\29473	c0ff8ac81f	bugfix 空指针判断	2025-11-06 08:54:44 +08:00
Lemon	dd2eb3365c	bug fix 修复订单结算空指针	2025-11-06 08:32:57 +08:00
Guoqs	8bb175c056	orderDetail中各时段用电量更新逻辑	2025-10-14 13:45:25 +08:00
Guoqs	94655706dc	update	2025-09-27 15:51:08 +08:00
Lemon	c54f649996	update 订单支付逻辑	2025-09-25 09:22:52 +08:00
Lemon	05a1232e82	update 订单支付逻辑	2025-09-25 09:08:15 +08:00
Guoqs	b598939be9	update 加注释	2025-08-26 16:21:20 +08:00
Lemon	490d695aef	update 如果电单车订单耗电量为 0，进行退款	2025-07-28 13:41:42 +08:00
Guoqs	bc4c59360e	update 站点选择器返参简化	2025-07-03 14:05:01 +08:00
Guoqs	1eab1ac647	结算订单时计算金额, 最后保留2位小数	2025-06-23 11:38:45 +08:00
Guoqs	4d4d8c1e77	电单车计算订单消费金额保留两位小数	2025-06-04 10:00:03 +08:00
Guoqs	47c84ac2d7	Merge branch 'dev-g' into dev	2025-06-03 15:26:13 +08:00
Guoqs	1b47d5e00e	打印日志	2025-06-03 15:15:08 +08:00
Lemon	f5e6e29f00	Merge branch 'dev-zza' into dev ... # Conflicts: # jsowell-ui/.env.development # jsowell-ui/.env.staging # jsowell-ui/bin/build-sit.bat # jsowell-ui/bin/build.bat # jsowell-ui/src/api/adapayMember/adapayMember.js # jsowell-ui/src/api/pile/merchant.js # jsowell-ui/src/router/index.js # jsowell-ui/src/views/financial/financeDetail.vue # jsowell-ui/src/views/financial/merchant.vue # jsowell-ui/src/views/homeIndex/homeIndex.vue # jsowell-ui/src/views/login.vue # jsowell-ui/src/views/pile/basic/detail.vue # jsowell-ui/src/views/pile/station/components/SiteInfo.vue # jsowell-ui/src/views/pile/station/detail.vue # jsowell-ui/src/views/pile/station/orderReport.vue	2025-06-03 14:26:37 +08:00
Lemon	2dd90e0938	update 设置实收金额字段	2025-05-16 14:08:48 +08:00
Guoqs	99803d00da	电单车订单 修改为发送订单信息到rabbitMQ, 进行退款和分账	2025-05-14 16:26:37 +08:00
Guoqs	4764cd9515	逻辑优化	2025-04-23 11:11:55 +08:00
Guoqs	2b6fd1ac36	退款时, 已退款金额判断移动到具体方法中	2025-04-23 10:18:26 +08:00
Guoqs	3af7954c44	打印日志	2025-04-23 09:28:32 +08:00
Guoqs	ca9d990139	打印日志	2025-04-22 15:08:52 +08:00
Guoqs	b0de317525	打印日志	2025-04-22 14:50:32 +08:00
Guoqs	96849b7fa8	update 打印日志	2025-04-21 16:38:14 +08:00
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