优化0元订单物流代收的退款问题

fs-service/src/main/java/com/fs/his/service/impl/FsStoreAfterSalesServiceImpl.java

@@ -555,40 +555,6 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
                     refund(payment,orderType,order.getOrderId());
                 }
             }
-            //erpType== null 兼容之前订单没有设值 erpType==2人工在兔灵作废
-            if (fsStoreOrder.getErpType() == null || fsStoreOrder.getErpType() == 1) {
-                try {
-                    //管易作废
-                    if (StringUtils.isNotEmpty(fsStoreOrder.getExtendOrderId())) {
-                        if (!fsStoreOrder.getExtendOrderId().equals("HIS")) {
-                            ErpRefundUpdateRequest request = new ErpRefundUpdateRequest();
-                            request.setTid(fsStoreOrder.getOrderCode());
-                            request.setOid(fsStoreOrder.getOrderCode());
-                            request.setRefund_state(1);
-                            request.setStoreAfterSalesId(fsStoreAfterSales.getId());
-                            FsSysConfig sysConfig = configUtil.getSysConfig();
-                            Integer erpType = sysConfig.getErpType();
-                            if (erpType == 1) {
-                                erpOrderService.refundUpdate(request);
-                            }else if (erpType == 2) {
-                                //旺店通
-                                wdtErpOrderService.refundUpdate(request);
-                            } else if (erpType == 3) {
-                                //瀚智
-                                hzOMSerpOrderService.refundUpdate(request);
-                            }  else if (erpType == 4) {
-                                dfOrderService.refundUpdate(request);
-                            }else if(erpType == 5){
-                                jSTOrderService.refundUpdate(request);
-                            }else if(erpType == 6){
-                                k9OrderService.refundUpdate(request);
-                            }
-                        }
-                    }
-                } catch (Exception e) {
-//                throw new RuntimeException(e);
-                }
-            }
         } else {
             if (order.getRefundAmount().compareTo(BigDecimal.ZERO) == 0) {
 
@@ -597,6 +563,41 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
             }
         }
 
+        //erpType== null 兼容之前订单没有设值 erpType==2人工在兔灵作废
+        if (fsStoreOrder.getErpType() == null || fsStoreOrder.getErpType() == 1) {
+            try {
+                //管易作废
+                if (StringUtils.isNotEmpty(fsStoreOrder.getExtendOrderId())) {
+                    if (!fsStoreOrder.getExtendOrderId().equals("HIS")) {
+                        ErpRefundUpdateRequest request = new ErpRefundUpdateRequest();
+                        request.setTid(fsStoreOrder.getOrderCode());
+                        request.setOid(fsStoreOrder.getOrderCode());
+                        request.setRefund_state(1);
+                        request.setStoreAfterSalesId(fsStoreAfterSales.getId());
+                        FsSysConfig sysConfig = configUtil.getSysConfig();
+                        Integer erpType = sysConfig.getErpType();
+                        if (erpType == 1) {
+                            erpOrderService.refundUpdate(request);
+                        }else if (erpType == 2) {
+                            //旺店通
+                            wdtErpOrderService.refundUpdate(request);
+                        } else if (erpType == 3) {
+                            //瀚智
+                            hzOMSerpOrderService.refundUpdate(request);
+                        }  else if (erpType == 4) {
+                            dfOrderService.refundUpdate(request);
+                        }else if(erpType == 5){
+                            jSTOrderService.refundUpdate(request);
+                        }else if(erpType == 6){
+                            k9OrderService.refundUpdate(request);
+                        }
+                    }
+                }
+            } catch (Exception e) {
+//                throw new RuntimeException(e);
+            }
+        }
+
 
         return i;
     }