FengChaoYu hai 7 meses
pai
achega
042eeba967

+ 4 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/WebsitSalesRetLogic.java

@@ -197,7 +197,7 @@ public class WebsitSalesRetLogic {
 
         websitSalesRetAddUP.setCompanyWechatId(adminUser.getCompanyWechatId());
         websitSalesRetAddUP.setCompanyName(adminUser.getCompanyName());
-        websitSalesRetAddUP.setPayType(oldWebsitSales.getPayType().equals(PayTypeEnum.ENGIN.getKey()) ? oldWebsitSales.getPayType() : "CASH");
+        websitSalesRetAddUP.setPayType(oldWebsitSales.getPayType());
         websitSalesRetAddUP.updateById();
 
 
@@ -211,7 +211,9 @@ public class WebsitSalesRetLogic {
 
             this.refundOk(websitSalesRetAddUP.getSalesRetId());
 
-            this.refundAddPayOrder(websitSalesRetAddUP.getSalesRetId());
+            if (websitSalesRetAddUP.getPayType().equals(PayTypeEnum.CASH.getKey())) {
+                this.refundAddPayOrder(websitSalesRetAddUP.getSalesRetId());
+            }
             websitSalesRetAddUP.setConfirmTime(new Date());
             websitSalesRetAddUP.setConfirmBy(adminUser.getNickName());
             websitSalesRetAddUP.updateById();