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

# Conflicts:
#	src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java
#	src/main/java/com/caimei365/order/service/impl/CartSellerServiceImpl.java

src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -485,7 +485,7 @@ public class CartClubServiceImpl implements CartClubService {
                         Double repurchase = baseMapper.getRepurchasePrice(cartItemVo.getProductId(), userId);
                         if (null != repurchase && repurchase > 0) {
                             if (taxFlag) {
-                                BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(cartItemVo.getPrice(), cartItemVo.getTaxRate()), 100, 2);
+                                BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(repurchase, cartItemVo.getTaxRate()), 100, 2);
                                 cartItemVo.setPrice(MathUtil.add(repurchase, cartItemTax).doubleValue());
                             } else {
                                 cartItemVo.setPrice(repurchase);
@@ -758,7 +758,7 @@ public class CartClubServiceImpl implements CartClubService {
                                         Double repurchase = baseMapper.getRepurchasePrice(cartItemVo.getProductId(), userId);
                                         if (null != repurchase && repurchase > 0) {
                                             if (taxFlag) {
-                                                BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(cartItemVo.getPrice(), cartItemVo.getTaxRate()), 100, 2);
+                                                BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(repurchase, cartItemVo.getTaxRate()), 100, 2);
                                                 cartItemVo.setPrice(MathUtil.add(repurchase, cartItemTax).doubleValue());
                                             } else {
                                                 cartItemVo.setPrice(repurchase);
@@ -1009,7 +1009,7 @@ public class CartClubServiceImpl implements CartClubService {
                 Double repurchase = baseMapper.getRepurchasePrice(cartItemVo.getProductId(), cartDto.getUserId());
                 if (null != repurchase && repurchase > 0) {
                     if (taxFlag) {
-                        BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(cartItemVo.getPrice(), cartItemVo.getTaxRate()), 100, 2);
+                        BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(repurchase, cartItemVo.getTaxRate()), 100, 2);
                         cartItemVo.setPrice(MathUtil.add(repurchase, cartItemTax).doubleValue());
                     } else {
                         cartItemVo.setPrice(repurchase);

src/main/java/com/caimei365/order/service/impl/CartSellerServiceImpl.java

@@ -161,7 +161,7 @@ public class CartSellerServiceImpl implements CartSellerService {
                                 Double repurchase = baseMapper.getRepurchasePrice(cartItemVo.getProductId(), clubUserId);
                                 if (null != repurchase && repurchase > 0) {
                                     if (taxFlag) {
-                                        BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(cartItemVo.getPrice(), cartItemVo.getTaxRate()), 100, 2);
+                                        BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(repurchase, cartItemVo.getTaxRate()), 100, 2);
                                         cartItemVo.setPrice(MathUtil.add(repurchase, cartItemTax).doubleValue());
                                     } else {
                                         cartItemVo.setPrice(repurchase);
@@ -477,7 +477,7 @@ public class CartSellerServiceImpl implements CartSellerService {
                                     Double repurchase = baseMapper.getRepurchasePrice(cartItemVo.getProductId(), clubUserId);
                                     if (null != repurchase && repurchase > 0) {
                                         if (taxFlag) {
-                                            BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(cartItemVo.getPrice(), cartItemVo.getTaxRate()), 100, 2);
+                                            BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(repurchase, cartItemVo.getTaxRate()), 100, 2);
                                             cartItemVo.setPrice(MathUtil.add(repurchase, cartItemTax).doubleValue());
                                         } else {
                                             cartItemVo.setPrice(repurchase);