Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java

@@ -244,6 +244,9 @@ public class OderDetailInfo {
      */
     private String xtly;
 
-
+    /**
+     * 开票是否校验银行账号信息 0否 1是
+     */
+    private String checkBankFlag;
 
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.dxhy.base.utils.PriceTaxSeparationUtilNew;
 import com.dxhy.common.generatepdf.util.EwmUtil;
 import com.dxhy.order.baseservice.config.BaseServiceConfig;
 import com.dxhy.order.baseservice.module.base.service.BaseService;
+import com.dxhy.order.baseservice.module.buyer.dao.BuyerMapper;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity;
 import com.dxhy.order.baseservice.module.buyer.service.BuyerService;
 import com.dxhy.order.baseservice.module.commodity.dao.CommodityMapper;
@@ -62,6 +63,7 @@ import com.dxhy.order.model.qdsk.taxpayerinfo.Qdjcxx;
 import com.dxhy.order.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -182,6 +184,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
     DecimalFormat format = new DecimalFormat("#.###");
 
+    @Autowired
+    private BuyerMapper buyerMapper;
+
     @Override
     public PageUtils selectOrderInfo(Map<String, Object> map, List<String> shList, List<String> entList) {
         return orderProcessService.selectOrderInfo(map, shList, entList);
@@ -260,6 +265,13 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
         oderDetailInfo = this.convertOderDetailInfo(orderProcessInfo, orderItemList, orderInfo, pageOrderExts, orderInvoiceInfo);
 
+        BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(orderInfo.getGhfId(), orderInfo.getEntId());
+        if (buyerEntity == null) {
+            log.error("{}查询原始订单客户信息为空，id为：{}", LOGGER_MSG, orderProcessInfo.getOrderInfoId());
+            return null;
+        }
+
+        oderDetailInfo.setCheckBankFlag(buyerEntity.getCheckBankFlag());
 
         /**
          * 如果是机动车,返回机动车信息

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -2100,6 +2100,10 @@ public class BeanTransitionUtils {
         if (StringUtils.isBlank(commonOrderInfo.getOrderInfo().getGhfQylx())) {
             commonOrderInfo.getOrderInfo().setGhfQylx(buyerEntity.getGhfQylx());
         }
+        // task4575 购方税号为空设置为个人发票
+        if (StringUtils.isBlank(buyerEntity.getTaxpayerCode())) {
+            commonOrderInfo.getOrderInfo().setGhfQylx(OrderInfoEnum.GHF_QYLX_03.getKey());
+        }
 
         /**
          * 如果购方税号为空,补全税号