From 88535124880ccf9e5b2f16eca88904d923223f69 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Sat, 2 Apr 2022 11:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cweb/controller/HighOrderController.java | 6 +++--- .../java/com/hai/service/impl/HighOrderServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java index 544732bf..6fb4c2a9 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java @@ -259,9 +259,9 @@ public class HighOrderController { childOrder.setGoodsActualPrice(new BigDecimal(childOrder.getGoodsPrice().toString()).divide(childOrder.getGasPriceGun(),10,BigDecimal.ROUND_DOWN).multiply(childOrder.getGasPriceVip()).setScale(2,BigDecimal.ROUND_HALF_UP)); // 团油的价格 - childOrder.setGasPriceGun(priceDetail.getBigDecimal("priceGun")); - childOrder.setGasPriceVip(priceDetail.getBigDecimal("priceVip")); - childOrder.setGoodsPrice(new BigDecimal(childOrder.getGoodsPrice().toString()).divide(childOrder.getGasPriceGun(),10,BigDecimal.ROUND_DOWN).multiply(childOrder.getGasPriceVip()).setScale(2,BigDecimal.ROUND_HALF_UP)); + // childOrder.setGasPriceGun(priceDetail.getBigDecimal("priceGun")); + // childOrder.setGasPriceVip(priceDetail.getBigDecimal("priceVip")); + // childOrder.setGoodsPrice(new BigDecimal(childOrder.getGoodsPrice().toString()).divide(childOrder.getGasPriceGun(),10,BigDecimal.ROUND_DOWN).multiply(childOrder.getGasPriceVip()).setScale(2,BigDecimal.ROUND_HALF_UP)); childOrder.setGoodsSpecName("默认"); childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString()))); diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index 8c5478eb..944dfa53 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java @@ -218,6 +218,7 @@ public class HighOrderServiceImpl implements HighOrderService { highOrder.setPayModel(1); // 支付模式：1 金币，2 第三方平台，3 混合 highOrder.setPayType(3); // 支付方式： 1：支付宝 2：微信 3：金币 highOrder.setPayGold(goldNum); + highOrder.setPayRealPrice(highOrder.getPayPrice()); highOrder.setOrderStatus(2); // 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 for (HighChildOrder highChildOrder : highOrder.getHighChildOrderList()) {