合并

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

@@ -577,15 +577,15 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
         dbOrder.setUserAddress(partialOrder.getUserAddress());
         try {
-        // 4. 构建 ERP 订单对象
-        ErpOrder erpOrder = getErpOrder(dbOrder);
-
-        // 5. 调用对应 ERP 服务(当前是聚水潭ERP)
-        IErpOrderService erpService = erpServiceMap.get(erpType);
-        //执行商城订单推送逻辑
-        ErpOrderResponse response = erpService.addOrderScrm(erpOrder);
-        log.info("ERP地址推送结果 - 商城订单: {}, ERP类型: {}, 成功: {}, 外部单号: {}",
-                dbOrder.getOrderCode(), erpType, response.getSuccess(), response.getCode());
+            // 4. 构建 ERP 订单对象
+            ErpOrder erpOrder = getErpOrder(dbOrder);
+
+            // 5. 调用对应 ERP 服务(当前是聚水潭ERP)
+            IErpOrderService erpService = erpServiceMap.get(erpType);
+            //执行商城订单推送逻辑
+            ErpOrderResponse response = erpService.addOrderScrm(erpOrder);
+            log.info("ERP地址推送结果 - 商城订单: {}, ERP类型: {}, 成功: {}, 外部单号: {}",
+                    dbOrder.getOrderCode(), erpType, response.getSuccess(), response.getCode());
         } catch (Exception e) {
             log.error("修改商城订单地址推送到ERP失败，orderId: {}", partialOrder.getId(), e);
         }
@@ -2012,7 +2012,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
 
 
-    return "SUCCESS";
+        return "SUCCESS";
 
 
         //非处方直接提交OMS
@@ -5403,6 +5403,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         return expressInfoDTO;
     }
 
+    @Override
+    public void cancelOrderByCode(String outerPayId) {
+        fsStoreOrderMapper.cancelOrderByCode(outerPayId);
+    }
+
     private static final DateTimeFormatter CST_FORMATTER = DateTimeFormatter
             .ofPattern("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US)
             .withZone(ZoneId.of("Asia/Shanghai"));