yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,985 Commits 3 Branches 0 Tags
Commit Graph

221 Commits

Author SHA1 Message Date
yjh_yyds
edae65c7b1 Merge remote-tracking branch 'origin/operation' into operation 
# Conflicts:
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDNotificationEquipmentV2GPowerInfoTask.java
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDNotificationStationPowerInfoTask.java
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationCancelOrderTask.java
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfoTask.java
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java
#	xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
 2024-11-07 10:55:08 +08:00
yjh_yyds
b5492374fc 修改异常订单 2024-11-07 10:53:53 +08:00
yjh_yyds
bf2b8452df 一键启动、一键关停 2024-08-30 15:02:58 +08:00
yjh_yyds
c5f219ee11 Revert "优化接口、订单最大功率统计" 
This reverts commit 34b663e774ff9a16addc871ed8cfe355acf377fd.
 2024-08-14 09:24:13 +08:00
yjh_yyds
2ea195bf66 Merge remote-tracking branch 'origin/operation' into operation 
# Conflicts:
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/api/CDNotificationStationInfoController.java
#	xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml
#	xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
#	xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
#	xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
#	xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java
#	xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CP56Time2a.java
#	xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java
 2024-08-14 09:23:21 +08:00
yjh_yyds
34b663e774 优化接口、订单最大功率统计 2024-08-14 09:22:39 +08:00
yjh_yyds
cf8f608ecb 个人黑名单、双枪 2024-07-01 09:31:42 +08:00
yjh_yyds
b5c2e42510 Merge remote-tracking branch 'origin/operation' into operation 2024-06-06 13:38:54 +08:00
18382465783
d2cb87c7cc 对接川逸充 2024-05-30 16:58:40 +08:00
18382465783
165a78d52a 对接川逸充 2024-03-27 09:18:09 +08:00
18123374652
bafa2d4089 对接川逸充 2024-03-21 14:50:34 +08:00
18123374652
52d5b1afff 开票、充电推送修改时间、手机号授权 2024-02-22 12:00:21 +08:00
yuyang
38dfa13a71 车牌、地图统计、道闸、推送 2024-01-04 09:37:06 +08:00
yuyang
f445cb9c83 对接成都市平台接口 2023-10-16 16:47:42 +08:00
yuyang
4a5f38b6ae 成都市平台接口 2023-09-15 15:09:04 +08:00
yuyang
e3211646af 修改场站添加、场站桩功率统计、下载 2023-08-11 10:28:54 +08:00
panshuling321
1543490364 更新推送系统jpa对象转换的问题 2022-10-17 11:24:35 +08:00
panshuling321
69f2cec277 修复错误，增加处理之前对数据格式的判断 2022-08-24 11:25:24 +08:00
panshuling321
8afe372b62 更新推送第三方判断桩禁用状态 2022-08-24 10:45:24 +08:00
ZZ
5a2dab3704 实时推送:避免soc超过100;Base64编码:避免绑定jdk 2022-07-18 15:04:20 +08:00
zz
f358ba5f1d get back repush failed orders 2022-06-18 15:07:28 +08:00
zz
712b79d0fa bonus push fix & improve 2022-06-16 21:32:44 +08:00
ZZ
154f1f0ba1 equip auth only failed with 500 when arguments failed 2022-04-25 10:09:55 +08:00
yuyang
8dcb1efec4 1.订单增加活动计算、支付重复提交3秒限制，金额充值最多200元 2022-04-21 16:10:35 +08:00
ZZ
9987b721a5 查询站点方式优化 2022-04-13 14:19:57 +08:00
zz
54144c8629 空订单写入tenant id 2022-04-12 11:13:41 +08:00
ZZ
f301a10193 增加详情序号(0x0C);避免服务自调用 2022-03-31 11:01:19 +08:00
ZZ
f08fefb76a 三方启动失败依然创建空订单 2022-03-14 13:29:52 +08:00
ZZ
1bbad460d9 el npe 2022-03-14 11:00:21 +08:00
ZZ
a0981f1ca5 source要搞一下 2022-03-09 14:37:42 +08:00
yuyang
d0ddb09a7c 修改订单四舍五入 2022-03-03 11:37:29 +08:00
yuyang
c770797b61 订单四舍五入 2022-02-21 16:30:39 +08:00
ZZ
a803955a9b 三方空订单标记成未启动-1 2022-01-20 14:49:21 +08:00
ZZ
ae660ec67e Merge branch 'master' into iccard 
# Conflicts:
#	xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java
 2022-01-20 10:24:45 +08:00
ZZ
815da83f4e fix dup error 2022-01-13 16:35:13 +08:00
ZZ
36f7c05d23 save order mapping for real 2022-01-13 16:28:40 +08:00
ZZ
16d4cc0d7d missing field value 2022-01-13 16:24:10 +08:00
ZZ
dd56f871de 刷卡todo:理清表关系,调用订单服务 2022-01-11 18:25:41 +08:00
ZZ
1935a99a55 防止三方订单启动使用重复的StartChargeSeq 2022-01-05 12:07:00 +08:00
ZZ
adc48e81f7 Merge branch 'development' 
# Conflicts:
#	xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java
 2022-01-04 13:44:42 +08:00
ZZ
41c9749de9 监管方推送失败问题解决O(∩_∩)O 2021-12-29 15:37:40 +08:00
wen
45f1ecffce 修改每个服务的bootstrap.yml文件用于本地测试，将鉴权代码注释用于本地测试 2021-12-27 17:36:58 +08:00
zz
4c8350a1dc incase cache fail 2021-12-24 17:25:30 +08:00
ZZ
8926510f78 默认2个终端 2021-12-21 15:15:09 +08:00
ZZ
69a0671e8e 任务日志堆栈打印;充电时间取绝对值 2021-12-21 13:36:25 +08:00
zz
8b7c6d9e7d log orderkey not exist error 2021-12-20 22:38:32 +08:00
ZZ
a20f92f234 code clean 2021-12-13 14:57:59 +08:00
ZZ
614f59569f 日志打不打一下,配置改一下 2021-12-13 11:37:11 +08:00
ZZ
2a24e1a8a1 handle json parse exception, just catch it n return null 2021-12-13 10:45:47 +08:00
ZZ
4f81f34d59 该死的空订单哇 2021-12-09 11:49:00 +08:00