FengChaoYu преди 9 месеца
родител
ревизия
c3c5eafb78
променени са 1 файла, в които са добавени 8 реда и са изтрити 4 реда
  1. 8 4
      mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

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

@@ -783,12 +783,16 @@ public class WebsitPartsSalesOrderLogic {
             throw new RemoteServiceException("该订单已提货,不能取消: " + id);
         }
 
-        WebsitSalesPayOrder salesPayList = getPayList(partsSalesOrderBean);
+        WebsitSalesPayOrder salesPayList = null;
 
-        if (Objects.nonNull(salesPayList) && partsSalesOrderBean.getPayType().equals(PayTypeEnum.ALLINPAY.getKey())) {
-            // 有支付记录,共用退款方法
-            this.commonRefundAmountMethod(partsSalesOrderBean);
+        if (partsSalesOrderBean.getPayType().equals(PayTypeEnum.ALLINPAY.getKey())) {
+            salesPayList = getPayList(partsSalesOrderBean);
+            if (Objects.nonNull(salesPayList)) {
+                // 有支付记录,共用退款方法
+                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())) {