协销购物车再来一单的商品前端默认勾选

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

@@ -253,8 +253,8 @@ public class PayOrderServiceImpl implements PayOrderService {
         // 是否有商品发票属性的限制
         orderProductList.forEach(orderProduct -> {
             // 商品含税未知 or 订单选择开企业发票,商品不含税不能开票
-            boolean productTaxFlag = (null == orderProduct.getIncludedTax()) || (null == orderProduct.getInvoiceType()) || (2 == orderProduct.getIncludedTax())
-                                     || (2 == order.getInvoiceFlag() && (0 == orderProduct.getIncludedTax() && 3 == orderProduct.getInvoiceType()));
+            boolean productTaxFlag = (null == orderProduct.getIncludedTax()) || (null == orderProduct.getInvoiceType()) || (Integer.valueOf(2).equals(orderProduct.getIncludedTax()))
+                                     || (Integer.valueOf(2).equals(order.getInvoiceFlag()) && (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && Integer.valueOf(3).equals(orderProduct.getInvoiceType())));
             if (productTaxFlag) {
                 order.setInvoiceStatus(true);
             }
@@ -1003,7 +1003,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         for (OrderProductVo orderProduct : orderProductList) {
             double costPrice = MathUtil.mul(orderProduct.getCostPrice(), orderProduct.getNum()).doubleValue();
             // 不含税能开发票
-            if (0 == orderProduct.getIncludedTax() && 3 != orderProduct.getInvoiceType()) {
+            if (Integer.valueOf(0).equals(orderProduct.getIncludedTax()) && !Integer.valueOf(3).equals(orderProduct.getInvoiceType())) {
                 //应付总税费
                 Double payableTax = MathUtil.mul(orderProduct.getSingleShouldPayTotalTax(), orderProduct.getNum()).doubleValue();
                 costPrice = MathUtil.add(costPrice, payableTax).doubleValue();

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

@@ -532,7 +532,7 @@ public class SubmitServiceImpl implements SubmitService {
                     if (taxFlag) {
                         productTax = MathUtil.div(MathUtil.mul(productPrice, product.getTaxRate()), 100, 2).doubleValue();
                         discountTax = MathUtil.div(MathUtil.mul(discountPrice, product.getTaxRate()), 100, 2).doubleValue();
-                    } else if (1 != product.getIncludedTax()) {
+                    } else if (!Integer.valueOf(1).equals(product.getIncludedTax())) {
                         // 不含税不可开票商品和未知商品，税率置为0
                         product.setTaxRate(0d);
                     }
@@ -615,7 +615,7 @@ public class SubmitServiceImpl implements SubmitService {
                 }
                 if (taxFlag) {
                     shopTax = MathUtil.div(MathUtil.mul(costPrice, product.getTaxRate()), 100, 2).doubleValue();
-                } else if (1 != product.getIncludedTax()) {
+                } else if (!Integer.valueOf(1).equals(product.getIncludedTax())) {
                     // 不含税不可开票商品和未知商品，税率置为0
                     product.setShopTaxRate(0d);
                 }