change

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

@@ -2404,13 +2404,14 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         if (order == null) {
             return;
         }
-        FsPackageOrder fsPackageOrder = fsPackageOrderMapper.selectByOderCode(order.getOrderCode());
-        if (fsPackageOrder == null) {
-            return;
-        }
-        FsPackage fsPackage = JSONUtil.toBean(fsPackageOrder.getPackageJson(), FsPackage.class);
+//        FsPackageOrder fsPackageOrder = fsPackageOrderMapper.selectByOderCode(order.getOrderCode());
+//        if (fsPackageOrder != null) {
+//            return;
+//        }
+//        FsPackage fsPackage = JSONUtil.toBean(fsPackageOrder.getPackageJson(), FsPackage.class);
+
         //获取ERP类型 1-聚水潭 2-兔灵
-        erpOrder.setErpType(fsPackage.getErpType());
+        erpOrder.setErpType(order.getErpType());
 
         if (order.getCompanyId() != null) {
             erpOrder.setVip_code(order.getUserId().toString() + order.getCompanyId().toString());
@@ -2589,7 +2590,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         log.info("ErpCreate:" + order.getOrderCode() + ":" + JSONUtil.toJsonStr(response));
         if (Boolean.TRUE.equals(response.getSuccess())) {
             //写入外部订单号
-            if (fsPackage.getErpType() == 2) {
+            if (order.getErpType() == 2) {
                 order.setExtendOrderId(response.getCode());
             } else {
                 //支付成功后 将订单号写入待发货的REDIS中