add

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -652,7 +652,7 @@ public class Task {
                     OrderQueryResponseDTO mergeOrder = null;
                     try {
                         mergeOrder = erpOrderService.getMergeOrder(request);
-                        Thread.sleep(1000); // 1000毫秒 = 1秒
+                        Thread.sleep(2000); // 1000毫秒 = 1秒
                     } catch (Exception e) {
                         logger.error("调用ERP接口异常：",e);
                         try {
@@ -705,7 +705,7 @@ public class Task {
                     OrderQueryResponseDTO mergeOrder = null;
                     try {
                         mergeOrder = erpOrderService.getMergeOrder(request);
-                        Thread.sleep(1000); // 1000毫秒 = 1秒
+                        Thread.sleep(2000); // 1000毫秒 = 1秒
                     } catch (Exception e) {
                         logger.error("调用ERP接口异常：",e);
                         try {
@@ -764,7 +764,7 @@ public class Task {
                 ErpOrderQueryResponse response= null;
                 try {
                     response=erpOrderService.getOrder(request);
-                    Thread.sleep(1000); // 1000毫秒 = 1秒
+                    Thread.sleep(2000); // 1000毫秒 = 1秒
                 } catch (Exception e) {
                     logger.error("调用ERP接口异常：",e);
                     try {
@@ -811,7 +811,7 @@ public class Task {
                 ErpOrderQueryResponse response= null;
                 try {
                     response = erpOrderService.getScrmOrder(request);
-                    Thread.sleep(1000); // 1000毫秒 = 1秒
+                    Thread.sleep(2000); // 1000毫秒 = 1秒
                 } catch (Exception e) {
                     logger.error("调用ERP接口异常：",e);
                     try {
@@ -892,7 +892,7 @@ public class Task {
         for (Long l : omsList) {
             try {
                 fsStoreOrderService.createOmsOrder(l);
-                Thread.sleep(1000); // 1000毫秒 = 1秒
+                Thread.sleep(2000); // 1000毫秒 = 1秒
             } catch (Exception e) {
                 logger.error("推送订单异常：",e);
                 continue;

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

@@ -552,32 +552,36 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
                     throw new CustomException("退款请求失败" + refund.getResp_desc());
                 }
             }
-            //管易作废
-            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);
+            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) {