添加获取报账单号状态

order-management-common/src/main/java/com/dxhy/order/model/page/RedInvoiceRespPo.java

@@ -14,4 +14,5 @@ public class RedInvoiceRespPo {
     private String redFpqqlsh;
     private String redBzdh;
     private String xhfNsrsbh;
+    private String gsdm;
 }

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/GsClientFindMapper.java

@@ -0,0 +1,9 @@
+package com.dxhy.order.invoice.module.invoice.dao;
+
+import com.dxhy.order.invoice.module.invoice.model.GsClient;
+import java.util.List;
+
+public interface GsClientFindMapper { ;
+    List<GsClient> selectByGsdm(String gsdm);
+
+}

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/GsClient.java

@@ -0,0 +1,19 @@
+package com.dxhy.order.invoice.module.invoice.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GsClient {
+    private Integer id;
+
+    private String gsdm;
+
+    private String gsmc;
+
+    private String client;
+
+    private Date createTime;
+
+}

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@@ -25,6 +25,7 @@ import com.dxhy.order.exception.OrderReceiveException;
 import com.dxhy.order.invoice.config.InvoiceConfig;
 import com.dxhy.order.invoice.module.invoice.dao.*;
 import com.dxhy.order.invoice.module.invoice.model.FileDownLoad;
+import com.dxhy.order.invoice.module.invoice.model.GsClient;
 import com.dxhy.order.invoice.module.invoice.model.bo.QueryCountInvoiceBO;
 import com.dxhy.order.invoice.module.invoice.model.excel.*;
 import com.dxhy.order.invoice.module.invoice.model.po.IsInput;
@@ -61,6 +62,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -108,6 +110,9 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
     private OrderInfoJdcMapper orderInfoJdcMapper;
     @Resource
     private OrderInfoEscMapper orderInfoEscMapper;
+
+    @Resource
+    private GsClientFindMapper gsClientFindMapper;
     @Resource
     private HistoryDataPdfService historyDataPdfService;
     @Resource
@@ -1521,6 +1526,22 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
         }
 
         //todo 根据蓝字报账单调用SAP接口查询SAP状态，是否允许冲红 明慧开发
+        //查询公司client
+        List<GsClient> gsClients = gsClientFindMapper.selectByGsdm(orderInvoiceData.getGsdm());
+        if (ObjectUtils.isEmpty(gsClients)){
+            return R.error("未查询到公司client");
+        }
+
+        try {
+            boolean bzhStatus = getBzhStatus(orderInvoiceData.getRedBzdh(), gsClients.get(0).getClient());
+
+            if (bzhStatus) {
+                return R.error("蓝字报账单状态不允许冲红");
+            }
+        }catch (Exception e){
+            log.error("{}获取蓝字报账单状态异常", LOGGER_MSG,e);
+            return R.error("未查询到订单");
+        }
         List<OrderItemInfo> redItemInfoList = orderInvoiceData.getRedItemInfoList();
         if(CollectionUtil.isNotEmpty(redItemInfoList)){
             boolean b = redItemInfoList.stream().allMatch(redItemInfo -> StringUtils.isNotBlank(redItemInfo.getSpbm()) && ConfigureConstant.STRING_0.equals(redItemInfo.getZnfm()));
@@ -1679,6 +1700,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
         }
         redInvoiceRespPo.setRedFpqqlsh(orderInvoiceInfo.getFpqqlsh());
         redInvoiceRespPo.setRedBzdh(orderProcessInfo.getBzdh());
+        redInvoiceRespPo.setGsdm(orderProcessInfo.getGsdm());
         return redInvoiceRespPo;
     }
 
@@ -1759,7 +1781,8 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
         String bzdzt = response.getString("BZDZT");
         //校验状态
         String bzdStatus = baseServiceConfig.getBzdStatus();
-        if (StringUtils.isBlank(bzdh)||bzdStatus.contains(bzdzt)){
+        String[] split = bzdStatus.split(",");
+        if (StringUtils.isNotBlank(bzdh)||Arrays.asList(split).contains(bzdzt)){
             return false;
         }
         return true;

order-management-invoice/src/main/resources/mybatis/mapper/GsClientFindMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.dxhy.order.invoice.module.invoice.dao.GsClientFindMapper" >
+  <resultMap id="BaseResultMap" type="com.dxhy.order.invoice.module.invoice.model.GsClient" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="gsdm" property="gsdm" jdbcType="VARCHAR" />
+    <result column="gsmc" property="gsmc" jdbcType="VARCHAR" />
+    <result column="client" property="client" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, gsdm, gsmc, client, create_time
+  </sql>
+
+  <select id="selectByGsdm" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from gs_client
+    where gsdm = #{gsdm,jdbcType=VARCHAR}
+  </select>
+
+</mapper>