代码优化

ruoyi-common/ruoyi-common-pay/src/main/java/org/dromara/common/pay/service/impl/WxPayServiceImpl.java

@@ -280,16 +280,8 @@ public class WxPayServiceImpl implements IWxPayService {
                 config.getKeyPath(),
                 JSONUtil.toJsonStr(params));
             log.info("关闭订单：{} 查询响应 {}", outTradeNo, response);
-            if (response.getStatus() == IJPayConstants.CODE_200) {
-                // 根据证书序列号查询对应的证书来验证签名结果
-                boolean verifySignature = WxPayKit.verifySignature(response, config.getPlatformCertPath());
-                log.info("verifySignature: {}", verifySignature);
-                //验签成功
-                if (verifySignature) {
-                    return true;
-                } else {
-                    return false;
-                }
+            if (response.getStatus() == IJPayConstants.CODE_204) {
+               return true;
             }
             throw new RuntimeException("订单：" + outTradeNo + "关闭失败！");
         } catch (Exception e) {

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteOrderServiceImpl.java

@@ -121,6 +121,8 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
             for (OrderTradeVo ot : otList) {
                 if (StringUtils.equals(ot.getTradeState(), WechatTradeState.USERPAYING.getState())) {
                     wxPayService.close(ot.getOrderPayNo());
+                    ot.setTradeState(WechatTradeState.CLOSED.getState());
+                    orderTradeService.updateByBo(BeanUtil.copyProperties(ot, OrderTradeBo.class));
                 }
             }
         }