Commit 1f00783a by huiyang.chen

Merge branch 'feature-2020/8/6-McCafe-会阳' into develop

parents 7963887f 75460f0a
...@@ -2623,6 +2623,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2623,6 +2623,10 @@ public class OrderServiceImpl implements Orderservice {
dto.setOrderKey(reminderVo.getOid()); dto.setOrderKey(reminderVo.getOid());
dto.setStoreId(userLoginInfoDto.getStoreId()); dto.setStoreId(userLoginInfoDto.getStoreId());
dto.setDeliveryChannel("CanDao"); dto.setDeliveryChannel("CanDao");
dto.setDisplayOrderId(orderBean.getDownstreamThirdOrderCode());
if (orderBean.getAddInfo() != null){
dto.setDeliveryId(orderBean.getAddInfo().getDeliveryId());
}
QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.orderRemind(dto); QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.orderRemind(dto);
if(responseDto == null || RESPONSE_SUCCESS_CODE != responseDto.getCode() ) { if(responseDto == null || RESPONSE_SUCCESS_CODE != responseDto.getCode() ) {
return ResponseUtil.error(ResponseResult.DELIVERY_REMINDER_ERROR); return ResponseUtil.error(ResponseResult.DELIVERY_REMINDER_ERROR);
......
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