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

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<>();
+    }
 }

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)) {
             // 延迟分账未确认调撤销调撤销接口退款

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