feat : 订单过期自动取消测试修改

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/TestController.java

@@ -0,0 +1,35 @@
+package com.zanxiang.sdk.controller;
+
+import com.zanxiang.module.util.pojo.ResultVO;
+import com.zanxiang.sdk.annotation.UnSignCheck;
+import com.zanxiang.sdk.domain.vo.GameShareVO;
+import com.zanxiang.sdk.service.IPayApplicationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-01-18
+ * @description :
+ */
+@Api(tags = "测试接口")
+@RestController
+@RequestMapping(value = "/api/test")
+public class TestController {
+
+    @Autowired
+    private IPayApplicationService payApplicationService;
+
+    @UnSignCheck
+    @GetMapping("/close/order")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameShareVO.class)})
+    public ResultVO shareGame(String param) {
+        payApplicationService.appletStoreCancel(param);
+        return ResultVO.ok();
+    }
+}

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/PayApplicationServiceImpl.java

@@ -147,7 +147,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
 
     private void orderExpire(String orderId, String appId) {
         //过期时间
-        double expire = (double) DateUtil.localDateTimeToMilli(LocalDateTime.now().plusMinutes(5));
+        double expire = (double) DateUtil.localDateTimeToMilli(LocalDateTime.now().plusMinutes(2));
         //参数
         String param = orderId + "_" + appId;
         //设置缓存
@@ -272,8 +272,8 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         //参数切割
         String[] split = param.split("_");
         //小程序appId
-        String appId = split[0];
-        String orderId = split[1];
+        String orderId = split[0];
+        String appId = split[1];
         //查询商城小程序信息
         PayApplication payApplication = super.getOne(new LambdaQueryWrapper<PayApplication>()
                 .eq(PayApplication::getAppId, appId));
@@ -292,15 +292,14 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         payParamMap.put("apiKey", payConfigMap.get("apiKey"));
         //关闭订单
         this.closeOrder(payParamMap);
-        log.error("关闭订单成功, param : {}", param);
     }
 
     private void closeOrder(Map<String, String> paramMap) {
         try {
             Map<String, String> paramData = new HashMap<>(6);
-            paramData.put("appid", paramMap.get("appId"));
-            paramData.put("mch_id", paramMap.get("mchId"));
-            paramData.put("out_trade_no", paramMap.get("orderId"));
+            paramData.put("appid", paramMap.get("appid"));
+            paramData.put("mch_id", paramMap.get("mch_id"));
+            paramData.put("out_trade_no", paramMap.get("out_trade_no"));
             paramData.put("nonce_str", WxPayUtil.generateNonceStr());
             paramData.put("sign_type", SIGN_TYPE);
             //接口签名

game-module/game-sdk/src/main/java/com/zanxiang/sdk/task/OrderExpireTask.java

@@ -70,6 +70,7 @@ public class OrderExpireTask {
             } else {
                 this.orderExpire(param);
             }
+            log.error("关闭订单成功, param : {}", param);
             //删除订单列表缓存
             redisUtil.delZSetValue(RedisKeyConstant.ORDER_EXPIRE, param);
             //删除执行缓存锁
@@ -97,6 +98,5 @@ public class OrderExpireTask {
         orderService.update(new LambdaUpdateWrapper<Order>()
                 .set(Order::getStatus, OrderStateEnum.CANCEL_PAY.getCode())
                 .eq(Order::getOrderId, orderId));
-        log.error("关闭订单成功, param : {}", orderId);
     }
 }