税费bugfix

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -8,6 +8,7 @@ import com.caimei365.order.utils.ImageUtil;
 import com.caimei365.order.utils.MathUtil;
 import com.google.common.util.concurrent.AtomicDouble;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +16,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Description
@@ -67,9 +69,10 @@ public class OrderCommonService {
                 shopOrder.setShopPromotion(shopPromotion);
             }
             List<OrderProductVo> orderProductList = orderCommonMapper.getShopOrderProduct(shopOrder.getShopOrderId());
+            orderProductList.removeIf(Objects::isNull);
             orderProductList.forEach(orderProduct -> {
                 // 不含税可开票商品,单价/折后单价在原基础上加上税费
-                boolean taxFlag = (0 == orderProduct.getIncludedTax() && (1 == orderProduct.getInvoiceType() || 2 == orderProduct.getInvoiceType()));
+                boolean taxFlag = (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && (Integer.valueOf(1).equals(orderProduct.getInvoiceType()) || Integer.valueOf(2).equals(orderProduct.getInvoiceType())));
                 if (taxFlag) {
                     orderProduct.setPrice(MathUtil.add(orderProduct.getPrice(), orderProduct.getAddedValueTax()).doubleValue());
                     orderProduct.setDiscountPrice(MathUtil.add(orderProduct.getPrice(), orderProduct.getAddedValueTax()).doubleValue());
@@ -79,7 +82,7 @@ public class OrderCommonService {
                 if (null != orderProduct.getOrderPromotionsId() && orderProduct.getOrderPromotionsId() > 0) {
                     PromotionsVo promotions = orderCommonMapper.getOrderPromotionsById(orderProduct.getOrderPromotionsId());
                     if (null != promotions) {
-                        if (1 == promotions.getType() && 1 == promotions.getMode()) {
+                        if (Integer.valueOf(1).equals(promotions.getType()) && Integer.valueOf(1).equals(promotions.getMode())) {
                             promotions.setTouchPrice(MathUtil.add(promotions.getTouchPrice(), MathUtil.div(MathUtil.mul(promotions.getTouchPrice(), orderProduct.getTaxRate()), 100)).doubleValue());
                         }
                         orderProduct.setProductPromotion(promotions);

src/main/java/com/caimei365/order/components/ProductService.java

@@ -41,7 +41,7 @@ public class ProductService {
         String image = ImageUtil.getImageUrl("product", cartItemVo.getImage(), domain);
         cartItemVo.setImage(image);
         // 是否添加税费，不含税商品 开票需添加税费
-        boolean taxFlag = (0 == cartItemVo.getIncludedTax() && (1 == cartItemVo.getInvoiceType() || 2 == cartItemVo.getInvoiceType()));
+        boolean taxFlag = (Integer.valueOf(0).equals(cartItemVo.getIncludedTax()) && (Integer.valueOf(1).equals(cartItemVo.getInvoiceType()) || Integer.valueOf(2).equals(cartItemVo.getInvoiceType())));
         if (taxFlag) {
             BigDecimal cartItemTax = MathUtil.div(MathUtil.mul(cartItemVo.getPrice(), cartItemVo.getTaxRate()), 100, 2);
             cartItemVo.setPrice(MathUtil.add(cartItemVo.getPrice(), cartItemTax).doubleValue());

src/main/java/com/caimei365/order/mapper/PayOrderMapper.java

@@ -35,10 +35,10 @@ public interface PayOrderMapper {
     /**
      * 根据用户Id更新余额
      * @param userMoney      用户余额
-     * @param availableMoney 用户可用余额
+     * @param ableUserMoney 用户可用余额
      * @param userId 用户Id
      */
-    void updateMoneyByUserId(double userMoney, Double availableMoney, Integer userId);
+    void updateMoneyByUserId(Double userMoney, Double ableUserMoney, Integer userId);
     /**
      * 支付链接
      * @param orderId 订单Id

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

@@ -161,10 +161,10 @@ public class OrderClubServiceImpl implements OrderClubService {
                 actualCancelNum = null != actualCancelNum ? actualCancelNum : 0;
                 orderProduct.setActualCancelNum(actualCancelNum);
                 //判断商品价格是否含税
-                boolean taxFlag = (1 == orderProduct.getIncludedTax() || (0 == orderProduct.getIncludedTax() && (1 == orderProduct.getInvoiceType() || 2 == orderProduct.getInvoiceType())));
+                boolean taxFlag = (Integer.valueOf(1).equals(orderProduct.getIncludedTax()) || (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && (Integer.valueOf(1).equals(orderProduct.getInvoiceType()) || Integer.valueOf(2).equals(orderProduct.getInvoiceType()))));
                 if (taxFlag) {
                     orderProduct.setIncludedTaxFlag(2);
-                } else if (orderProduct.getIncludedTax() != null && 0 == orderProduct.getIncludedTax() && 3 == orderProduct.getInvoiceType()) {
+                } else if (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && Integer.valueOf(3).equals(orderProduct.getInvoiceType())) {
                     orderProduct.setIncludedTaxFlag(1);
                 } else {
                     orderProduct.setIncludedTaxFlag(3);

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

@@ -450,7 +450,7 @@ public class SubmitServiceImpl implements SubmitService {
                     return ResponseJson.error("订单商品成本异常！", null);
                 }
                 // 是否添加税费，不含税商品 开票需添加税费
-                boolean taxFlag = (0 == product.getIncludedTax() && (1 == product.getInvoiceType() || 2 == product.getInvoiceType()));
+                boolean taxFlag = (Integer.valueOf(0).equals(product.getIncludedTax()) && (Integer.valueOf(1).equals(product.getInvoiceType()) || Integer.valueOf(2).equals(product.getInvoiceType())));
                 Double shopTax = 0d;
                 // 图片路径
                 String image = ImageUtil.getImageUrl("product", product.getImage(), domain);