2173 Commits

Author	SHA1	Message	Date
Lemon	eab7ab2cfa	update	2025-04-15 11:21:53 +08:00
Lemon	4a4b1e9672	update	2025-04-15 10:46:39 +08:00
Lemon	9c3eac914c	update	2025-04-15 10:17:43 +08:00
Lemon	2ec926c0e7	Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev ... # Conflicts: # jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java # jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java # jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java # jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml	2025-04-15 10:01:48 +08:00
Lemon	dfb46e0fe0	新增 后管根据汇付会员id查询分账汇总数据 接口	2025-04-15 09:53:36 +08:00
YAS\29473	4ea7ae3549	Merge remote-tracking branch 'origin/dev' into dev-zzx	2025-04-14 17:02:17 +08:00
YAS\29473	247185202e	新增 根据汇付会员id查询分账汇总数据接口	2025-04-14 17:02:09 +08:00
Lemon	cba009bcf2	bugfix 查询分账列表如果没订单会报错	2025-04-14 14:01:59 +08:00
YAS\29473	bc7fa82f71	update	2025-04-14 12:14:15 +08:00
YAS\29473	2a02aeabb0	update	2025-04-14 11:01:09 +08:00
Lemon	12ec92c872	Merge branch 'dev-zza' into dev	2025-04-12 16:09:37 +08:00
Lemon	e7cba4eefd	update	2025-04-12 16:07:50 +08:00
Lemon	0ec76dd08b	update 订单分账记录 将当前登录用户的分账信息置顶	2025-04-12 16:04:19 +08:00
Lemon	ef596a6fc7	新增 充电订单电池算法报告实体类、Service	2025-04-12 15:39:23 +08:00
Guoqs	ed604022a1	如果总耗电量大于0, 并且各个时段耗电量总和为0, 则优惠后金额等于优惠前金额	2025-04-11 16:54:47 +08:00
Lemon	4fe641de1b	bugfix	2025-04-11 16:50:23 +08:00
Lemon	dc3efa717d	update 添加分页参数	2025-04-11 16:22:53 +08:00
Guoqs	162911acd9	UPDATE 修改用户余额方法	2025-04-11 16:08:20 +08:00
Lemon	c9b8938cbb	update 添加分页参数	2025-04-11 15:56:43 +08:00
Lemon	c997ca502c	update 后管查询订单分账详情页面新增字段	2025-04-11 15:29:52 +08:00
Lemon	a3d285784c	Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev	2025-04-11 15:00:19 +08:00
Lemon	beced664ec	新增 后管查询订单分账数据接口	2025-04-11 14:59:46 +08:00
Guoqs	686ab4ec7b	折扣金额为空时默认0	2025-04-11 14:52:55 +08:00
Guoqs	aef1dcade4	重试分账接口	2025-04-11 14:39:00 +08:00
Lemon	3f26010b7d	Merge branch 'dev-zza' into dev	2025-04-11 13:57:55 +08:00
Lemon	7a0ec7e4e3	update	2025-04-11 13:57:22 +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	5700485306	修改用户余额, 余额为空直接返回	2025-04-10 16:06:17 +08:00
Guoqs	ee8d677d04	修改用户余额, 余额为空直接返回	2025-04-10 16:03:03 +08:00
YAS\29473	90177f55a6	根据汇付会员id查询配置分账的站点列表	2025-04-09 19:53:33 +08:00
YAS\29473	5bc268c922	增加字段	2025-04-08 08:51:20 +08:00
Lemon	9c278b05d1	update 查询用户常去站点方法	2025-04-07 15:01:16 +08:00
Guoqs	cd42805c21	结算订单添加try catch	2025-04-07 09:30:52 +08:00
Guoqs	1a7c88c09a	校验站点分润配置, 提出一个方法	2025-04-03 17:00:00 +08:00
Guoqs	905b5fb24d	根据站点id逻辑删除 分润配置	2025-04-03 14:09:11 +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
YAS\29473	5f8b4fdede	增加会员明细和导出功能	2025-04-02 14:48:39 +08:00
Lemon	38469d1925	Merge branch 'dev-zza' into dev	2025-04-02 13:40:41 +08:00
Lemon	7cc052b799	update 0x13电流、充电度数都为0不保存到redis	2025-04-02 13:39:25 +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