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

# Conflicts:
#	src/main/java/com/caimei365/commodity/components/PriceUtilService.java

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

@@ -149,6 +149,11 @@ 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);
@@ -159,8 +164,8 @@ public class PriceUtilService {
             //添加税费
             if (taxFlag) {
                 BigDecimal thisTaxFee = MathUtil.div(MathUtil.mul(price.getPrice(), price.getTaxRate()), 100, 2);
-                BigDecimal originalTaxFee = MathUtil.div(MathUtil.mul(price.getPrice(), price.getTaxRate()), 100, 2);
                 price.setPrice(MathUtil.add(price.getPrice(), thisTaxFee).doubleValue());
+                BigDecimal originalTaxFee = MathUtil.div(MathUtil.mul(price.getOriginalPrice(), price.getTaxRate()), 100, 2);
                 price.setOriginalPrice(MathUtil.add(price.getOriginalPrice(), originalTaxFee).doubleValue());
             }
         } else {