2927 Commits

Author	SHA1	Message	Date
Guoqs	e7c780822c	处理OrderSplitRecord中值为0的数据	2025-10-10 16:03:46 +08:00
Lemon	85c02470ae	bugfix 修复分账空指针异常	2025-10-10 14:53:38 +08:00
Guoqs	483e4fd40d	添加字段	2025-10-10 14:18:36 +08:00
Guoqs	c3ddcccc80	添加站点id	2025-10-10 14:06:23 +08:00
Guoqs	9cacb7d45b	Merge branch 'master' into dev ... # Conflicts: # jsowell-admin/src/test/resources/payment_ids	2025-10-10 13:34:33 +08:00
Guoqs	ad405a6710	update 重试运营商分账方法	2025-10-10 13:32:53 +08:00
Lemon	6a0547c596	Merge branch 'dev' into dev-zza	2025-10-10 11:54:51 +08:00
Lemon	28a712637f	update 新增重新分账接口	2025-10-10 11:54:35 +08:00
Guoqs	2c0f571641	方法判空	2025-10-10 11:47:54 +08:00
Guoqs	67d95d0571	adapayService添加批量查询分账信息方法	2025-10-10 11:40:56 +08:00
Lemon	f5a58a70ea	update 生成分账记录时，采用订单结算日期当作tradeDate	2025-10-10 08:48:49 +08:00
YAS\29473	04912f9b1c	update	2025-10-09 17:09:27 +08:00
Guoqs	fe4b8bf3af	按照 memberId 对 SplitData 列表中的 amount 进行汇总，保留原始的 feeFlag 数据	2025-10-09 11:22:08 +08:00
Guoqs	5539ce6c40	过滤该运营商分账记录	2025-10-09 10:02:26 +08:00
bl\GQS02	faeb26faaf	启动失败的订单，同时退保险费用	2025-09-30 22:35:18 +08:00
YAS\29473	84a750b3f7	Merge remote-tracking branch 'origin/master'	2025-09-29 16:02:19 +08:00
Guoqs	786dbcf431	金额取订单分账记录表中的值	2025-09-29 14:45:14 +08:00
Guoqs	4043933276	金额取订单分账记录表中的值	2025-09-29 14:39:25 +08:00
Guoqs	61590a6d18	金额取订单分账记录表中的值	2025-09-29 14:33:58 +08:00
YAS\29473	c62a5e42f6	Merge remote-tracking branch 'origin/master'	2025-09-29 14:24:09 +08:00
Guoqs	6a3c262e7c	金额取订单分账记录表中的值	2025-09-29 14:21:48 +08:00
Guoqs	4efb428e5f	金额取订单分账记录表中的值	2025-09-29 14:15:41 +08:00
Guoqs	7c51106b17	金额取订单分账记录表中的值 ... (cherry picked from commit 36c635a465)	2025-09-29 14:06:06 +08:00
YAS\29473	a1652067c0	Merge remote-tracking branch 'origin/master'	2025-09-29 13:13:29 +08:00
Guoqs	21b9f3bf35	bugfix orderSplitRecords中电费分账金额与服务费分账金额为null, 设置0	2025-09-29 10:48:17 +08:00
YAS\29473	e25a230058	update 新电途实现类接口	2025-09-28 16:18:24 +08:00
Guoqs	94655706dc	update	2025-09-27 15:51:08 +08:00
Guoqs	15677b0dfe	重写toString	2025-09-27 15:03:13 +08:00
Guoqs	0b2558d2ed	打印日志	2025-09-27 14:48:33 +08:00
YAS\29473	79bd34d9f6	update	2025-09-27 13:46:26 +08:00
bl\GQS02	7edd93395a	数值为null, 默认0	2025-09-27 09:05:10 +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	c54f649996	update 订单支付逻辑	2025-09-25 09:22:52 +08:00
Lemon	05a1232e82	update 订单支付逻辑	2025-09-25 09:08:15 +08:00
Lemon	31895c7fa0	bugfix vin/刷卡启动没有保险金额字段导致报错	2025-09-24 22:08:44 +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
YAS\29473	297405471e	update	2025-09-22 15:11:21 +08:00
YAS\29473	6517c75df2	update	2025-09-22 09:31:13 +08:00
Lemon	bd62f259ac	update 修改车牌号校验是否绑定	2025-09-19 14:00:25 +08:00
YAS\29473	b2ced0f23e	update	2025-09-19 11:59:09 +08:00
YAS\29473	e6ea1cc82c	update	2025-09-19 10:35:38 +08:00
Guoqs	a1a6df26d3	wccService新增根据第三方平台类型查询对接第三方平台的运营商列表接口；新增根据站点idList批量查询枪口数据接口	2025-09-19 10:19:09 +08:00
Lemon	9d8cf73f92	bugfix 保险分账逻辑	2025-09-19 10:08:00 +08:00
Guoqs	80a4c4f2fc	新增运营商，添加alipayAppId	2025-09-18 14:30:38 +08:00
Lemon	ffbb95ae12	bugfix 退款逻辑	2025-09-16 16:27:41 +08:00
Lemon	ea92374c9c	bugfix 退款逻辑	2025-09-16 16:10:22 +08:00
Lemon	625a17d351	update pre环境也退款、分账	2025-09-16 16:01:35 +08:00