bugfix

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

@@ -1192,21 +1192,28 @@ public class PayOrderServiceImpl implements PayOrderService {
                     splitAccount.setType(4);
                     splitAccount.setSubUserNo(commercialCode);
                 } else {
-                    if (1 == orderProduct.getInvoiceType()) {
-                        // 开增值税发票，则分账到公账-专票
-                        splitAccount.setType(1);
-                        splitAccount.setSubUserNo(PayUtil.publicAccountNo);
-                    } else if (2 == orderProduct.getInvoiceType()) {
-                        // 开普通发票，则分账到公账-普票
-                        splitAccount.setType(3);
-                        splitAccount.setSubUserNo(PayUtil.commonInvoiceNo);
+                    //含税或者不含税看票
+                    if (0 == orderProduct.getIncludedTax() || 1 == orderProduct.getIncludedTax()) {
+                        if (1 == orderProduct.getInvoiceType()) {
+                            // 开增值税发票，则分账到公账-专票
+                            splitAccount.setType(1);
+                            splitAccount.setSubUserNo(PayUtil.publicAccountNo);
+                        } else if (2 == orderProduct.getInvoiceType()) {
+                            // 开普通发票，则分账到公账-普票
+                            splitAccount.setType(3);
+                            splitAccount.setSubUserNo(PayUtil.commonInvoiceNo);
+                        } else {
+                            // 不能开票，则分账到私账-无票
+                            splitAccount.setType(2);
+                            splitAccount.setSubUserNo(PayUtil.privateAccountNo);
+                        }
                     } else {
-                        // 不能开票，则分账到私账-无票
+                        //未知或者其他直接私账
                         splitAccount.setType(2);
                         splitAccount.setSubUserNo(PayUtil.privateAccountNo);
                     }
                 }
-                log.info("成本分账参数------------->"+splitAccount);
+                log.info("成本分账参数------------->" + splitAccount);
                 list.add(splitAccount);
             }
             if (MathUtil.compare(splitAmount, 0) == 0) {
@@ -1256,7 +1263,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             splitAccount.setProductType(3);
             splitAccount.setType(5);
             splitAccount.setSubUserNo(PayUtil.brokerage);
-            log.info("佣金分账参数------------->"+splitAccount);
+            log.info("佣金分账参数------------->" + splitAccount);
             list.add(splitAccount);
         }
         return list;