Commit 943f3561 by zhiheng.zhang

修复下单地址为空

parent 7413527d
......@@ -267,24 +267,17 @@ public class CheckMallOrder {
if(weixinDeliveryAddress == null || StringUtils.isEmpty(weixinDeliveryAddress.getProvinceName())) {
throw new ServiceException(ResponseResult.DELIVERY_INFO_ERROR);
}
// cn.freemud.base.entity.BaseResponse<DeliveryAmountVo> deliveryAmountVoBaseResponse = thirdDeliveryService.queryDeliveryAmount(createOrderVo.getWeixinDeliveryAddress());
// if(deliveryAmountVoBaseResponse == null || !ResponseResult.SUCCESS.getCode().equals(deliveryAmountVoBaseResponse.getCode())) {
// throw new ServiceException(ResponseResult.DELIVERY_INFO_NOT_DELIVERY);
// }
// DeliveryAmountVo deliveryAmountVo = deliveryAmountVoBaseResponse.getResult();
UserDeliveryInfoDto userDeliveryInfoDto = UserDeliveryInfoDto.builder()
// .deliveryLimitAmount(storeDeliveryInfoDto.getDeliveryLimitAmount())
.userEnableTakeaway(true)
// .realDeliveryAmount(deliveryAmountVo.getDeliveryAmount().longValue())
// .storeId(storeDeliveryInfoDto.getStoreId())
// .storeName(storeDeliveryInfoDto.getStoreName())
.receiveMobile(weixinDeliveryAddress.getTelNumber())
.receiveUserName(weixinDeliveryAddress.getUserName())
.receiveProvince(weixinDeliveryAddress.getProvinceName())
.receiveCity(weixinDeliveryAddress.getCityName())
.receiveRegion(weixinDeliveryAddress.getCountyName())
.receiveAddress(weixinDeliveryAddress.getDetailInfo()).build();
// .storeDeliveryInfoDto(storeDeliveryInfoDto)
createOrderVo.setReceiveMobile(weixinDeliveryAddress.getTelNumber());
createOrderVo.setReceiveAddress(weixinDeliveryAddress.getDetailInfo());
createOrderVo.setReceiveUsername(weixinDeliveryAddress.getUserName());
createOrderVo.setUserDeliveryInfoDto(userDeliveryInfoDto);
}
......
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