Merge remote-tracking branch 'origin/developer' into developerA

src/main/java/com/caimei365/commodity/components/PriceUtilService.java

@@ -123,11 +123,6 @@ public class PriceUtilService {
                 }
                 if (promotions.getType() == 1 && promotions.getMode() == 1 && null != promotions.getTouchPrice()) {
                     price.setPrice(promotions.getTouchPrice());
-                    //添加税费
-                    if (taxFlag) {
-                        BigDecimal taxFee = MathUtil.div(MathUtil.mul(promotions.getTouchPrice(), price.getTaxRate()), 100, 2);
-                        promotions.setTouchPrice(MathUtil.add(promotions.getTouchPrice(),taxFee).doubleValue());
-                    }
                 }
                 price.setPromotions(promotions);
             } else {
@@ -149,11 +144,6 @@ public class PriceUtilService {
                         // 复购价
                         Double repurchase = priceMapper.getRepurchasePrice(price.getProductId(), userId);
                         if (null != repurchase && repurchase > 0) {
-                            //添加税费
-                            if (taxFlag) {
-                                BigDecimal repurchaseTaxFee = MathUtil.div(MathUtil.mul(repurchase, price.getTaxRate()), 100, 2);
-                                repurchase = MathUtil.add(repurchase, repurchaseTaxFee).doubleValue();
-                            }
                             price.setPrice(repurchase);
                             price.setRepurchaseFlag(1);
                             price.setLadderPriceFlag(0);