Merge remote-tracking branch 'origin/master'

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

@@ -166,21 +166,12 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         }
         createSpellGroupOrderDto.setCalculationDiscount(activityCalculationDiscountResponseDto.getResult());
         /*转换request->查询快递费用信息->转换dto*/
-
-
         QueryDeliveryTemplateRequest queryDeliveryTemplateRequest = spellGroupOrderAdapter.convertToQueryDeliveryTemplateRequest(createSpellGroupOrderDto);
         QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(queryDeliveryTemplateRequest);
         if(queryDeliveryTemplateResponse == null ){
             return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
         }
-        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = new QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo();
-        deliveryTemplateInfoVo.setFreight(1L);
-        deliveryTemplateInfoVo.setIsDispatchFree(false);
-        createSpellGroupOrderDto.setDeliveryTemplateInfo(deliveryTemplateInfoVo);
-
-//        createSpellGroupOrderDto.setDeliveryTemplateInfo(queryDeliveryTemplateResponse.getData());
-
-
+        createSpellGroupOrderDto.setDeliveryTemplateInfo(queryDeliveryTemplateResponse.getData());
         /*createSpellGroupOrderDto转换为订单Request信息*/
         com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest createOrderRequest = spellGroupOrderAdapter.convertToCreateOrderRequest(createSpellGroupOrderDto, userLoginInfoDto);
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> response = orderSdkService.createOrder(createOrderRequest, trackingNo);
@@ -205,16 +196,11 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
      */
     @Override
     public BaseResponse queryDeliveryAmount(QueryDeliveryTemplateRequest request) {
-//        QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(request);
-//        if(queryDeliveryTemplateResponse == null){
-//            return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
-//        }
-//        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = queryDeliveryTemplateResponse.getData();
-
-        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = new QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo();
-        deliveryTemplateInfoVo.setFreight(1L);
-        deliveryTemplateInfoVo.setIsDispatchFree(false);
-
+        QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(request);
+        if(queryDeliveryTemplateResponse == null){
+            return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
+        }
+        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = queryDeliveryTemplateResponse.getData();
         if(deliveryTemplateInfoVo.getIsDispatchFree() == true){
             deliveryTemplateInfoVo.setFreight((long) 0);
         }