Commit Graph

447 Commits

Author SHA1 Message Date
32ab518ca1 update 查询订单详情页时,检查订单状态 2023-10-10 13:29:58 +08:00
c7e01848e4 update 车牌号 Vin 唯一校验 2023-10-10 10:32:19 +08:00
250af6aad3 打印日志 2023-10-10 09:32:30 +08:00
45871490e4 update 余额订单分账 2023-09-27 10:57:36 +08:00
94436f5484 update 2023-09-26 15:56:36 +08:00
530e1d11d7 update 2023-09-26 15:41:05 +08:00
7897dd6876 update 2023-09-26 11:12:54 +08:00
Lemon
435ff1cbd1 update 希晓小程序恢复余额支付 2023-09-23 11:49:15 +08:00
76d0d4bc9a 隐藏余额支付方式 2023-09-21 08:39:30 +08:00
a35ca2e74a update 打印日志 2023-09-20 14:01:21 +08:00
79e0dcb259 update 打印日志 2023-09-19 10:38:48 +08:00
2fe34b5bf7 update 后管订单详情页查询退款信息 2023-09-15 14:25:51 +08:00
cadfa31c98 update 订单退款明细 2023-09-15 14:00:45 +08:00
Lemon
392979186d 新增 中电联controller 2023-09-14 16:02:49 +08:00
727baadce3 update 添加启用注解 2023-09-14 14:32:57 +08:00
Lemon
11246b0496 扫描枪口二维码判断枪口状态是否插枪 2023-09-14 08:40:51 +08:00
Lemon
226edbbbb9 update 2023-09-13 15:47:15 +08:00
Lemon
318f7a35ac 修复 联联推送订单bug 2023-09-13 15:23:01 +08:00
Lemon
53686f2b93 小程序扫二维码时判断桩、枪口状态并返回对应的信息 2023-09-13 14:15:19 +08:00
919db803f1 update 打印日志 2023-09-12 08:33:45 +08:00
2066c9948b update 2023-09-11 10:54:41 +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
8befe2d745 update 2023-09-05 16:42:33 +08:00
37bc31a6f6 update
(cherry picked from commit de3fe081f8)
2023-09-05 15:50:25 +08:00
45af011278 update 订单逻辑改造工厂模式 2023-09-01 17:29:59 +08:00
fbe64887f5 update 订单逻辑改造工厂模式 2023-09-01 15:45:04 +08:00
0ce2746a24 update订单逻辑改造工厂模式 2023-09-01 14:51:39 +08:00
545badd38b update订单逻辑改造工厂模式 2023-09-01 11:41:37 +08:00
b53aedb423 update订单逻辑改造工厂模式 2023-09-01 11:36:31 +08:00
fa5ecb02dd update 批量订单退款接口 2023-08-31 17:31:19 +08:00
f8e2ee3c65 update 2023-08-31 15:16:45 +08:00
Lemon
789b9d729f Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-31 11:21:48 +08:00
Lemon
f31dc8dfe7 update 添加字段 2023-08-31 11:21:41 +08:00
acff945822 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-31 10:30:12 +08:00
2138eeaad0 订单支付记录 给默认值 2023-08-31 10:30:05 +08:00
Lemon
73b203dd44 update 后管订单详情页面中 实时订单数据添加字段 2023-08-31 10:29:17 +08:00
c35e05ba96 update 2023-08-29 17:05:36 +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
d00686d6e8 交易分账 重构 2023-08-28 19:53:43 +08:00
d31531b09b 交易分账 重构 2023-08-28 17:31:43 +08:00
c0a1b10b2e 交易分账 重构 2023-08-28 17:30:13 +08:00
d1b0d40e24 交易分账 重构 2023-08-28 17:27:57 +08:00
e4d3d481da 交易分账 重构 2023-08-28 15:30:24 +08:00
b89e3dca20 交易分账 重构 2023-08-28 15:10:38 +08:00
517b88f6a2 交易分账 重构 2023-08-28 15:05:24 +08:00
7a9361af9d 交易分账 重构 2023-08-28 14:53:02 +08:00
01025fb40b 更新会员交易记录的冻结金额 2023-08-28 11:17:06 +08:00
ef8cd011e4 update 2023-08-26 18:01:25 +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