|
|
|
|
@ -320,20 +320,38 @@ public class HighOrderController { |
|
|
|
|
|
|
|
|
|
// 计算价格
|
|
|
|
|
GasPayPriceModel priceModel = gasDiscountOilPriceService.oilPriceDiscountCompute(childOrder.getGoodsPrice(), childOrder.getGoodsId(), childOrder.getGasOilNo(), highOrder.getIsTyAgent()); |
|
|
|
|
// 支付价格
|
|
|
|
|
childOrder.setGoodsActualPrice(priceModel.getPayPrice()); |
|
|
|
|
|
|
|
|
|
// 油价信息
|
|
|
|
|
childOrder.setGasPriceGun(priceModel.getPriceGun()); |
|
|
|
|
childOrder.setGasPriceVip(priceModel.getPriceVip()); |
|
|
|
|
childOrder.setGasPriceOfficial(priceModel.getPriceOfficial()); |
|
|
|
|
childOrder.setGasPricePlatform(priceModel.getPricePlatform()); |
|
|
|
|
childOrder.setGasOilLiters(priceModel.getOilLiters()); |
|
|
|
|
childOrder.setGasDiscount(priceModel.getDiscount()); |
|
|
|
|
childOrder.setExt1(priceModel.getPricePlatform().toString()); |
|
|
|
|
childOrder.setGasOilSubsidy(priceModel.getPreferentialMargin()); |
|
|
|
|
childOrder.setGasLitersPreferences(priceModel.getLitersPreferences()); |
|
|
|
|
childOrder.setGasPricePreferences(priceModel.getPricePreferences()); |
|
|
|
|
|
|
|
|
|
// 使用了优惠价
|
|
|
|
|
if (highDiscountUserRel != null) { |
|
|
|
|
// 支付价格
|
|
|
|
|
childOrder.setGoodsActualPrice(childOrder.getGoodsPrice()); |
|
|
|
|
// 油价信息
|
|
|
|
|
childOrder.setGasPriceGun(priceModel.getPriceGun()); |
|
|
|
|
childOrder.setGasPriceVip(priceModel.getPriceVip()); |
|
|
|
|
childOrder.setGasPriceOfficial(priceModel.getPriceOfficial()); |
|
|
|
|
childOrder.setGasPricePlatform(priceModel.getPriceVip()); |
|
|
|
|
childOrder.setGasOilLiters(priceModel.getOilLiters()); |
|
|
|
|
childOrder.setGasDiscount(new BigDecimal("0")); |
|
|
|
|
childOrder.setExt1(childOrder.getGasPricePlatform().toString()); |
|
|
|
|
childOrder.setGasOilSubsidy(new BigDecimal("0")); |
|
|
|
|
childOrder.setGasLitersPreferences(new BigDecimal("0")); |
|
|
|
|
childOrder.setGasPricePreferences(priceModel.getPriceVip()); |
|
|
|
|
} else { |
|
|
|
|
// 支付价格
|
|
|
|
|
childOrder.setGoodsActualPrice(priceModel.getPayPrice()); |
|
|
|
|
// 油价信息
|
|
|
|
|
childOrder.setGasPriceGun(priceModel.getPriceGun()); |
|
|
|
|
childOrder.setGasPriceVip(priceModel.getPriceVip()); |
|
|
|
|
childOrder.setGasPriceOfficial(priceModel.getPriceOfficial()); |
|
|
|
|
childOrder.setGasPricePlatform(priceModel.getPricePlatform()); |
|
|
|
|
childOrder.setGasOilLiters(priceModel.getOilLiters()); |
|
|
|
|
childOrder.setGasDiscount(priceModel.getDiscount()); |
|
|
|
|
childOrder.setExt1(priceModel.getPricePlatform().toString()); |
|
|
|
|
childOrder.setGasOilSubsidy(priceModel.getPreferentialMargin()); |
|
|
|
|
childOrder.setGasLitersPreferences(priceModel.getLitersPreferences()); |
|
|
|
|
childOrder.setGasPricePreferences(priceModel.getPricePreferences()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 来源类型 1：平台自建 2：团油
|
|
|
|
|
if (store.getSourceType().equals(1)) { |
|
|
|
|
@ -414,7 +432,7 @@ public class HighOrderController { |
|
|
|
|
BigDecimal integralDeductionPrice = new BigDecimal(0); |
|
|
|
|
if (buyPoints && highOrder.getPayGold() != null) { |
|
|
|
|
|
|
|
|
|
integralDeductionPrice = new BigDecimal(highOrder.getPayGold()).divide(new BigDecimal(100)); |
|
|
|
|
integralDeductionPrice = new BigDecimal(highOrder.getPayGold().toString()).divide(new BigDecimal(100)); |
|
|
|
|
highUserService.goldHandle(userInfoModel.getHighUser().getId(), highOrder.getPayGold(), 2, 2, highOrder.getId()); |
|
|
|
|
|
|
|
|
|
BigDecimal payGold = new BigDecimal(highOrder.getPayGold()); |
|
|
|
|
@ -425,7 +443,6 @@ public class HighOrderController { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
highOrder.setMerchId(request.getHeader("mchId")); |
|
|
|
|
highOrder.setTotalPrice(totalPrice); |
|
|
|
|
|
|
|
|
|
|
