From bfebb38b19f06d3791e511603889e4a6a1640085 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Mon, 8 Aug 2022 16:38:03 +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 --- .../java/com/cweb/controller/HighOrderController.java | 10 ---------- 1 file changed, 10 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 94a715dd..dbeb6f45 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java @@ -434,16 +434,9 @@ public class HighOrderController { // 积分抵扣金额 BigDecimal integralDeductionPrice = new BigDecimal(0); if (buyPoints && highOrder.getPayGold() != null) { - -<<<<<<< HEAD integralDeductionPrice = new BigDecimal(highOrder.getPayGold()).divide(new BigDecimal(100)); String remark = "订单" + highOrder.getOrderNo() + "购买，使用积分：" + highOrder.getPayGold(); highUserService.goldHandle(userInfoModel.getHighUser().getId(), highOrder.getPayGold(), 2, 2, highOrder.getId() , remark); -======= - integralDeductionPrice = new BigDecimal(highOrder.getPayGold().toString()).divide(new BigDecimal(100)); - highUserService.goldHandle(userInfoModel.getHighUser().getId(), highOrder.getPayGold(), 2, 2, highOrder.getId()); ->>>>>>> 848fcba6384da50fdbd18a8fcc2e19ac7c72a25a - BigDecimal payGold = new BigDecimal(highOrder.getPayGold()); if (payGold.compareTo(totalActualPrice.subtract(integralDeductionPrice)) < 0) { @@ -452,7 +445,6 @@ public class HighOrderController { } } -<<<<<<< HEAD SecRegion region = commonService.getParentByRegion(Long.valueOf(request.getHeader("regionId"))); BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString()); @@ -460,8 +452,6 @@ public class HighOrderController { highOrder.setCompanyId(bsCompany.getId()); } -======= ->>>>>>> 848fcba6384da50fdbd18a8fcc2e19ac7c72a25a highOrder.setMerchId(request.getHeader("mchId")); highOrder.setTotalPrice(totalPrice); highOrder.setPayablePrice(totalActualPrice);