Merge remote-tracking branch 'origin/task_4631_wq' into test

order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml

@@ -1159,7 +1159,7 @@
         </where>
     </select>
     <select id="queryBuyerInfoByGhfIdAndEntId"
-            resultType="com.dxhy.order.baseservice.module.buyer.model.BuyerEntity">
+            resultMap="BaseResultMap">
 
         select * from buyer_manage_info where buyer_code=#{ghfId} and ent_id=#{entId} order by modify_time desc limit 1
 

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

@@ -167,8 +167,9 @@ public class InvoiceServiceImpl implements InvoiceService {
             if (buyerEntity == null) {
                 return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!");
             }
-
+            log.info("开始校验客户信息完整，1");
             if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) {
+                log.info("开始校验客户信息完整，2");
                 if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh())) {
                     return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方纳税人识别号为空,请补全!");
                 }