Merge branch 'dev' into smqjh_20260107

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBOrderService.java

@@ -14,7 +14,6 @@ import com.yami.shop.bean.param.OrderRefundParam;
 import com.yami.shop.bean.vo.OrderRefundSkuVo;
 import com.yami.shop.common.util.HttpUtil;
 import com.yami.shop.common.util.hb.HBR;
-import com.yami.shop.config.SMConstants;
 import com.yami.shop.dao.*;
 import com.yami.shop.service.OrderRefundService;
 import com.yami.shop.service.OrderService;
@@ -22,6 +21,7 @@ import com.yami.shop.service.UserAddrOrderService;
 import com.yami.shop.service.UserService;
 import com.yami.shop.service.hb.IHBOrderService;
 import com.yami.shop.utils.HBSignUtil;
+import com.yami.shop.utils.SmqjhUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -54,6 +54,7 @@ public class HBOrderService implements IHBOrderService {
     private final OrderRefundService orderRefundService;
     private final OrderService orderService;
     private final OrderRefundSkuMapper orderRefundSkuMapper;
+    private final SmqjhUtil smqjhUtil;
 
     public HBR addHBGoods(JSONObject hbRequest) {
         try {
@@ -273,11 +274,11 @@ public class HBOrderService implements IHBOrderService {
         }
 
         //TODO 市民请集合海博状态通知
-        if (order.getOrderType().equals(4)){
+        if (order.getOrderType().equals(4)) {
             Map<Object, Object> map = new LinkedTreeMap<>();
             map.put("orderNumber", channelOrderId);
             map.put("hbOrderStatus", operatorType);
-            HttpUtil.post(SMConstants.SM_BASE_URL+"/api/v1/xsb/order/updateHbOrderStatus",map);
+            HttpUtil.post(smqjhUtil.getOmsBaseUrl() + "/api/v1/xsb/order/updateHbOrderStatus", map);
         }
     }
 
@@ -301,10 +302,10 @@ public class HBOrderService implements IHBOrderService {
             map.put("logisticStatus", logisticStatus);
             map.put("dvyFlowId", body.getString("carrierNo"));
 
-            if (logisticStatus.equals(20)||logisticStatus.equals(30)){
+            if (logisticStatus.equals(20) || logisticStatus.equals(30)) {
                 map.put("deliveryInfo", orderMapper.getRiderInfo(order.getOrderNumber()));
             }
-            HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/updateHbLogisticStatus", map);
+            HttpUtil.post(smqjhUtil.getOmsBaseUrl() + "/api/v1/xsb/order/updateHbLogisticStatus", map);
         }
     }
 
@@ -342,7 +343,7 @@ public class HBOrderService implements IHBOrderService {
             map.put("pushTime", orderRiderLocation.getPushTime());
             map.put("latitude", orderRiderLocation.getLatitude());
             map.put("longitude", orderRiderLocation.getLongitude());
-            HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/addOrUpdateRiderLocation", map);
+            HttpUtil.post(smqjhUtil.getOmsBaseUrl() + "/api/v1/xsb/order/addOrUpdateRiderLocation", map);
         }
 
     }
@@ -384,7 +385,7 @@ public class HBOrderService implements IHBOrderService {
             createOrderRequest.setCaution(userByUserId.getUserMobile() + "*" + order.getRemarks());
         }
         if (order.getOrderType() != null && order.getOrderType() == 4) {
-            log.info("市民请结合：{}",order);
+            log.info("市民请结合：{}", order);
             createOrderRequest.setRecipientName(order.getConsigneeName());
             createOrderRequest.setRecipientPhone(order.getConsigneeMobile());
             createOrderRequest.setRecipientLatitude(order.getLatitude());