Merge branches 'developer' and 'developerB' of git.caimei365.com:chao/caimei-modules-soa into developerB

pay/src/main/java/com/caimei/module/pay/service/impl/PayServiceImpl.java

@@ -96,7 +96,7 @@ public class PayServiceImpl implements PayService {
         //商品数据
         List<OrderProductVo> orderProductList = payDao.fandAllOrderProduct(orderId);
         orderProductList.forEach(o -> {
-            if ("2".equals(o.getIncludedTax())) {
+            if (StringUtils.isBlank(o.getIncludedTax()) || "2".equals(o.getIncludedTax())) {
                 order.setInvoiceStatus(true);
             }
         });