‘linchangsheng’ 2 周之前
父节点
当前提交
0f3fccd3e4
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -649,7 +649,7 @@ public class WechatLogic {
         if (!StringUtils.equals(settlementOrder.getPayStatus(), PayStatusEnum.PAID.getKey())) {
         if (!StringUtils.equals(settlementOrder.getPayStatus(), PayStatusEnum.PAID.getKey())) {
             throw new RemoteServiceException("未支付订单不可结算");
             throw new RemoteServiceException("未支付订单不可结算");
         }
         }
-        if (!StringUtils.equalsAny(settlementOrder.getStatus(), "WAIT","YC")) {
+        if (StringUtils.equals(settlementOrder.getStatus(), "OK")) {
             log.error("非待结算状态不可结算,id:{}", settlementOrder.getOrderId());
             log.error("非待结算状态不可结算,id:{}", settlementOrder.getOrderId());
             return;
             return;
         }
         }