Commit 9a6a13be by 徐康

增加收货地址校验

parent a1c0e25e
...@@ -653,9 +653,9 @@ public class CheckMCCafeOrder { ...@@ -653,9 +653,9 @@ public class CheckMCCafeOrder {
throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_NOT_VALID); throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_NOT_VALID);
} else { } else {
List<MCCafeDeliveryGetStoreIdResponse> mcCafeDeliveryGetStoreIdResponseList = JSON.parseArray(mcCafeDeliveryBaseResponse.getData().toString(), MCCafeDeliveryGetStoreIdResponse.class); List<MCCafeDeliveryGetStoreIdResponse> mcCafeDeliveryGetStoreIdResponseList = JSON.parseArray(mcCafeDeliveryBaseResponse.getData().toString(), MCCafeDeliveryGetStoreIdResponse.class);
// if(mcCafeDeliveryGetStoreIdResponseList.stream().noneMatch(o -> createOrderVo.getShopId().equals(o.getStoreId()+""))) { if(mcCafeDeliveryGetStoreIdResponseList.stream().noneMatch(o -> createOrderVo.getShopId().equals(o.getStoreId()+""))) {
// throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_NOT_DELIVERY); throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_NOT_DELIVERY);
// } }
} }
UserDeliveryInfoDto userDeliveryInfoDto = UserDeliveryInfoDto.builder() UserDeliveryInfoDto userDeliveryInfoDto = UserDeliveryInfoDto.builder()
......
...@@ -224,6 +224,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService { ...@@ -224,6 +224,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
if(orderBean.getBizType() == 6) { if(orderBean.getBizType() == 6) {
return sellCouponOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans); return sellCouponOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
} }
//麦咖啡订单处理
if(mcCafePartnerId.equals(orderBean.getOid())) { if(mcCafePartnerId.equals(orderBean.getOid())) {
return mcCafeOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans); return mcCafeOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
} }
......
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