|
@@ -147,6 +147,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
@Autowired
|
|
|
private GoodsDao goodsDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SysAreaService sysAreaService;
|
|
|
+
|
|
|
@Override
|
|
|
public BaseDAO<Long, MusicGroupPaymentCalender> getDAO() {
|
|
|
return musicGroupPaymentCalenderDao;
|
|
@@ -1069,6 +1072,13 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
if (CollectionUtils.isEmpty(goods)) {
|
|
|
throw new BizException("商品信息不存在");
|
|
|
}
|
|
|
+ // 查询地区信息
|
|
|
+ List<String> areaIds = new ArrayList<>();
|
|
|
+ areaIds.add(address.getProvince());
|
|
|
+ areaIds.add(address.getCity());
|
|
|
+ areaIds.add(address.getRegion());
|
|
|
+ areaIds = areaIds.stream().filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
|
|
|
+ Map<String, String> nameMapByIds = sysAreaService.getNameMapByIds(areaIds);
|
|
|
OrderCreate orderCreate = new OrderCreate();
|
|
|
String orderNo = idGeneratorService.generatorId("payment") + "";
|
|
|
address.setOrderNo(orderNo);
|
|
@@ -1083,9 +1093,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
orderCreate.setReceiverName(address.getName());
|
|
|
orderCreate.setReceiverPostCode(address.getPostCode());
|
|
|
orderCreate.setReceiverPhone(address.getPhone());
|
|
|
- orderCreate.setReceiverProvince(address.getProvince());
|
|
|
- orderCreate.setReceiverCity(address.getCity());
|
|
|
- orderCreate.setReceiverRegion(address.getRegion());
|
|
|
+ orderCreate.setReceiverProvince(nameMapByIds.getOrDefault(address.getProvince(),""));
|
|
|
+ orderCreate.setReceiverCity(nameMapByIds.getOrDefault(address.getCity(),""));
|
|
|
+ orderCreate.setReceiverRegion(nameMapByIds.getOrDefault(address.getRegion(),""));
|
|
|
orderCreate.setReceiverDetailAddress(address.getAddress());
|
|
|
orderCreate.setStatus(1);
|
|
|
List<OrderCreate.OrderItem> orderItems = new ArrayList<>();
|