FengChaoYu 9 månader sedan
förälder
incheckning
4cf5a7bbc3

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -785,13 +785,13 @@ public class WebsitPartsSalesOrderLogic {
 
         WebsitSalesPayOrder salesPayList = getPayList(partsSalesOrderBean);
 
-        if (Objects.nonNull(salesPayList)) {
+        if (Objects.nonNull(salesPayList) && partsSalesOrderBean.getPayType().equals(PayTypeEnum.ALLINPAY.getKey())) {
             // 有支付记录,共用退款方法
             this.commonRefundAmountMethod(partsSalesOrderBean);
         }
         if (partsSalesOrderBean.getIsApply().equals(IsEnum.N.getValue())) {
             if ((PartsOrderStatusEnum.SUBMIT.getKey().equals(partsSalesOrderBean.getStatus()) && Objects.nonNull(salesPayList))
-                    || (PartsOrderStatusEnum.PAYED.getKey().equals(partsSalesOrderBean.getStatus()) && PayTypeEnum.ALLINPAY.getKey().equals(partsSalesOrderBean.getPayType()))) {
+                    || PartsOrderStatusEnum.PAYED.getKey().equals(partsSalesOrderBean.getStatus())) {
                 // 已提交有支付记录 或 已支付订单状态,处理库存
                 this.handleReverseWebsitAndWorkerStock(partsSalesOrderBean);
             }