Merge remote-tracking branch 'origin/master'

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

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