zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix:county name is not unique value

Browse Source
This commit is contained in:
Cauchy
2023-10-24 14:33:16 +08:00
parent b57b196dd5
commit 7b9c6424ea
6 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
View File

@@ -54,6 +54,12 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
@Autowired
private BuyOrderProductService buyOrderProductService;
@Autowired
private ProvinceService provinceService;
@Autowired
private CityService cityService;
protected Logger logger = LoggerFactory.getLogger(BuyOrderServiceImpl.class);
@@ -423,6 +429,29 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
consigneeVo.setCity(buyOrder.getCity());
consigneeVo.setCounty(buyOrder.getDistrict());
consigneeVo.setAddress(buyOrder.getAddress());
QueryWrapper<Province> provinceQueryWrapper = new QueryWrapper<>();
provinceQueryWrapper.eq("prov_name", buyOrder.getProvince());
Province province = provinceService.getOne(provinceQueryWrapper);
if (province != null) {
consigneeVo.setProvinceCode(province.getRegionCode());
}
QueryWrapper<City> cityQueryWrapper = new QueryWrapper<>();
cityQueryWrapper.eq("city_name", buyOrder.getCity());
City city = cityService.getOne(cityQueryWrapper);
Long cityId = null;
if (city != null) {
consigneeVo.setCityCode(city.getRegionCode());
cityId = city.getCityId();
}
QueryWrapper<County> countyQueryWrapper = new QueryWrapper<>();
countyQueryWrapper.eq("county_name", buyOrder.getDistrict());
if (countyService.count(countyQueryWrapper) > 1) {
countyQueryWrapper.eq("city_id", cityId);
}
County county = countyService.getOne(countyQueryWrapper);
if (county != null) {
consigneeVo.setCountyCode(county.getRegionCode());
}
responseVo.setConsignee(consigneeVo);
QueryWrapper<BuyOrderProduct> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("order_id", buyOrder.getId());