Commit Graph

510 Commits

Author SHA1 Message Date
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
c2f5f15557 Merge branch 'dev-new' into dev-new-rabbitmq 2024-12-19 15:22:45 +08:00
Lemon
1eea5b1bdc update 贵州省平台 2024-12-19 13:52:41 +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
Lemon
a681a5fe9c update 算法应用Service 2024-12-18 11:28:25 +08:00
Lemon
424d94d8a5 新增 宁波平台补推订单接口 2024-12-16 16:23:36 +08:00
Lemon
e0f040ec8b update 甘肃省平台Service 2024-12-11 15:29:03 +08:00
Lemon
c833d8c182 Merge branch 'dev-zzx' into dev-new 2024-12-11 11:26:10 +08:00
YAS\29473
efe56dc82f UPDATE 2024-12-11 08:29:36 +08:00
Guoqs
8493d49438 Merge branch 'dev-new' into dev-new-rabbitmq 2024-11-26 16:46:33 +08:00
Lemon
75cdfba054 Merge branch 'dev-zzx' into dev-new
# Conflicts:
#	jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java
2024-11-26 16:02:58 +08:00
Lemon
1c70a8b02f update 甘肃平台Service 2024-11-26 15:44:56 +08:00
Lemon
c424069175 update 甘肃平台、宁夏平台controller 2024-11-26 13:32:04 +08:00
YAS\29473
b2c35b8a0f update 2024-11-25 15:02:07 +08:00
YAS\29473
0174329d6c update 2024-11-25 11:36:36 +08:00
Guoqs
02a06c8991 Merge branch 'dev-new' into dev-new-rabbitmq 2024-11-22 14:21:58 +08:00
Guoqs
ea25b5f61c 打印日志 2024-11-22 11:37:48 +08:00
Lemon
ee0eddb680 新增 小程序查询桩升级固件列表 2024-11-21 16:24:57 +08:00
Guoqs
a6be4db07a Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
2024-11-19 17:13:09 +08:00
Guoqs
5ee7903204 update 获取个人桩充电记录 2024-11-19 17:11:07 +08:00
Guoqs
54d9a4e91e 保存蓝牙充电记录 2024-11-19 16:20:10 +08:00
Guoqs
1a3ac55f14 Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
#	jsowell-admin/src/test/java/SpringBootTestController.java
2024-11-16 14:27:13 +08:00
Guoqs
9533c234e6 修正并充订单数据工具 2024-11-15 10:59:42 +08:00
Guoqs
a59dc883c1 校验是否为并充订单 2024-11-14 17:02:03 +08:00
Lemon
c2f849ec75 update 2024-11-14 08:44:18 +08:00
Guoqs
3e320cbc89 校验是否为并充订单 2024-11-13 17:06:46 +08:00
Lemon
a9fa8dc01a update 甘肃省平台 2024-11-11 10:41:33 +08:00
Guoqs
8aa72a0969 对接内蒙古平台 2024-11-07 17:11:11 +08:00
Guoqs
23ae7ecab3 并充计算订单耗电量 2024-11-07 15:02:52 +08:00
Guoqs
d6489a80ee Merge branch 'dev-new' into dev-new-rabbitmq 2024-11-05 16:58:09 +08:00
Guoqs
1c3e228911 测试RabbitMQ 2024-11-05 16:56:43 +08:00
Guoqs
5f14ad3411 解绑个人桩,校验桩号是否为空 2024-11-05 15:56:26 +08:00
Guoqs
f4feca4207 绑定蓝牙桩 2024-11-05 14:29:30 +08:00
Lemon
f5a2b78fd0 update 宁波市平台 2024-10-30 14:38:14 +08:00
Lemon
a590c8843b update 运营端小程序接口 2024-10-28 10:42:57 +08:00
Lemon
76662d5a67 update 运营端小程序接口
(cherry picked from commit 9dd18c9ffb7e5b847b5fe462aaca361316b9dd32)
2024-10-28 10:42:24 +08:00
Lemon
4989868d65 新增 运营端小程序收费明细接口
(cherry picked from commit d5eae744a28c1b29a7cbed0019239e05da3868f7)
2024-10-28 10:37:19 +08:00
Guoqs
751ba929d7 update 电单车 2024-10-11 09:19:19 +08:00
Guoqs
612ccfac2a update 电单车 2024-10-10 16:00:23 +08:00
Guoqs
a56e824240 update 电单车 2024-10-10 14:16:10 +08:00
Guoqs
a8d7e76d25 update 电单车 2024-09-30 15:49:55 +08:00
Lemon
ee9d2588b1 update 苏州市平台 2024-09-25 15:16:13 +08:00
Guoqs
ee84883a9c update 校验签名 2024-09-25 11:53:45 +08:00
Guoqs
4bfb26b38d update 校验签名 2024-09-25 11:49:14 +08:00
Guoqs
ec1385a110 update 查询充电桩详情 2024-09-24 14:57:52 +08:00
Guoqs
fc89dc2e65 update 电单车 2024-09-24 10:33:12 +08:00
Lemon
407b9586fd 新增 苏州市平台相关Service、controller 2024-09-24 09:49:47 +08:00