提交 46c9fede authored 作者: 杨启发's avatar 杨启发

Merge branch 'v22.8_sample_img_video_20240822' into test

Former-commit-id: 29263869
...@@ -2690,8 +2690,8 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -2690,8 +2690,8 @@ public class OrderChildServiceImpl implements OrderChildService {
FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData(); FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData();
FeignAddressVO.Address sendAddress = data.getSendAddress(); FeignAddressVO.Address sendAddress = data.getSendAddress();
FeignAddressVO.Address receiveAddress = data.getReceiveAddress(); FeignAddressVO.Address receiveAddress = data.getReceiveAddress();
carrierOrderChildDetailVO.setSendDetailAddress(sendAddress.getProvince()+sendAddress.getCity()+sendAddress.getCounty()+sendAddress.getAddress()); carrierOrderChildDetailVO.setSendDetailAddress(sendAddress.getAddress());
carrierOrderChildDetailVO.setReceiveDetailAddress(receiveAddress.getProvince()+receiveAddress.getCity()+receiveAddress.getCounty()+receiveAddress.getAddress()); carrierOrderChildDetailVO.setReceiveDetailAddress(receiveAddress.getAddress());
return carrierOrderChildDetailVO; return carrierOrderChildDetailVO;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论