Commit Graph

177 Commits

Author SHA1 Message Date
Lemon
fd0edde8ea 新增 软杰停车平台相关逻辑 2023-09-22 15:53:56 +08:00
8c6175bedd update 打印日志 2023-09-18 16:28:24 +08:00
0372b9a6bf update 全局map 2023-09-18 16:16:02 +08:00
919db803f1 update 打印日志 2023-09-12 08:33:45 +08:00
5b6f1c24ad update 地锁逻辑修改 2023-09-09 15:53:49 +08:00
aa345ee629 Merge branch 'dev' into merge_adapay
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/resources/application-dev.yml
2023-09-08 15:48:57 +08:00
cc1fd3fafd update 地锁逻辑修改 2023-09-08 15:48:07 +08:00
b53aedb423 update订单逻辑改造工厂模式 2023-09-01 11:36:31 +08:00
5a7e130e26 update 订单逻辑改造工厂模式 2023-09-01 10:59:50 +08:00
90539edf60 Merge branch 'dev' into merge_adapay
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
2023-08-29 17:03:24 +08:00
Lemon
a90fc4f9f3 update 支付回调新增占桩逻辑处理、 后管运营商订单报表新增字段 2023-08-29 16:40:20 +08:00
23740f646c update 2023-08-26 18:09:51 +08:00
Lemon
8b6b3b7d65 update 生成桩号缓存 2023-08-26 15:47:10 +08:00
a4df389c7d redisUtils 2023-08-26 10:28:53 +08:00
4997669ca7 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-26 09:48:06 +08:00
Lemon
871dbe4882 update 新增桩时判断编号 2023-08-26 09:46:46 +08:00
8cf8d39a9e update 修改结算订单逻辑 2023-08-25 17:21:39 +08:00
Lemon
9c3c80ca3f 新增 绑定停车平台接口 2023-08-25 14:23:35 +08:00
Lemon
454022c553 update 会员区分运营商 2023-08-25 13:17:30 +08:00
867c8240c5 余额支付订单分账工具 2023-08-24 17:23:33 +08:00
2b6ded7b75 update 2023-08-23 16:46:07 +08:00
c5a8b808c6 update 2023-08-23 16:26:02 +08:00
Lemon
7bcab6a65a 新增 路通云停系统获取令牌接口 2023-08-23 14:13:11 +08:00
83d52dd6e9 update 逻辑提现 2023-08-22 11:08:35 +08:00
36fe313a82 查询站点订单日报详情 2023-08-22 09:42:30 +08:00
47c3415080 打印日志 2023-08-18 14:49:36 +08:00
31c295ee90 生成占桩订单 2023-08-18 12:02:34 +08:00
Lemon
5bf5ffc3b7 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
2023-08-18 11:42:26 +08:00
Lemon
00cfd77eeb 新增 占桩订单相关接口 2023-08-18 11:40:23 +08:00
027c7513aa 支付占桩订单 2023-08-18 11:19:58 +08:00
09f1588a99 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
2023-08-18 11:14:21 +08:00
Lemon
74af1bba60 新增 占桩订单相关接口 2023-08-18 10:15:56 +08:00
4af9c7a184 支付占桩订单 2023-08-18 09:52:12 +08:00
4766740427 订单详情页新增退款信息 2023-08-17 16:10:31 +08:00
fb3588c565 update 重试订单退款接口 2023-08-17 15:05:01 +08:00
935f45938c 多商户配置 2023-08-15 15:42:39 +08:00
Lemon
acef56864e 新增 桩实时数据 故障原因字段 2023-08-14 11:41:23 +08:00
Lemon
6d67dd212c update 修改充电桩别名 2023-08-08 15:54:53 +08:00
9783769b46 占桩订单表 实体类update 2023-08-07 16:53:42 +08:00
Lemon
433a2767ce update 2023-08-07 09:37:43 +08:00
9331edb6de update 登录注册接口 2023-08-04 16:14:55 +08:00
bf1fa80497 update 默认分隔符 2023-08-04 13:55:36 +08:00
17bb663d94 update 获取地锁数据 2023-08-02 14:43:34 +08:00
40e8c12ca5 update 保存提现信息 2023-08-01 16:16:34 +08:00
Lemon
cb3ef2c242 新增 微信第三方平台 获取审核状态接口 2023-08-01 10:08:32 +08:00
Lemon
f079eea109 update 获取预授权码 2023-07-31 13:58:14 +08:00
47d7b3f84b update 2023-07-29 15:37:11 +08:00
Lemon
13b7a1f9a6 新增 微信第三方平台 使用授权码获取授权信息接口 2023-07-29 11:42:01 +08:00
801142f291 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-07-28 17:04:59 +08:00
4dca727883 update 2023-07-28 17:04:52 +08:00