Merge branch 'master' of wangchaoqun/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/controller/order/OrderController.java

@@ -618,7 +618,7 @@ public class OrderController {
                 // 计算算税金额 实际支付价 + 积分抵扣金额
                 BigDecimal price = orderGoodsEntity.getDeductionPrice().add(orderGoodsEntity.getActualPaymentAmount());
                 BigDecimal goodsTax = CalculateTax.calculateFinalTax(goodsEntity,price,goodsService).setScale(3,RoundingMode.HALF_UP);
-                goodsTax = goodsTax.multiply(new BigDecimal(orderGoodsEntity.getNumber())).setScale(2,RoundingMode.HALF_UP);
+                // goodsTax = goodsTax.multiply(new BigDecimal(orderGoodsEntity.getNumber())).setScale(2,RoundingMode.HALF_UP);
                 orderGoodsEntity.setTax(goodsTax);
                 tax = tax.add(goodsTax).setScale(2,RoundingMode.HALF_UP);
 //                BigDecimal goodsTax = orderGoodsEntity.getMarketPrice().divide(new BigDecimal(1).add(orderGoodsEntity.getGoodsRate()),2,RoundingMode.HALF_DOWN).multiply(orderGoodsEntity.getGoodsRate())
@@ -676,7 +676,7 @@ public class OrderController {
             // 计算算税金额 实际支付价 + 积分抵扣金额
             BigDecimal price = orderGoodsEntity.getDeductionPrice().add(orderGoodsEntity.getActualPaymentAmount());
             BigDecimal goodsTax = CalculateTax.calculateFinalTax(goodsEntity,price,goodsService).setScale(3,RoundingMode.HALF_UP);
-            goodsTax = goodsTax.multiply(new BigDecimal(orderGoodsEntity.getNumber())).setScale(2,RoundingMode.HALF_UP);
+            // goodsTax = goodsTax.multiply(new BigDecimal(orderGoodsEntity.getNumber())).setScale(2,RoundingMode.HALF_UP);
             orderGoodsEntity.setTax(goodsTax);
             tax = tax.add(goodsTax).setScale(2,RoundingMode.HALF_UP);
             // 计算其他优惠 = 总优惠减去积分抵扣优惠

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -565,7 +565,7 @@ public class OrderServiceImpl implements OrderService {
             // 计算算税金额 实际支付价 + 积分抵扣金额
             BigDecimal price = orderGoods.getDeductionPrice().add(orderGoods.getActualPaymentAmount());
             BigDecimal goodsTax = CalculateTax.calculateFinalTax(goodsEntity, price, goodsService).setScale(3, RoundingMode.HALF_UP);
-            goodsTax = goodsTax.multiply(new BigDecimal(orderGoods.getNumber())).setScale(2, RoundingMode.HALF_UP);
+            //goodsTax = goodsTax.multiply(new BigDecimal(orderGoods.getNumber())).setScale(2, RoundingMode.HALF_UP);
             taxTotal = taxTotal.add(goodsTax).setScale(2, RoundingMode.HALF_UP);
 
             Goods goods = new Goods(orderGoods.getGoodsName(),
@@ -5503,7 +5503,9 @@ public class OrderServiceImpl implements OrderService {
         /*GoodsEntity goodsEntity = goodsService.queryObject(goodsDto.getId().intValue());
         BigDecimal goodsTax = CalculateTax.calculateFinalTax(goodsEntity, goodsDto.getStoreRetailPrice(), goodsService).setScale(3, RoundingMode.HALF_UP);
         goodsTax = goodsTax.multiply(number).setScale(2, RoundingMode.HALF_UP);*/
-        orderGoodsVo.setTaxPrice(goodsDto.getGoodsTaxes().divide(BigDecimal.valueOf(goodsDto.getSellVolume()), 3, BigDecimal.ROUND_HALF_UP));
+        // wcq注解： 原先在数据入库的时候  预估税费除以了数量  现在不除以数量了
+        // 注释代码：.divide(BigDecimal.valueOf(goodsDto.getSellVolume()), 3, BigDecimal.ROUND_HALF_UP)
+        orderGoodsVo.setTaxPrice(goodsDto.getGoodsTaxes());
 
         return orderGoodsVo;
     }