erp

fs-admin/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -328,10 +328,7 @@ public class FsStoreOrderController extends BaseController
         FsStoreOrder order = fsStoreOrderService.selectFsStoreOrderByOrderId(param.getOrderId());
         ErpOrderQueryRequert request = new ErpOrderQueryRequert();
         IErpOrderService erpOrderService = getErpService();
-        if (erpOrderService!=null){
-            request.setCode(order.getExtendOrderId());
-            request.setPlatform_code(order.getOrderCode());
-        }
+        request.setCode(order.getExtendOrderId());
         ErpOrderQueryResponse response = erpOrderService.getOrder(request);
         if(response.getOrders()!=null&&response.getOrders().size()>0){
             for(ErpOrderQuery orderQuery : response.getOrders()){

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

@@ -250,8 +250,6 @@ public class Task {
             ErpOrderQueryRequert request=new ErpOrderQueryRequert();
 
             request.setCode(order.getExtendOrderId());
-            request.setPlatform_code(order.getOrderCode());
-
             if (erpOrderService != null){
                 ErpOrderQueryResponse response=erpOrderService.getOrder(request);
                 if(response.getOrders()!=null&&response.getOrders().size()>0){

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -463,7 +463,6 @@ public class FsStoreOrderController extends BaseController
     public R getEroOrder(@PathVariable("extendOrderId") String extendOrderId) {
         ErpOrderQueryRequert request = new ErpOrderQueryRequert();
         request.setCode(extendOrderId);
-        request.setPlatform_code(extendOrderId);
         IErpOrderService erpOrderService = getErpService();
         ErpOrderQueryResponse response = new ErpOrderQueryResponse();
         if (erpOrderService != null){

fs-service/src/main/java/com/fs/erp/service/impl/WdtErpOrderServiceImpl.java

@@ -598,7 +598,7 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
     @Override
     public ErpOrderQueryResponse getOrder(ErpOrderQueryRequert param) {
         Map<String,String> map = new HashMap<>();
-        map.put("src_tid",param.getPlatform_code());
+        map.put("src_tid",param.getCode());
         try {
             String execute = client.execute("sales_trade_query.php", map);
             ParserConfig config = new ParserConfig();

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

@@ -687,8 +687,8 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
                     BigDecimal money=order.getMoney();
                     order.setCompanyId(param.getCompanyId());
                     order.setCompanyUserId(param.getCompanyUserId());
-                    order.setMoney(new BigDecimal(0.1));
-                    order.setPayMoney(new BigDecimal(0.1));
+                    order.setMoney(new BigDecimal(0.0));
+                    order.setPayMoney(new BigDecimal(0.0));
                     order.setCompanyDeductMoney(money);
                     if (companyUser.getDeptId()!=null){
                         order.setDeptId(companyUser.getDeptId());

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

@@ -1990,14 +1990,13 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             if (erpType != null){
 
                 IErpOrderService erpOrderService = null;
+                request.setCode(order.getExtendOrderId());
                 if (erpType == 1){
                     //管易
                     erpOrderService =  gyOrderService;
-                    request.setCode(order.getExtendOrderId());
                 } else if (erpType == 2){
                     //旺店通
                     erpOrderService =  wdtOrderService;
-                    request.setCode(order.getOrderCode());
                 }
                 ErpOrderQueryResponse response = erpOrderService.getOrder(request);
                 if(response.getOrders()!=null&&response.getOrders().size()>0){

fs-store/src/main/java/com/fs/store/controller/store/FsStoreOrderController.java

@@ -291,7 +291,6 @@ public class FsStoreOrderController extends BaseController
     public R getEroOrder(@PathVariable("extendOrderId") String extendOrderId) {
         ErpOrderQueryRequert request = new ErpOrderQueryRequert();
         request.setCode(extendOrderId);
-        request.setPlatform_code(extendOrderId);
         IErpOrderService erpOrderService = getErpService();
         ErpOrderQueryResponse response = new ErpOrderQueryResponse();
         if (erpOrderService != null){