Commit 7e8571e1 authored by zhengyi's avatar zhengyi

bug修复

parent f00dcd2c
...@@ -2990,11 +2990,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -2990,11 +2990,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (updateReqVO.getHarvestMethod() == 2) { if (updateReqVO.getHarvestMethod() == 2) {
OrderConsigneeBackVO orderConsigneeBackVO = vo.getConsigneeVO(); OrderConsigneeBackVO orderConsigneeBackVO = vo.getConsigneeVO();
// 送货地址 // 送货地址
orderConsigneeBackVO.setCountry(updateReqVO.getCountry()); if(Objects.nonNull(orderConsigneeBackVO)) {
orderConsigneeBackVO.setProvince(updateReqVO.getProvince()); orderConsigneeBackVO.setCountry(updateReqVO.getCountry());
orderConsigneeBackVO.setCity(updateReqVO.getCity()); orderConsigneeBackVO.setProvince(updateReqVO.getProvince());
orderConsigneeBackVO.setAddress(updateReqVO.getConsigneeAddress()); orderConsigneeBackVO.setCity(updateReqVO.getCity());
orderConsigneeBackVO.setHarvestMethod(updateReqVO.getHarvestMethod()); orderConsigneeBackVO.setAddress(updateReqVO.getConsigneeAddress());
orderConsigneeBackVO.setHarvestMethod(updateReqVO.getHarvestMethod());
}
vo.setConsigneeVO(orderConsigneeBackVO); vo.setConsigneeVO(orderConsigneeBackVO);
vo.setCountry(updateReqVO.getCountry()); vo.setCountry(updateReqVO.getCountry());
vo.setProvince(updateReqVO.getProvince()); vo.setProvince(updateReqVO.getProvince());
......
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