华莱士

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

@@ -67,7 +67,7 @@ public class SpellGroupOrderAdapter {
         //运费
         long freight = 1000 ;
         //判断是否包邮，包邮的话运费为0 todo
-        if (!createSpellGroupOrderDto.getDeliveryTemplateInfoVo().isDispatchFree()) {
+        if (!createSpellGroupOrderDto.getDeliveryTemplateInfoVo().getIsDispatchFree() == true) {
             freight = createSpellGroupOrderDto.getDeliveryTemplateInfoVo().getFreight();
         }
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscount = createSpellGroupOrderDto.getActivityCalculationDiscountResponseDto().getResult();

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

@@ -28,6 +28,6 @@ public class QueryDeliveryTemplateResponse {
         /**
          * 是否包邮 -> true:是; false:否
          */
-        private boolean isDispatchFree;
+        private Boolean isDispatchFree;
     }
 }

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

@@ -189,7 +189,11 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         if(queryDeliveryTemplateResponse == null){
             return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
         }
-        return ResponseUtil.success(queryDeliveryTemplateResponse.getData());
+        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = queryDeliveryTemplateResponse.getData();
+        if(deliveryTemplateInfoVo.getIsDispatchFree() == true){
+            deliveryTemplateInfoVo.setFreight((long) 0);
+        }
+        return ResponseUtil.success(deliveryTemplateInfoVo);
     }
 
     /**