feat: 推送ERP

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

@@ -427,6 +427,8 @@ public class FsStoreOrderController extends BaseController
     @PutMapping("/updateAddressErpFsStoreOrder")
     public AjaxResult updateAddressErpFsStoreOrder(@RequestBody FsStoreOrder fsStoreOrder)
     {
+        logger.info("修改订单 参数: {}",fsStoreOrder);
+
         return toAjax(fsStoreOrderService.updateAddressErpFsStoreOrder(fsStoreOrder));
     }
 

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

@@ -537,6 +537,7 @@ public class FsStoreOrderScrmController extends BaseController {
     @Log(title = "订单", businessType = BusinessType.UPDATE)
     @PutMapping("/updateAddressErpFsStoreOrder")
     public AjaxResult updateAddressErpFsStoreOrder(@RequestBody FsStoreOrderScrm fsStoreOrder) {
+        logger.info("修改订单 参数: {}",fsStoreOrder);
         return toAjax(fsStoreOrderService.updateAddressErpFsStoreOrder(fsStoreOrder));
     }
     /**

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

@@ -305,6 +305,7 @@ public class FsStoreOrderController extends BaseController
     @PutMapping("/updateAddressErpFsStoreOrder")
     public AjaxResult updateAddressErpFsStoreOrder(@RequestBody FsStoreOrder fsStoreOrder)
     {
+        logger.info("修改订单 参数: {}",fsStoreOrder);
         return toAjax(fsStoreOrderService.updateAddressErpFsStoreOrder(fsStoreOrder));
     }
     /**

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -294,6 +294,7 @@ public class FsStoreOrderScrmController extends BaseController
     @PutMapping("/updateAddressErpFsStoreOrder")
     public AjaxResult updateAddressErpFsStoreOrder(@RequestBody FsStoreOrderScrm fsStoreOrder)
     {
+        logger.info("修改订单 参数: {}",fsStoreOrder);
         return toAjax(fsStoreOrderService.updateAddressErpFsStoreOrder(fsStoreOrder));
     }
 

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

@@ -403,7 +403,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         }
         //目前只针对聚水潭ERP推送最新的修改地址
         if (erpType != 5){
-            return;
+            throw new IllegalArgumentException("目前只支持JST类型!");
         }
         // 2. 从数据库获取完整订单（用于补全必要字段;当前是修改商城订单接口,查询fs_store_order_scrm表)
         FsStoreOrder dbOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderId(partialOrder.getOrderId());

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

@@ -409,9 +409,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             throw new IllegalArgumentException("ERP单号不存在！");
         }
         //推送修改的商城订单地址到聚水潭ERP 如果地址变化
-        if(!StringUtil.equals(order.getUserAddress(),order.getUserAddress())){
-            pushOrderAddressToErp(order);
-        }
+        pushOrderAddressToErp(order);
         return i;
 
     }