Sfoglia il codice sorgente

fix: 益兽园erp修复(商城走带scrm,非商城走不带scrm)

xdd 4 settimane fa
parent
commit
74c1111e0f

+ 2 - 2
fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -541,7 +541,7 @@ public class FsStoreOrderScrmController extends BaseController {
         IErpOrderService erpOrderService = getErpService();
         ErpOrderQueryRequert request = new ErpOrderQueryRequert();
         request.setCode(order.getExtendOrderId());
-        ErpOrderQueryResponse response = erpOrderService.getOrder(request);
+        ErpOrderQueryResponse response = erpOrderService.getScrmOrder(request);
         if(response.getOrders()!=null&&response.getOrders().size()>0){
             for(ErpOrderQuery orderQuery : response.getOrders()){
                 if(orderQuery.getDeliverys()!=null&&orderQuery.getDeliverys().size()>0){
@@ -632,7 +632,7 @@ public class FsStoreOrderScrmController extends BaseController {
         IErpOrderService erpOrderService = getErpService();
         ErpOrderQueryRequert request = new ErpOrderQueryRequert();
         request.setCode(extendOrderId);
-        ErpOrderQueryResponse response = erpOrderService.getOrder(request);
+        ErpOrderQueryResponse response = erpOrderService.getScrmOrder(request);
         return R.ok().put("data",response);
     }
 

+ 1 - 1
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -2184,7 +2184,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
         ErpOrderQueryRequert request = new ErpOrderQueryRequert();
         request.setCode(order.getExtendOrderId());
-        ErpOrderQueryResponse response = erpOrderService.getOrder(request);
+        ErpOrderQueryResponse response = erpOrderService.getScrmOrder(request);
         if (response.getOrders() != null && response.getOrders().size() > 0) {
             for (ErpOrderQuery orderQuery : response.getOrders()) {
                 if (orderQuery.getDeliverys() != null && orderQuery.getDeliverys().size() > 0) {

+ 1 - 1
fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreOrderScrmController.java

@@ -309,7 +309,7 @@ public class FsStoreOrderScrmController extends BaseController
         IErpOrderService erpOrderService = getErpService();
         ErpOrderQueryResponse response = new ErpOrderQueryResponse();
         if (erpOrderService != null){
-            response = erpOrderService.getOrder(request);
+            response = erpOrderService.getScrmOrder(request);
         }
         return R.ok().put("data",response);
     }