autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-08-30 14:29:46 +08:00
parent 41861273ca 7726384036
commit 0bcec90e91
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2508,9 +2508,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
// 获取延时分账模式 延时分账的使用撤销方法退款，实时分账的使用退款方法
String expend = callbackRecord.getExpend();
JSONObject expendJsonObject = JSON.parseObject(expend);
String payMode = expendJsonObject.getString("payMode");
String description = callbackRecord.getDescription();
JSONObject descriptionJsonObject = JSON.parseObject(description);
String payMode = descriptionJsonObject.getString("payMode");
BigDecimal refundAmt = null; // 交易退款金额
if (StringUtils.equalsIgnoreCase(payMode, Constants.ADAPAY_PAY_MODE_DELAY)) {
// 延迟分账未确认调撤销调撤销接口退款

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -575,7 +575,7 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
// 只修改一个枪口的状态
num = pileConnectorInfoMapper.updateConnectorStatus(pileConnectorCode, status);
deleteRedisByPileSn(pileSn);
redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_1h);
redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_10m);
// TODO 推送联联平台 设备状态变化推送接口 ConnectorStatusInfo