提交代码

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);