刷新快递信息

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrderCourier.java

@@ -1,29 +1,36 @@
 package com.yonge.cooleshow.mbg.model;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * 快递信息表
  */
 public class OmsOrderCourier {
+    @ApiModelProperty("")
     private Long id;
 
     /**
     * 快递公司
     */
+    @ApiModelProperty("快递公司名")
     private String company;
 
     /**
      * 订单号
      */
+    @ApiModelProperty("订单id")
     private Long orderId;
 
     /**
      * 快递单号
      */
+    @ApiModelProperty("快递单号")
     private String courierNo;
 
     /**
      * 物流信息
      */
+    @ApiModelProperty("物流信息 ")
     private String logistics;
 
     public Long getId() {

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsOrderCourierServiceImpl.java

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.mall.common.enums.OrderCacheEnum;
 import com.yonge.cooleshow.mbg.mapper.OmsOrderCourierMapper;
 import com.yonge.cooleshow.mbg.model.OmsOrderCourier;
 import com.yonge.cooleshow.portal.service.OmsOrderCourierService;
+import com.yonge.toolset.base.exception.BizException;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +42,11 @@ public class OmsOrderCourierServiceImpl implements OmsOrderCourierService {
 
     @Override
     public OmsOrderCourier getCourierInfo(String deliverySn) {
-        return omsOrderCourierMapper.queryByCourierNo(deliverySn);
+        OmsOrderCourier omsOrderCourier = omsOrderCourierMapper.queryByCourierNo(deliverySn);
+        if (omsOrderCourier == null) {
+            throw new BizException("未找到物流信息");
+        }
+        return omsOrderCourier;
     }
 
     @Override
@@ -50,7 +55,10 @@ public class OmsOrderCourierServiceImpl implements OmsOrderCourierService {
         boolean b = lock.tryLock(1, TimeUnit.HOURS);
         if (b) {
             OmsOrderCourier omsOrderCourier = omsOrderCourierMapper.queryByCourierNo(deliverySn);
-            CourierInfo courierInfo = courierService.queryTrack(CompanyEnum.valueOf(omsOrderCourier.getCompany()),
+            if (omsOrderCourier == null) {
+                throw new BizException("未找到物流信息");
+            }
+            CourierInfo courierInfo = courierService.queryTrack(CompanyEnum.descOf(omsOrderCourier.getCompany()),
                                                                 omsOrderCourier.getCourierNo());
             updateCourierInfo(courierInfo);
         }