修复:运费模板接口字段变动导致订单NPE

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java

@@ -3,6 +3,7 @@ package cn.freemud.adapter;
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.CreateSpellGroupOrderDto;
 import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateRequest;
+import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateResponse;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
 import cn.freemud.entities.dto.product.ProductInfo;
 import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
@@ -27,6 +28,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author wanghanghang
@@ -66,8 +68,10 @@ public class SpellGroupOrderAdapter {
         //运费
         long freight = 0 ;
         //判断是否包邮，包邮的话运费为0
-        if (createSpellGroupOrderDto.getDeliveryTemplateInfo().getIsDispatchFree() == false) {
-            freight = createSpellGroupOrderDto.getDeliveryTemplateInfo().getFreight();
+        //判断是否包邮，包邮的话运费为0
+        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfo = createSpellGroupOrderDto.getDeliveryTemplateInfo();
+        if (deliveryTemplateInfo != null && Objects.equals(deliveryTemplateInfo.getCostType(),0)) {
+            freight = deliveryTemplateInfo.getFreight() == null? 0: deliveryTemplateInfo.getFreight();
         }
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscount = createSpellGroupOrderDto.getCalculationDiscount();
         createOrderRequest.setActualPayAmount(calculationDiscount.getTotalAmount().longValue() + freight); //加配送费

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryDeliveryTemplateResponse.java

 package cn.freemud.entities.dto.delivery;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -21,13 +22,14 @@ public class QueryDeliveryTemplateResponse {
     @Data
     public static class DeliveryTemplateInfoVo {
 
-        /**
-         * 运费
-         */
-        private Long freight;
-        /**
-         * 是否包邮 -> true:是; false:否
-         */
-        private Boolean isDispatchFree;
+//        @ApiModelProperty(value = "是否包邮 -> true:是; false:否 （过期，后期通过costType字段）")
+//        @Deprecated
+//        private Boolean isDispatchFree;
+
+        @ApiModelProperty(value = "配送类型类型 -> 0:不包邮; 1:包邮; 2:运费到付")
+        private Integer costType;
+
+        @ApiModelProperty(value = "运费 单位：分")
+        private Integer freight;
     }
 }

order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java

@@ -203,8 +203,8 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
             return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
         }
         QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = queryDeliveryTemplateResponse.getData();
-        if(deliveryTemplateInfoVo.getIsDispatchFree() == true){
-            deliveryTemplateInfoVo.setFreight((long) 0);
+        if (deliveryTemplateInfoVo!= null && deliveryTemplateInfoVo.getCostType().compareTo(0) !=0) {
+            deliveryTemplateInfoVo.setFreight(0);
         }
 //        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = new QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo();
 //        deliveryTemplateInfoVo.setFreight(1L);