|
...
|
...
|
@@ -1376,12 +1376,12 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon |
|
|
|
String recipientCity = StringUtils.EMPTY;
|
|
|
|
String recipientRegion = StringUtils.EMPTY;
|
|
|
|
String recipinentAddress = StringUtils.EMPTY;
|
|
|
|
if (buyerOrderMeta != null && StringUtils.isBlank(buyerOrderMeta.getMetaValue())){
|
|
|
|
if (buyerOrderMeta != null && StringUtils.isNoneBlank(buyerOrderMeta.getMetaValue())){
|
|
|
|
JSONObject jsonObject = JSONObject.parseObject(buyerOrderMeta.getMetaValue());
|
|
|
|
mobile = jsonObject.getString("mobile");
|
|
|
|
consignee = jsonObject.getString("consignee");
|
|
|
|
String[] areas = jsonObject.getString("area").split("\\s+");
|
|
|
|
if (areas.length ==3){
|
|
|
|
if (areas.length >=3){
|
|
|
|
recipientProvince = areas[0];
|
|
|
|
recipientCity = areas[1];
|
|
|
|
recipientRegion = areas[2];
|
|
...
|
...
|
@@ -1399,6 +1399,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon |
|
|
|
|
|
|
|
BigDecimal price = buyerOrderGoods.getGoodsPrice().subtract(buyerOrderGoods.getCouponCutAmount()).subtract(buyerOrderGoods.getActivityCutAmount());
|
|
|
|
|
|
|
|
// 处理空值
|
|
|
|
buyerOrderGoods.setTariffAmount(new BigDecimal(0));
|
|
|
|
buyerOrderGoods.setCutTariffAmount(new BigDecimal(0));
|
|
|
|
|
|
|
|
OrderInfoForPackageNum orderInfoForPackageNum = OrderInfoForPackageNum.builder()
|
|
|
|
.goodsPrice(buyerOrderGoods.getGoodsPrice())
|
|
|
|
.goodsAmount(price)
|
...
|
...
|
|
