sm order

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -25,13 +25,13 @@ import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.HttpUtil;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.common.util.R;
-import com.yami.shop.config.SMConstants;
 import com.yami.shop.security.comment.dao.AppConnectMapper;
 import com.yami.shop.security.comment.model.AppConnect;
 import com.yami.shop.security.platform.util.SecurityUtils;
 import com.yami.shop.service.*;
 import com.yami.shop.sys.service.SysUserService;
 import com.yami.shop.utils.CullenUtils;
+import com.yami.shop.utils.SmqjhUtil;
 import com.yami.shop.wx.service.impl.WxProviderServiceImpl;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -70,13 +70,14 @@ public class OrderController {
     private final DeliveryService deliveryService;
     private final OrderSettlementService orderSettlementService;
     private final AppConnectMapper appConnectMapper;
-
+    private final SmqjhUtil smqjhUtil;
     @Autowired
     private SysUserService sysUserService;
 
     @Autowired
     private ExportTaskService exportTaskService;
 
+
     /**
      * 分页获取
      */
@@ -260,7 +261,7 @@ public class OrderController {
                 map.put("dvyNo", delivery.getDvyNo());
                 map.put("dvyName", delivery.getDvyName());
             }
-            System.out.println(HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/updateDeliveryStatus", map));
+            System.out.println(HttpUtil.post(smqjhUtil.getOmsBaseUrl() + "/api/v1/xsb/order/updateDeliveryStatus", map));
         }
     }
 

yami-shop-platform/src/main/resources/application-dev.yml

@@ -25,7 +25,8 @@ hb:
   secret: 67899367b17e4a8d8a7d10ebe8449b90
 
 smqjh:
-    pms-url: http://192.168.1.253:8802/api/v1/sync
-#    pms-url: http://192.168.1.242:8080/smqjh-pms/api/v1/sync
+#    pms-url: http://192.168.1.253:8802/api/v1/sync
+    pms-url: http://192.168.1.242:8080/smqjh-pms/api/v1/sync
+    omsBaseUrl: http://192.168.1.242:8080/smqjh-oms
 
 

yami-shop-platform/src/main/resources/application-prod.yml

@@ -27,4 +27,5 @@ hb:
 smqjh:
 #  pms-url: http://47.109.39.185:8080/smqjh-pms/api/v1/sync
 #  pms-url: http://192.168.1.242:8080/smqjh-pms/api/v1/sync
-  pms-url: https://smqjh.api.zswlgz.com/smqjh-pms/api/v1/sync
+  pms-url: https://smqjh.api.zswlgz.com/smqjh-pms/api/v1/sync
+  omsBaseUrl: https://smqjh.api.zswlgz.com/smqjh-oms

yami-shop-service/src/main/java/com/yami/shop/utils/SmqjhUtil.java

@@ -1,13 +1,10 @@
 package com.yami.shop.utils;
 
-import com.yami.shop.bean.dto.hb.HBBaseReq;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-import static cn.hutool.crypto.SecureUtil.md5;
-
 
 /**
  * 海博签名工具类
@@ -23,6 +20,11 @@ public class SmqjhUtil {
     @Value("${smqjh.pms-url}")
     private String smqjhPmsUrl;
 
+    @Getter
+    @Value("${smqjh.omsBaseUrl}")
+    private String omsBaseUrl;
+
+
     /**
      +     * 市民请集合门店修改和新增调用
      +     */