Skip to content

O
order-group
Commit 8e3ca945 by hanghang.wang
Options

去掉配送费

parent 17546b25
Showing with 22 additions and 22 deletions
order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
...@@ -166,19 +166,19 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService { ...@@ -166,19 +166,19 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
} }
createSpellGroupOrderDto.setCalculationDiscount(activityCalculationDiscountResponseDto.getResult()); createSpellGroupOrderDto.setCalculationDiscount(activityCalculationDiscountResponseDto.getResult());
/*转换request->查询快递费用信息->转换dto*/ /*转换request->查询快递费用信息->转换dto*/
QueryDeliveryTemplateRequest queryDeliveryTemplateRequest = spellGroupOrderAdapter.convertToQueryDeliveryTemplateRequest(createSpellGroupOrderDto); // QueryDeliveryTemplateRequest queryDeliveryTemplateRequest = spellGroupOrderAdapter.convertToQueryDeliveryTemplateRequest(createSpellGroupOrderDto);
QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(queryDeliveryTemplateRequest); // QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(queryDeliveryTemplateRequest);
if(queryDeliveryTemplateResponse == null ){ // if(queryDeliveryTemplateResponse == null ){
return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR); // return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
} // }
createSpellGroupOrderDto.setDeliveryTemplateInfo(queryDeliveryTemplateResponse.getData()); // createSpellGroupOrderDto.setDeliveryTemplateInfo(queryDeliveryTemplateResponse.getData());
QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = new QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo();
deliveryTemplateInfoVo.setFreight(1L);
deliveryTemplateInfoVo.setIsDispatchFree(false);
createSpellGroupOrderDto.setDeliveryTemplateInfo(deliveryTemplateInfoVo);
// QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = new QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo();
// deliveryTemplateInfoVo.setFreight(1L);
// deliveryTemplateInfoVo.setIsDispatchFree(false);
// createSpellGroupOrderDto.setDeliveryTemplateInfo(deliveryTemplateInfoVo);
// createSpellGroupOrderDto.setDeliveryTemplateInfo(deliveryTemplateInfoVo);
/*createSpellGroupOrderDto转换为订单Request信息*/ /*createSpellGroupOrderDto转换为订单Request信息*/
com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest createOrderRequest = spellGroupOrderAdapter.convertToCreateOrderRequest(createSpellGroupOrderDto, userLoginInfoDto); 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); com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> response = orderSdkService.createOrder(createOrderRequest, trackingNo);
...@@ -203,17 +203,17 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService { ...@@ -203,17 +203,17 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
*/ */
@Override @Override
public BaseResponse queryDeliveryAmount(QueryDeliveryTemplateRequest request) { public BaseResponse queryDeliveryAmount(QueryDeliveryTemplateRequest request) {
QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(request); // QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(request);
if(queryDeliveryTemplateResponse == null){ // if(queryDeliveryTemplateResponse == null){
return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR); // return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
} // }
QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = queryDeliveryTemplateResponse.getData(); // QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = queryDeliveryTemplateResponse.getData();
if(deliveryTemplateInfoVo.getIsDispatchFree() == true){ // if(deliveryTemplateInfoVo.getIsDispatchFree() == true){
deliveryTemplateInfoVo.setFreight((long) 0); // deliveryTemplateInfoVo.setFreight((long) 0);
} // }
// QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = new QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo(); QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = new QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo();
// deliveryTemplateInfoVo.setFreight(1L); deliveryTemplateInfoVo.setFreight(1L);
// deliveryTemplateInfoVo.setIsDispatchFree(false); deliveryTemplateInfoVo.setIsDispatchFree(false);
return ResponseUtil.success(deliveryTemplateInfoVo); return ResponseUtil.success(deliveryTemplateInfoVo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment