Commit Graph

1633 Commits

Author SHA1 Message Date
Guoqs
5e3180b810 打印日志 2025-02-19 16:21:59 +08:00
Guoqs
0fdec523dd Merge branch 'dev' into dev-g 2025-02-19 09:05:42 +08:00
Guoqs
9c9d4632e0 手动结算电单车订单逻辑update 2025-02-19 09:05:32 +08:00
Lemon
1db8a69efa update 第三方对接平台相关Service结构调整 2025-02-18 14:53:42 +08:00
Guoqs
6bdb74237b 打印日志update 2025-02-18 13:50:18 +08:00
Guoqs
e6625a33b5 Merge branch 'dev' into dev-g 2025-02-17 16:16:07 +08:00
Guoqs
bf673bc5bf 配置充电停车优惠 2025-02-17 16:15:54 +08:00
Lemon
5b8e8179c4 Merge branch 'dev-zza' into dev 2025-02-17 09:09:49 +08:00
Guoqs
e18cd482fa 深圳停车平台 2025-02-14 15:40:37 +08:00
Guoqs
eec3b20393 深圳停车平台 2025-02-14 14:09:48 +08:00
Guoqs
fbbab3019d 测试方法 2025-02-14 11:28:24 +08:00
Lemon
d32097e416 新增 河南省平台Controller 2025-02-13 13:27:18 +08:00
Guoqs
cd3aced52f 提现手续费改为参数传入 2025-02-13 11:49:52 +08:00
Guoqs
28b84152c0 Merge branch 'dev' into dev-g 2025-02-12 16:08:25 +08:00
Lemon
b85780f576 update 第三方平台整合方法 2025-02-12 08:57:57 +08:00
Guoqs
2e57525ade 停车平台 2025-02-11 11:54:24 +08:00
Guoqs
5e66ca653d 修改thirdparty中停车平台代码位置 2025-02-10 14:26:32 +08:00
Guoqs
a6c273e0e7 统计结算和用电度数都为0, 不统计 2025-02-09 16:26:30 +08:00
Guoqs
031f9cd98f 个人钱包消费列表优化 2025-01-22 11:18:55 +08:00
Guoqs
7f347f2bae getMemberBalanceChangesV2接口加字段 2025-01-20 15:26:08 +08:00
Guoqs
2785d91b4f 查询时间段内的订单分账记录 2025-01-17 15:13:53 +08:00
Lemon
095166e17c Merge branch 'dev-new' into dev-new-rabbitmq 2025-01-13 11:37:11 +08:00
Lemon
dbb005326b 新增 贵州平台补推订单接口 2025-01-13 10:54:24 +08:00
Lemon
569b78bca6 update 新运平台Service 2025-01-13 09:15:43 +08:00
Lemon
a094a866d0 新增 新运微平台Controller 2025-01-11 16:06:25 +08:00
Guoqs
ba38feb27a 查询运营商订单报表V3 2025-01-10 15:31:00 +08:00
Guoqs
f61e3633ea update 删除充电桩固件 2025-01-10 11:28:26 +08:00
Guoqs
fd3ceab0f6 停车平台, 停车优惠 2025-01-07 16:59:49 +08:00
Lemon
72c26562cf 后管运营商vip会员页面新增导出功能 2025-01-07 09:44:01 +08:00
Guoqs
bb02068115 update 2025-01-06 12:14:22 +08:00
Guoqs
97f33a3c84 Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
2025-01-02 16:59:01 +08:00
Guoqs
bd98e8e197 update 测试方法 2025-01-02 16:57:47 +08:00
Guoqs
f4157ba3e3 Merge branch 'dev-new' into dev-new-rabbitmq 2025-01-02 14:56:12 +08:00
Guoqs
236afdda33 update 分润配置页面 2025-01-02 14:54:57 +08:00
Guoqs
74885955c4 update 分润配置页面 2025-01-02 14:22:10 +08:00
Guoqs
1784e0f314 update 新分账方法 2024-12-31 16:17:37 +08:00
Guoqs
3b8224abb0 Merge branch 'dev-new' into dev-new-rabbitmq 2024-12-31 11:39:26 +08:00
Guoqs
a5a14c9e99 远程停止充电 校验交易流水号 2024-12-31 10:30:07 +08:00
Guoqs
ba6a82fd2a 临时接口, 关闭未支付订单 2024-12-31 09:47:45 +08:00
Guoqs
3e3ebe3dad update 2024-12-30 14:33:27 +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
Lemon
eff073a4ce update 广西平台Service 2024-12-30 11:47:32 +08:00
Guoqs
e8e85af444 希晓余额支付bug修复 2024-12-30 11:41:03 +08:00
Guoqs
665efe290b Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
2024-12-28 15:15:15 +08:00
Lemon
bdc6fd4693 新增 广西平台controller 2024-12-26 13:18:59 +08:00
Guoqs
0cc0e17b8a Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new 2024-12-26 10:04:45 +08:00
Guoqs
df90509fc6 update 2024-12-26 10:04:39 +08:00
Lemon
bd59654994 update 订单记录停止原因码 2024-12-20 13:25:22 +08:00
Lemon
5869e8d5f3 update 贵州省平台Service 2024-12-20 09:11:48 +08:00
Guoqs
d96060da9a 校验分账金额测试方法 2024-12-19 16:47:40 +08:00