From 5c415e42d4a5d26fefb483096b90854728abbed8 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 30 Aug 2023 14:05:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E8=8E=B7=E5=8F=96=E6=94=AF?= =?UTF-8?q?=E4=BB=98delay=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 6 +++--- .../pile/service/impl/PileConnectorInfoServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index f8304c4d9..e2447676c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -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)) { // 延迟分账未确认调撤销调撤销接口退款 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index b7b4667c4..3d8cb8548 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -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 From 7726384036dddccb765236164e5ce5883d097ccd Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 30 Aug 2023 14:18:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/api/uniapp/TempController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 918464cda..d1d5897be 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -393,4 +393,15 @@ public class TempController extends BaseController { } return response; } + + /** + * 手动执行退款 + * 订单或余额 + * https://api.jsowellcloud.com/temp/adapayRefund + */ + @PostMapping("/adapayRefund") + public RestApiResponse adapayRefund(@RequestBody ApplyRefundDTO dto) { + orderService.adapayRefund(dto); + return new RestApiResponse<>(); + } }