autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-12 01:58:00 +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

11
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -393,4 +393,15 @@ public class TempController extends BaseController {
} }
return response; return response;
} }
/**
* 手动执行退款
* 订单或余额
* https://api.jsowellcloud.com/temp/adapayRefund
*/
@PostMapping("/adapayRefund")
public RestApiResponse<?> adapayRefund(@RequestBody ApplyRefundDTO dto) {
orderService.adapayRefund(dto);
return new RestApiResponse<>();
}
} }

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(); String description = callbackRecord.getDescription();
JSONObject expendJsonObject = JSON.parseObject(expend); JSONObject descriptionJsonObject = JSON.parseObject(description);
String payMode = expendJsonObject.getString("payMode"); String payMode = descriptionJsonObject.getString("payMode");
BigDecimal refundAmt = null; // 交易退款金额 BigDecimal refundAmt = null; // 交易退款金额
if (StringUtils.equalsIgnoreCase(payMode, Constants.ADAPAY_PAY_MODE_DELAY)) { 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); num = pileConnectorInfoMapper.updateConnectorStatus(pileConnectorCode, status);
deleteRedisByPileSn(pileSn); deleteRedisByPileSn(pileSn);
redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_1h); redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_10m);
// TODO 推送联联平台 设备状态变化推送接口 ConnectorStatusInfo // TODO 推送联联平台 设备状态变化推送接口 ConnectorStatusInfo