diff --git a/src/main/java/com/peanut/modules/book/entity/BuyOrder.java b/src/main/java/com/peanut/modules/book/entity/BuyOrder.java index 2e108c2f..b9e033a1 100644 --- a/src/main/java/com/peanut/modules/book/entity/BuyOrder.java +++ b/src/main/java/com/peanut/modules/book/entity/BuyOrder.java @@ -7,6 +7,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; +import com.peanut.modules.book.vo.response.ConsigneeVo; import lombok.Data; /** @@ -185,4 +186,7 @@ public class BuyOrder implements Serializable { private List expressList; private int addressModified; + + @TableField(exist = false) + private ConsigneeVo consigneeVo; } diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index dde74f0c..4ced8646 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -387,6 +387,20 @@ public class BuyOrderServiceImpl extends ServiceImpl impl b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId())); } b.setProductList(buyOrderProducts); + //设置快递信息传递给前端 + ConsigneeVo consigneeVo = new ConsigneeVo(); + consigneeVo.setConsigneeName(b.getShippingUser()); + consigneeVo.setConsigneeMobile(b.getUserPhone()); + County county = countyService.getOne(new LambdaQueryWrapper().eq(County::getCountyName, b.getDistrict())); + consigneeVo.setCounty(county.getCountyName()); + consigneeVo.setCountyCode(county.getRegionCode()); + City city = cityService.getOne(new LambdaQueryWrapper().eq(City::getCityId, county.getCityId())); + consigneeVo.setCity(city.getCityName()); + consigneeVo.setCityCode(city.getRegionCode()); + Province province = provinceService.getOne(new LambdaQueryWrapper().eq(Province::getProvId, city.getProvId())); + consigneeVo.setProvince(province.getProvName()); + consigneeVo.setProvinceCode(province.getRegionCode()); + b.setConsigneeVo(consigneeVo); //添加快递包裹信息 // LambdaQueryWrapper b_wrapper = new LambdaQueryWrapper<>(); // b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId());