物流信息查询

ch-core/src/main/java/com/wwdz/ch/core/consts/CommonEnum.java

@@ -71,6 +71,42 @@ public class CommonEnum {
 
 
 
+    public enum LogisticsTypeEnum {
+        FROM(1, "藏家基础物流"),
+        DELIVERY(2, "平台发货物流"),
+        SEND_BACK(3, "平台退回物流"),
+        ;
+
+        private int code;
+        private String des;
+
+        LogisticsTypeEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+
+            for (LogisticsTypeEnum logisticsTypeEnum : LogisticsTypeEnum.values()) {
+                if (code == logisticsTypeEnum.getCode()) {
+                    return logisticsTypeEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+
+
+
 
     public enum SourceEnum {
         CNG(0, "CNG"),

ch-core/src/main/java/com/wwdz/ch/core/consts/LogisticsEnum.java

@@ -35,4 +35,6 @@ public enum LogisticsEnum {
     public String getName() {
         return name;
     }
+
+
 }

ch-core/src/main/java/com/wwdz/ch/core/entity/LogisticsRequestDto.java

@@ -9,4 +9,9 @@ public class LogisticsRequestDto implements Entity {
     private String logisticsCode;
 
     private String waybill;
+
+    /**
+     * 物流单号类型
+     */
+    private Integer type;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -1065,15 +1065,16 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributionOrderDetailVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
             distributionOrderDetailVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
             DistributorProfit distributorProfit = distributorProfitDao.findByIdOfDistributor(dto.getDistributionOrderId(), distributionOrder.getSellerId());
-            distributionOrderDetailVo.setChannelCost(PriceUtil.convertPriceFenToYuan(distributorProfit.getChannelCost()));
-            distributionOrderDetailVo.setIntroduceCost(PriceUtil.convertPriceFenToYuan(distributorProfit.getIntroduceCost()));
-
-            FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
-            followFansRecordRequestDto.setFollowerId(supplierItem.getCreatorId());
-            followFansRecordRequestDto.setFansId(distributionOrder.getBuyerId());
-            double rebate = distributorProfitService.getIntroduceRebate(followFansRecordRequestDto);
-            distributionOrderDetailVo.setIntroduceRebate(PriceUtil.convertPriceFromStr(String.valueOf(rebate)).toString());
-            distributionOrderDetailVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
+            if (distributorProfit != null) {
+                distributionOrderDetailVo.setChannelCost(PriceUtil.convertPriceFenToYuan(distributorProfit.getChannelCost()));
+                distributionOrderDetailVo.setIntroduceCost(PriceUtil.convertPriceFenToYuan(distributorProfit.getIntroduceCost()));
+                FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
+                followFansRecordRequestDto.setFollowerId(supplierItem.getCreatorId());
+                followFansRecordRequestDto.setFansId(distributionOrder.getBuyerId());
+                double rebate = distributorProfitService.getIntroduceRebate(followFansRecordRequestDto);
+                distributionOrderDetailVo.setIntroduceRebate(PriceUtil.convertPriceFromStr(String.valueOf(rebate)).toString());
+                distributionOrderDetailVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
+            }
 
             //如果藏家订单是取消状态，查询对应鉴定单状态
             IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(dto.getDistributionOrderId());

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/LogisticsServiceImpl.java

@@ -54,5 +54,15 @@ public class LogisticsServiceImpl implements LogisticsService {
     }
 
 
+    @Override
+    public Result findLogisticsInfo(LogisticsRequestDto dto) {
+        try {
+
 
+
+        } catch (Exception e) {
+            logger.error("查询物流轨迹 error : {}", e);
+        }
+        return Result.failed();
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/LogisticsService.java

 package com.wwdz.ch.wx.service.distribution;
 
+import com.wwdz.ch.core.entity.LogisticsRequestDto;
 import com.wwdz.ch.core.type.Result;
 
 public interface LogisticsService {
@@ -10,4 +11,13 @@ public interface LogisticsService {
      * @return
      */
     Result findLogisticsInfo(String orderId);
+
+
+    /**
+     * 查询订单物流轨迹
+     * @param waybill
+     * @param type
+     * @return
+     */
+    Result findLogisticsInfo(LogisticsRequestDto dto);
 }