Merge branch 'master' into hurx

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/zhongche/domain/bo/OrderDeliverBo.java → ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/zhongche/domain/bo/ZhongCheOrderDeliverBo.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrderDeliverBo {
+public class ZhongCheOrderDeliverBo {
     /**
      * 中车电子商城订单号
      * 必填

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/zhongche/domain/vo/OrderDeliverVo.java → ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/zhongche/domain/vo/ZhongCheOrderDeliverVo.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrderDeliverVo {
+public class ZhongCheOrderDeliverVo {
     /**
      * 发货单编号
      * 必填

ruoyi-api/ruoyi-api-order/src/main/java/org/dromara/product/api/RemoteExternalOrderService.java

@@ -1,7 +1,7 @@
 package org.dromara.product.api;
 
 import org.dromara.common.core.domain.zhongche.domain.DeliveryTrack;
-import org.dromara.common.core.domain.zhongche.vo.TrackVo;
+import org.dromara.common.core.domain.zhongche.vo.ZhongCheTrackVo;
 import org.dromara.product.api.domain.dto.OrderNoDto;
 import org.dromara.product.api.domain.dto.OrderNoticeDto;
 import org.dromara.product.api.domain.dto.OrderPushDto;
@@ -37,7 +37,7 @@ public interface RemoteExternalOrderService {
 
 
     //查询物流单号物流公司
-    TrackVo queryLogisticsTrack(String outgoingCode, String waybillType);
+    ZhongCheTrackVo queryLogisticsTrack(String outgoingCode, String waybillType);
 
     //获取物流轨迹
     List<DeliveryTrack> queryDeliverTrack(String logisticsCompanyCode,String logisticNo ,String phone);

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/zhongche/vo/TrackVo.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/zhongche/vo/ZhongCheTrackVo.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class TrackVo {
+public class ZhongCheTrackVo {
     /**
      * 物流单号
      * 非必填

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/ZhongChePullController.java

@@ -308,10 +308,10 @@ public class ZhongChePullController {
 
     //TODO 5.3.5	发货
     @PostMapping("/mall/order/deliver/goods")
-    public OrderDeliverVo mallOrderDeliverGoods(@RequestBody OrderDeliverBo bo) {
+    public ZhongCheOrderDeliverVo mallOrderDeliverGoods(@RequestBody ZhongCheOrderDeliverBo bo) {
         ZCR responseDto = doZcPost("/api/mall/order/deliver/goods", bo);
 
-        OrderDeliverVo zcr = parseZcResponse(responseDto, OrderDeliverVo.class);
+        ZhongCheOrderDeliverVo zcr = parseZcResponse(responseDto, ZhongCheOrderDeliverVo.class);
         return zcr;
 
     }

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/ZhongChePushController.java

@@ -13,12 +13,12 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.domain.zhongche.domain.Goods;
 import org.dromara.common.core.domain.zhongche.domain.Prices;
 import org.dromara.common.core.domain.zhongche.vo.PricesVo;
+import org.dromara.common.core.domain.zhongche.vo.ZhongCheTrackVo;
 import org.dromara.external.api.zhongche.domain.*;
 import org.dromara.external.api.zhongche.domain.bo.AreaStockBo;
 import org.dromara.external.api.zhongche.domain.bo.*;
 import org.dromara.external.api.zhongche.domain.vo.*;
 import org.dromara.external.api.zhongche.domain.Catalog;
-import org.dromara.common.core.domain.zhongche.vo.TrackVo;
 import org.dromara.external.controller.zhongche.handle.MallMessageDispatcher;
 import org.dromara.external.util.SM2SignatureUtils;
 import org.dromara.external.util.SignParamUtils;
@@ -415,7 +415,7 @@ public class ZhongChePushController {
         }
 
         //******4. 核心业务：调用Dubbo服务查询物流信息   我们没有换新单 所以第二个参数先抛弃掉
-        TrackVo trackVo = remoteOrderService.queryLogisticsTrack(bizReq.getOutgoingCode(), bizReq.getWaybillType());
+        ZhongCheTrackVo trackVo = remoteOrderService.queryLogisticsTrack(bizReq.getOutgoingCode(), bizReq.getWaybillType());
         if (trackVo == null){
             return ZCR.fail("5035", "物流信息为空");
         }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteExternalOrderServiceImpl.java

@@ -6,9 +6,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.core.domain.zhongche.domain.DeliveryTrack;
+import org.dromara.common.core.domain.zhongche.vo.ZhongCheTrackVo;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.domain.zhongche.vo.TrackVo;
+import org.dromara.common.core.domain.zhongche.vo.ZhongCheTrackVo;
 import org.dromara.order.domain.OrderDeliver;
 import org.dromara.order.domain.OrderMain;
 import org.dromara.order.domain.OrderReturn;
@@ -115,7 +116,7 @@ public class RemoteExternalOrderServiceImpl implements RemoteExternalOrderServic
     }
 
     @Override
-    public TrackVo queryLogisticsTrack(String outgoingCode, String waybillType) {
+    public ZhongCheTrackVo queryLogisticsTrack(String outgoingCode, String waybillType) {
         //目前忽略第二个参数
         OrderDeliver one = orderDeliverService.lambdaQuery()
             .eq(OrderDeliver::getDeliverCode, outgoingCode)
@@ -129,7 +130,7 @@ public class RemoteExternalOrderServiceImpl implements RemoteExternalOrderServic
 
         String name = remoteComLogisticsCompanyService.selectLogisticsCompanyNameById(one.getLogisticsCompanyId());
         List<DeliveryTrack> deliveryTracks = queryDeliverTrack(one.getLogisticsCompanyCode(), one.getLogisticNo(), one.getConsigneePhone());
-        TrackVo trackVo = new TrackVo();
+        ZhongCheTrackVo trackVo = new ZhongCheTrackVo();
         trackVo.setExpressCompanyName(name);
         trackVo.setDeliveryTrack(deliveryTracks);
         trackVo.setExpressCode(one.getLogisticNo());