add

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

@@ -1983,49 +1983,55 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         //判断是否开启erp
         FsSysConfig sysConfig = configUtil.getSysConfig();
         Integer erpOpen = sysConfig.getErpOpen();
-        if (erpOpen != null && erpOpen == 1) {
-            //判断erp类型
-            Integer erpType = sysConfig.getErpType();
-            if (erpType != null) {
-
-                IErpOrderService erpOrderService = null;
-                if (erpType == 1) {
-                    //管易
-                    erpOrderService = gyOrderService;
-                } else if (erpType == 2) {
-                    //旺店通
-                    erpOrderService = wdtOrderService;
-                } else if (erpType == 3) {
-                    //瀚智
-                    erpOrderService = hzOMSOrderService;
-                } else if (erpType == 4) {
-                    //瀚智
-                    erpOrderService = dfOrderService;
-                } else if (erpType == 5) {
-                    erpOrderService = jSTOrderService;
-                }else if (erpType == 6) {
-                    erpOrderService = k9OrderService;
-                }
-                if (erpOrderService != null && StringUtils.isNotEmpty(order.getExtendOrderId())) {
-                    if (!order.getExtendOrderId().equals("HIS")) {
-                        if (erpType != 3) {
-                            ErpRefundUpdateRequest request = new ErpRefundUpdateRequest();
-                            request.setTid(order.getOrderCode());
-                            request.setOid(order.getOrderCode());
-                            request.setRefund_state(1);
-                            erpOrderService.refundUpdate(request);
-                        } else {
-                            ErpRefundOrder param = new ErpRefundOrder();
-                            param.setOrderCode(order.getOrderCode());
-                            param.setAfterSalesId(fsStoreAfterSales.getId());
-                            erpOrderService.refundOrder(param);
+        try {
+            if (erpOpen != null && erpOpen == 1) {
+                //判断erp类型
+                Integer erpType = sysConfig.getErpType();
+                if (erpType != null) {
+
+                    IErpOrderService erpOrderService = null;
+                    if (erpType == 1) {
+                        //管易
+                        erpOrderService = gyOrderService;
+                    } else if (erpType == 2) {
+                        //旺店通
+                        erpOrderService = wdtOrderService;
+                    } else if (erpType == 3) {
+                        //瀚智
+                        erpOrderService = hzOMSOrderService;
+                    } else if (erpType == 4) {
+                        //瀚智
+                        erpOrderService = dfOrderService;
+                    } else if (erpType == 5) {
+                        erpOrderService = jSTOrderService;
+                    }else if (erpType == 6) {
+                        erpOrderService = k9OrderService;
+                    }
+                    if (erpOrderService != null && StringUtils.isNotEmpty(order.getExtendOrderId())) {
+                        if (!order.getExtendOrderId().equals("HIS")) {
+                            if (erpType != 3) {
+                                ErpRefundUpdateRequest request = new ErpRefundUpdateRequest();
+                                request.setTid(order.getOrderCode());
+                                request.setOid(order.getOrderCode());
+                                request.setRefund_state(1);
+                                erpOrderService.refundUpdate(request);
+                            } else {
+                                ErpRefundOrder param = new ErpRefundOrder();
+                                param.setOrderCode(order.getOrderCode());
+                                param.setAfterSalesId(fsStoreAfterSales.getId());
+                                erpOrderService.refundOrder(param);
+                            }
                         }
                     }
                 }
             }
+        }catch (Exception e){
+
         }
 
 
+
+
         order.setStatus(-1);
         order.setRefundStatus(1 + "");
         fsStoreOrderMapper.updateFsStoreOrder(order);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStorePaymentScrmServiceImpl.java

@@ -880,6 +880,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
         o.setOpenid(user.getMaOpenId());
         o.setReqSeqId("payment-"+storePayment.getPayCode());
         o.setTransAmt(storePayment.getPayMoney().toString());
+//        o.setAppId(param.getAppId());
         o.setGoodsDesc("商城订单支付");
         HuifuCreateOrderResult result = huiFuService.createOrder(o);
         if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){