diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/GroupTaxClassCodeMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/GroupTaxClassCodeMapper.java
index 9e5e0896..f24d9505 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/GroupTaxClassCodeMapper.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/GroupTaxClassCodeMapper.java
@@ -13,7 +13,7 @@ import java.util.Map;
  * @Date:2019/9/17
  */
 public interface GroupTaxClassCodeMapper {
-    
+
     /**
      * 插入
      *
@@ -21,7 +21,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     int insert(GroupTaxClassCodeEntity record);
-    
+
     /**
      * 根据id查询
      *
@@ -29,7 +29,15 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     GroupTaxClassCodeEntity selectGroupTaxClassCode(String id);
-    
+
+    /**
+     * 根据税号和商品名称查询商品
+     *
+     * @param id
+     * @return
+     */
+    GroupTaxClassCodeEntity selectGroupTaxClassCodeByNsrsbhAndCode(@Param("xhf_nsrsbh") String nsrsbh,@Param("encoding") String encoding);
+
     /**
      * 更新
      *
@@ -37,7 +45,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     int updateByPrimaryKeySelective(GroupTaxClassCodeEntity record);
-    
+
     /**
      * 更新
      *
@@ -45,7 +53,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     int updateByPrimaryKey(GroupTaxClassCodeEntity record);
-    
+
     /**
      * 集团税编库列表
      *
@@ -53,7 +61,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     List<Map<String, Object>> queryGroupTaxClassCode(Map<String, Object> map);
-    
+
     /**
      * 集团税编批量共享数据
      *
@@ -61,7 +69,7 @@ public interface GroupTaxClassCodeMapper {
      * @param shareStatus
      */
     void updateTaxClassCodeShareStatus(@Param(value = "taxClassCodeIdArray") String[] taxClassCodeIdArray, @Param(value = "shareStatus") String shareStatus);
-    
+
     /**
      * 集团税编批量设置数据为启用
      *
@@ -69,7 +77,7 @@ public interface GroupTaxClassCodeMapper {
      * @param dataStatus
      */
     void updateTaxClassCodeDataStatus(@Param(value = "taxClassCodeIdArray") String[] taxClassCodeIdArray, @Param(value = "dataStatus") String dataStatus);
-    
+
     /**
      * 查询
      *
@@ -77,7 +85,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     Map<String, String> selectGroupTaxClassCodeById(@Param(value = "groupTaxClassCodeId") String groupTaxClassCodeId);
-    
+
     /**
      * 查询
      *
@@ -85,7 +93,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     List<GroupTaxClassCodeEntity> queryTaxClassCodeBySpbmAndSpmc(Map<String, String> paramMap);
-    
+
     /**
      * 查询
      *
@@ -93,7 +101,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     List<GroupTaxClassCodeEntity> queryTaxClassCodeBySpbmOrSpmc(Map<String, String> paramMap);
-    
+
     /**
      * 集团商品名称校验
      *
@@ -101,7 +109,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     int selectByName(Map<String, String> map);
-    
+
     /**
      * 集团商品code校验
      *
@@ -109,7 +117,7 @@ public interface GroupTaxClassCodeMapper {
      * @return
      */
     int selectByCode(Map<String, String> map);
-    
+
     /**
      * 更新
      *
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java
index 10781fb3..76b4eaf9 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java
@@ -1,6 +1,7 @@
 package com.dxhy.order.baseservice.module.taxclass.dao;
 
 import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -19,9 +20,12 @@ public interface TaxClassCodeMapper {
      * @return
      */
     List<TaxClassCodeEntity> selectTaxClassCode(Map<String, Object> map);
-    
+
+
+    List<TaxClassCodeEntity> selectTaxClassCodeBySpmcOrSm(String queryString);
+
     // warning 以下sql添加redis缓存 修改请注意
-    
+
     /**
      * 判断税收分类编码是否存在
      *
@@ -29,8 +33,17 @@ public interface TaxClassCodeMapper {
      * @return
      */
     TaxClassCodeEntity queryTaxClassCodeEntityBySpbm(String spbm);
-    
-    
+
+
+    /**
+     * 根据商品名称和描述查找商品分类编码
+     *
+     * @param spmc
+     * @return
+     */
+    TaxClassCodeEntity queryTaxClassCodeEntityBySpmcOrMs(String spmc);
+
+
     /**
      * 查询所有税编表数据
      *
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java
index 6d373205..a82de040 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java
@@ -19,7 +19,7 @@ public interface TaxClassCodeService {
      * @return
      */
     PageUtils queryTaxClassCode(Map<String, Object> map);
-    
+
     /**
      * 根据商品编码取缓存数据
      *
@@ -27,14 +27,23 @@ public interface TaxClassCodeService {
      * @return
      */
     TaxClassCodeEntity queryTaxClassCodeFromCache(String spbm);
-    
+
+    /**
+     * 根据商品名称和描述查找商品分类编码
+     *
+     * @param spmc
+     * @param ms
+     * @return
+     */
+    TaxClassCodeEntity queryTaxClassCodeFromCacheBySpmcOrMs(String spmc);
+
     /**
      * 缓存商品编码数据
      *
      * @return
      */
     boolean cacheTaxClassCode();
-    
+
     /**
      * 清除缓存
      *
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java
index e1adf926..e35a9902 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java
@@ -28,15 +28,15 @@ import java.util.Map;
 @Slf4j
 @Service
 public class TaxClassCodeServiceImpl implements TaxClassCodeService {
-    
+
     private static final Map<String, TaxClassCodeEntity> CACHE_MAP = new HashMap<>();
-    
+
     @Resource
     private TaxClassCodeMapper taxClassCodeMapper;
-    
+
     @Override
     public PageUtils queryTaxClassCode(Map<String, Object> paramMap) {
-        
+
         int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
         int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));
         PageHelper.startPage(currPage, pageSize);
@@ -51,9 +51,9 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService {
         }
         PageInfo<TaxClassCodeEntity> pageInfo = new PageInfo<>(taxClassList);
         return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
-        
+
     }
-    
+
     @Override
     public TaxClassCodeEntity queryTaxClassCodeFromCache(String spbm) {
         if (StringUtils.isBlank(spbm)) {
@@ -69,10 +69,22 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService {
             taxClassCodeEntity = taxClassCodeMapper.queryTaxClassCodeEntityBySpbm(spbm);
             CACHE_MAP.put(spbm, taxClassCodeEntity);
         }
-        
+
         return taxClassCodeEntity;
     }
-    
+
+    @Override
+    public TaxClassCodeEntity queryTaxClassCodeFromCacheBySpmcOrMs(String spmc) {
+        if (StringUtils.isBlank(spmc)) {
+            return null;
+        }
+        if (StringUtils.isBlank(spmc)) {
+            return null;
+        }
+
+        return taxClassCodeMapper.queryTaxClassCodeEntityBySpmcOrMs(spmc);
+    }
+
     @Override
     public boolean cacheTaxClassCode() {
         long t1 = System.currentTimeMillis();
@@ -85,7 +97,7 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService {
         }
         return true;
     }
-    
+
     @Override
     public boolean cleanCacheTaxClassCode() {
         CACHE_MAP.clear();
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupTaxClassCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupTaxClassCodeMapper.xml
index ffa0d6ef..52e60d5b 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupTaxClassCodeMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupTaxClassCodeMapper.xml
@@ -27,7 +27,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         id
-                , sort_id, xhf_nsrsbh, merchandise_name, encoding, tax_items, brief_code, specification_model,
+        , sort_id, xhf_nsrsbh, merchandise_name, encoding, tax_items, brief_code, specification_model,
     metering_unit, unit_price, tax_class_code, tax_classification_name, create_time,
     dept_id, data_source, matching_state, data_state, share_state, group_id,tax_class_abbreviation,difference_flag,description
     </sql>
@@ -37,6 +37,18 @@
         from group_tax_class_code
         where id = #{id,jdbcType=VARCHAR}
     </select>
+
+    <select id="selectGroupTaxClassCodeByNsrsbhAndCode" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select
+        <include refid="Base_Column_List"/>
+        from group_tax_class_code
+        <where>
+            <if test="xhf_nsrsbh != null and xhf_nsrsbh != ''"> and xhf_nsrsbh = #{xhf_nsrsbh,jdbcType=VARCHAR} </if>
+            <if test="encoding != null and encoding != ''"> and encoding = #{encoding,jdbcType=VARCHAR} </if>
+        </where>
+        limit 1
+    </select>
+
     <!--  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">-->
     <!--    delete from group_tax_class_code-->
     <!--    where id = #{id,jdbcType=VARCHAR}-->
@@ -392,7 +404,7 @@
         SELECT gc.group_name,
                gctc.*
         FROM group_tax_class_code gctc
-                     LEFT JOIN group_commodity gc ON gctc.group_id = gc.id
+                 LEFT JOIN group_commodity gc ON gctc.group_id = gc.id
         where gctc.id = #{groupTaxClassCodeId,jdbcType=VARCHAR}
     </select>
     <!--条件查询税编信息   data_state为2是已经删除的-->
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
index d58fa87e..cbf2ae81 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
@@ -101,6 +101,13 @@
         </where>
     </select>
 
+    <select id="selectTaxClassCodeBySpmcOrSm"
+            resultType="com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity">
+
+        SELECT * FROM tax_class_code
+            where spmc like concat('%',#{queryString},'%') or sm like concat('%',#{queryString},'%')
+    </select>
+
     <select id="queryTaxClassCodeEntityBySpbm" parameterType="String"
             resultType="com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity">
         <bind name="dataType" value="${dataType}"/>
@@ -112,6 +119,20 @@
         and tcc.kyzt = 'Y'
         AND TCC.hzx = 'N'
     </select>
+
+    <select id="queryTaxClassCodeEntityBySpmcOrMs" parameterType="String"
+            resultType="com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity">
+        <bind name="dataType" value="${dataType}"/>
+        SELECT
+        tcc.*
+        FROM tax_class_code tcc
+        WHERE
+        tcc.spmc like concat('%',#{spmc,jdbcType=VARCHAR},'%')
+          or tcc.spmc like concat('%',#{sm,jdbcType=VARCHAR},'%')
+        and tcc.kyzt = 'Y'
+        AND tcc.hzx = 'N'
+    </select>
+
     <select id="queryAllTaxClassCode" resultMap="BaseResultMap">
         SELECT id,
                spbm,
diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/ConfigurerInfo.java b/order-management-common/src/main/java/com/dxhy/order/constant/ConfigurerInfo.java
index 55a7c5fa..178816fc 100644
--- a/order-management-common/src/main/java/com/dxhy/order/constant/ConfigurerInfo.java
+++ b/order-management-common/src/main/java/com/dxhy/order/constant/ConfigurerInfo.java
@@ -237,6 +237,11 @@ public class ConfigurerInfo {
      * 山能MDM客商购买方信息同步接口
      */
     public static final String SDENERGY_MDM_KS_SYNCBUYERINFO = "SdEnergyMdmKsSyncBuyerInfo";
+
+    /**
+     * 山能MDM物料信息同步接口
+     */
+    public static final String SDENERGY_MDM_KS_SYNC_GROUP_TAX_CODE = "SdEnergyMdmKsSyncGroupTaxCode";
     
     /**
      * 税控设备信息同步接口
diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java
index 0737e992..46e780a5 100644
--- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java
+++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java
@@ -2742,6 +2742,15 @@ public enum OrderInfoContentEnum {
     QUERYINVALIDINVOICE_ZFZT_009999("009999", "发票作废失败"),
     QUERYINVALIDINVOICE_ZFZT_001000("001000", "发票作废中"),
     QUERYINVALIDINVOICE_ZFZT_002000("002000", "发票未作废"),
+
+    /**
+     * 同步税收分类编码(InterfaceServiceImplV3 syncGroupTax)
+     */
+    SYNC_GROUP_TAX_000000("000000", "请求成功"),
+    SYNC_GROUP_TAX_009999("009999", "纳税人识别号和商品名称不能为空"),
+    SYNC_GROUP_TAX_009998("009998", "请求税号与企业维护secretId不一致"),
+    SYNC_GROUP_TAX_009997("009997", "无法匹配到税收分类编码，请手动维护"),
+    SYNC_GROUP_TAX_009996("009996", "系统未知异常"),
     ;
     
     /**
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
index 8f2df6f2..378f727b 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
@@ -1,13 +1,16 @@
 package com.dxhy.order.consumer.openapi.api;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxcxReqBO;
 import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxcxRspBO;
 import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxtbReqBO;
 import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxtbRspBO;
-import com.dxhy.order.baseservice.module.buyer.protocol.sdenergy.MdmGmfxxtbMulticodeValuelistBO;
-import com.dxhy.order.baseservice.module.buyer.protocol.sdenergy.MdmGmfxxtbReqBO;
+import com.dxhy.order.constant.OrderInfoContentEnum;
+import com.dxhy.order.consumer.openapi.protocol.v4.grouptax.GroupTaxReqBO;
+import com.dxhy.order.consumer.openapi.protocol.v4.grouptax.GroupTaxRespBO;
+import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.*;
 import com.dxhy.order.baseservice.module.commodity.model.protocol.SpxxcxReqBO;
 import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.constant.ConfigurerInfo;
@@ -50,6 +53,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static org.joda.time.DateTime.now;
 
@@ -316,6 +321,44 @@ public class InvoiceRestApiV6 {
             List<GmfxxtbRspBO> gmfxxtbRspList = interfaceServiceV3.syncBuyerMessage(gmfxxtbReqList, secretId);
             returnJsonString = JsonUtils.getInstance().toJsonStringNullToEmpty(gmfxxtbRspList);
 
+        } else if (ConfigurerInfo.SDENERGY_MDM_KS_SYNC_GROUP_TAX_CODE.equals(interfaceName)) {
+            // 同步物料信息
+            SDEnergyMdmBaseBO baseBO = JSONObject.parseObject(reqStr, SDEnergyMdmBaseBO.class);
+            List<MdmSyncGroupTaxCodeReqBO> list = new ArrayList<>();
+            GroupTaxRespBO respBO = GroupTaxRespBO.build(OrderInfoContentEnum.SYNC_GROUP_TAX_009996);
+            try {
+                // 逐级判断是否为空，直到取到DATAINFO
+                list = (List<MdmSyncGroupTaxCodeReqBO>) Optional.of(baseBO)
+                        .map(SDEnergyMdmBaseBO::getESB)
+                        .map(ESBBO::getDATA)
+                        .map(DATABO::getDATAINFOS)
+                        .map(DATAINFOSBO::getDATAINFO)
+                        .map(i -> {
+                            // 转成List<MdmSyncGroupTaxCodeReqBO>
+                            return i.stream().map(j -> {
+                                return JSONObject.parseObject(JSONObject.toJSONString(j), MdmSyncGroupTaxCodeReqBO.class);
+                            }).collect(Collectors.toList());
+                        })
+                        .orElse(new ArrayList<MdmSyncGroupTaxCodeReqBO>());
+
+                // 进行同步
+                List<GroupTaxReqBO> reqBOList = list.stream().map(i -> {
+                    GroupTaxReqBO temp = new GroupTaxReqBO();
+                    temp.setSpmc(i.getDESC1());
+                    temp.setMs(i.getDESCSHORT());
+                    temp.setUnit(i.getDESC5());
+                    temp.setEncoding(i.getCODE());
+                    return temp;
+                }).collect(Collectors.toList());
+
+                respBO = interfaceServiceV3.syncGroupTax(reqBOList, secretId);
+
+            } catch (Exception e) {
+                log.error("{}解析列表失败，原始string:{}，错误原因{},错误堆栈:{}", LOGGER_MSG, reqStr, e.getMessage(), e.getStackTrace());
+            }
+
+            returnJsonString = JsonUtils.getInstance().toJsonStringNullToEmpty(respBO);
+
         } else {
             returnJsonString = "";
         }
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/grouptax/GroupTaxReqBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/grouptax/GroupTaxReqBO.java
new file mode 100644
index 00000000..3bbf171a
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/grouptax/GroupTaxReqBO.java
@@ -0,0 +1,28 @@
+package com.dxhy.order.consumer.openapi.protocol.v4.grouptax;
+
+import com.dxhy.order.baseservice.module.taxclass.model.GroupTaxClassCodeEntity;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author 巩权林
+ * @Date 2023/2/10 08:30
+ **/
+@Data
+public class GroupTaxReqBO {
+
+    // 纳税人识别号
+    private String nsrsbh;
+
+    // 山能MDM物料接口的物料名称的值
+    private String spmc;
+
+    // 山能MDM中描述
+    private String ms;
+
+    // 山能MDM中的单位
+    private String unit;
+
+    // 山能MDM中 CODE主编码的值
+    private String encoding;
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/grouptax/GroupTaxRespBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/grouptax/GroupTaxRespBO.java
new file mode 100644
index 00000000..32a5b09f
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/grouptax/GroupTaxRespBO.java
@@ -0,0 +1,31 @@
+package com.dxhy.order.consumer.openapi.protocol.v4.grouptax;
+
+import com.dxhy.order.constant.OrderInfoContentEnum;
+import com.dxhy.order.consumer.openapi.protocol.v4.ResponseV4BO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author 巩权林
+ * @Date 2023/2/10 08:30
+ **/
+@Data
+public class GroupTaxRespBO extends ResponseV4BO implements Serializable {
+
+    public static GroupTaxRespBO build(OrderInfoContentEnum orderInfoContentEnum) {
+        GroupTaxRespBO resp = new GroupTaxRespBO();
+        resp.setZTDM(orderInfoContentEnum.getKey());
+        resp.setZTXX(orderInfoContentEnum.getMessage());
+        return resp;
+    }
+
+    public boolean isSuccess() {
+        return OrderInfoContentEnum.SUCCESS.getKey().equals(this.getZTDM());
+    }
+
+    public boolean isFailed() {
+        return !isSuccess();
+    }
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/DATABO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/DATABO.java
new file mode 100644
index 00000000..3564b0cf
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/DATABO.java
@@ -0,0 +1,15 @@
+
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
+
+
+public class DATABO {
+
+    private DATAINFOSBO DATAINFOS;
+    public void setDATAINFOS(DATAINFOSBO DATAINFOS) {
+         this.DATAINFOS = DATAINFOS;
+     }
+     public DATAINFOSBO getDATAINFOS() {
+         return DATAINFOS;
+     }
+
+}
\ No newline at end of file
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/DATAINFOSBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/DATAINFOSBO.java
new file mode 100644
index 00000000..5dd2c205
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/DATAINFOSBO.java
@@ -0,0 +1,31 @@
+
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import java.util.List;
+
+
+public class DATAINFOSBO {
+
+    @JSONField(name = "DATAINFO")
+    private List DATAINFO;
+    private String PUUID;
+
+    public void setDATAINFO(List DATAINFO) {
+        this.DATAINFO = DATAINFO;
+    }
+
+    public List getDATAINFO() {
+        return DATAINFO;
+    }
+
+    public void setPUUID(String PUUID) {
+        this.PUUID = PUUID;
+    }
+
+    public String getPUUID() {
+        return PUUID;
+    }
+
+}
\ No newline at end of file
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/ESBBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/ESBBO.java
new file mode 100644
index 00000000..befaa474
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/ESBBO.java
@@ -0,0 +1,15 @@
+
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
+
+
+public class ESBBO {
+
+    private DATABO DATA;
+    public void setDATA(DATABO DATA) {
+         this.DATA = DATA;
+     }
+     public DATABO getDATA() {
+         return DATA;
+     }
+
+}
\ No newline at end of file
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbMulticodeBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbMulticodeBO.java
similarity index 89%
rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbMulticodeBO.java
rename to order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbMulticodeBO.java
index 0c127602..546bb2b0 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbMulticodeBO.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbMulticodeBO.java
@@ -1,4 +1,4 @@
-package com.dxhy.order.baseservice.module.buyer.protocol.sdenergy;
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.ToString;
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbMulticodeValuelistBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbMulticodeValuelistBO.java
similarity index 93%
rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbMulticodeValuelistBO.java
rename to order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbMulticodeValuelistBO.java
index ae31616b..7ffc3ce6 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbMulticodeValuelistBO.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbMulticodeValuelistBO.java
@@ -1,4 +1,4 @@
-package com.dxhy.order.baseservice.module.buyer.protocol.sdenergy;
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
 
 import lombok.ToString;
 
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbReqBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbReqBO.java
similarity index 98%
rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbReqBO.java
rename to order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbReqBO.java
index c0bc2640..94d248a6 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/sdenergy/MdmGmfxxtbReqBO.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbReqBO.java
@@ -1,4 +1,4 @@
-package com.dxhy.order.baseservice.module.buyer.protocol.sdenergy;
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.ToString;
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java
new file mode 100644
index 00000000..07552f35
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java
@@ -0,0 +1,59 @@
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
+
+import lombok.ToString;
+
+/**
+ * @Description
+ * @Author 巩权林
+ * @Date 2023/2/9 16:59
+ **/
+@ToString
+public class MdmSyncGroupTaxCodeReqBO {
+
+    private String CODE;
+    private String DESC1;
+    private String DESC5;
+    private String DESCSHORT;
+    private String UUID;
+
+    public void setCODE(String CODE) {
+        this.CODE = CODE;
+    }
+
+    public String getCODE() {
+        return CODE;
+    }
+
+    public void setDESC1(String DESC1) {
+        this.DESC1 = DESC1;
+    }
+
+    public String getDESC1() {
+        return DESC1;
+    }
+
+    public void setDESC5(String DESC5) {
+        this.DESC5 = DESC5;
+    }
+
+    public String getDESC5() {
+        return DESC5;
+    }
+
+    public void setDESCSHORT(String DESCSHORT) {
+        this.DESCSHORT = DESCSHORT;
+    }
+
+    public String getDESCSHORT() {
+        return DESCSHORT;
+    }
+
+    public void setUUID(String UUID) {
+        this.UUID = UUID;
+    }
+
+    public String getUUID() {
+        return UUID;
+    }
+
+}
\ No newline at end of file
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeResBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeResBO.java
new file mode 100644
index 00000000..599160f8
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeResBO.java
@@ -0,0 +1,11 @@
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
+
+import com.dxhy.order.baseservice.module.taxclass.model.GroupTaxClassCodeEntity;
+
+/**
+ * @Description
+ * @Author 巩权林
+ * @Date 2023/2/9 17:25
+ **/
+public class MdmSyncGroupTaxCodeResBO extends GroupTaxClassCodeEntity {
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/SDEnergyMdmBaseBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/SDEnergyMdmBaseBO.java
new file mode 100644
index 00000000..00079981
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/SDEnergyMdmBaseBO.java
@@ -0,0 +1,16 @@
+
+package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
+
+
+public class SDEnergyMdmBaseBO {
+    private ESBBO ESBBO;
+
+    public void setESB(ESBBO ESBBO) {
+        this.ESBBO = ESBBO;
+    }
+
+    public ESBBO getESB() {
+        return ESBBO;
+    }
+
+}
\ No newline at end of file
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/InterfaceServiceV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/InterfaceServiceV3.java
index 951cc6bc..8ebe6e72 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/InterfaceServiceV3.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/InterfaceServiceV3.java
@@ -22,6 +22,8 @@ import com.dxhy.order.consumer.openapi.protocol.v4.fpslzb.SlzbxxCxReqBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.fpslzb.SlzbxxCxRspBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.fpyl.FpylcxReqBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.fpyl.FpylcxRspBO;
+import com.dxhy.order.consumer.openapi.protocol.v4.grouptax.GroupTaxReqBO;
+import com.dxhy.order.consumer.openapi.protocol.v4.grouptax.GroupTaxRespBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.invalid.ZfcxReqBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.invalid.ZfcxRspBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.invoice.*;
@@ -51,7 +53,7 @@ import java.util.List;
  * @date: 2018年8月13日 下午4:48:28
  */
 public interface InterfaceServiceV3 {
-    
+
     /**
      * 发票结果获取
      *
@@ -60,7 +62,7 @@ public interface InterfaceServiceV3 {
      * @return
      */
     DdkjxxRspBO getAllocatedInvoicesV3(DdkjxxReqBO ddkjxxReq, String secretId);
-    
+
     /**
      * 根据订单号获取订单数据以及发票数据接口
      *
@@ -69,7 +71,7 @@ public interface InterfaceServiceV3 {
      * @return
      */
     DdfpcxRspBO getOrderInfoAndInvoiceInfoV3(DdfpcxReqBO ddfpcxReq, String secretId);
-    
+
     /**
      * 查询发票数据接口
      *
@@ -78,18 +80,18 @@ public interface InterfaceServiceV3 {
      * @return
      */
     DdfpcxRspBO getInvoiceInfoV4(FpcxReqBO fpcxReqBO, String secretId);
-    
+
     /**
      * 专票冲红申请单
      *
-     * @param hzsqdscReq 请求报文
-     * @param kpjh 开票机号
-     * @param secretId 标识用户身份的SecretId
+     * @param hzsqdscReq       请求报文
+     * @param kpjh             开票机号
+     * @param secretId         标识用户身份的SecretId
      * @param interfaceVersion 接口版本号
      * @return com.dxhy.order.consumer.openapi.protocol.v4.invoice.HzsqdscRspBO
      */
     HzsqdscRspBO specialInvoiceRushRedV3(HzsqdscReqBO hzsqdscReq, String kpjh, String secretId, String interfaceVersion);
-    
+
     /**
      * 红字发票申请下载V3
      *
@@ -100,78 +102,78 @@ public interface InterfaceServiceV3 {
      * @return
      */
     HzsqdxzRspBO downSpecialInvoiceV3(HzsqdxzReqBO hzsqdxzReq, String sldid, String kpjh, String secretId);
-    
+
     /**
      * 导入已开发票的数据
      *
-     * @param ddfpzxxList 订单发票协议bean集合
-     * @param sourceType  订单来源
-     * @param secretId 标识用户身份的SecretId
+     * @param ddfpzxxList      订单发票协议bean集合
+     * @param sourceType       订单来源
+     * @param secretId         标识用户身份的SecretId
      * @param interfaceVersion 接口版本号
      * @return com.dxhy.order.consumer.protocol.v4.order.DDFPDR_RSP
      * @author <a href="tivenninesongs@163.com">yaoxuguang</a>
      * @date 2020/4/15
      */
     List<DdfpdrRspBO> importIssuedInvoice(List<DdfpzxxBO> ddfpzxxList, String sourceType, String secretId, String interfaceVersion);
-    
-    
+
+
     /**
      * 导入京东已开发票的数据
      *
-     * @param ddfpzxxList 订单发票协议bean集合
-     * @param sourceType  订单来源
-     * @param secretId 标识用户身份的SecretId
+     * @param ddfpzxxList      订单发票协议bean集合
+     * @param sourceType       订单来源
+     * @param secretId         标识用户身份的SecretId
      * @param interfaceVersion 接口版本号
      * @return com.dxhy.order.consumer.protocol.v4.order.DDFPDR_RSP
      * @author <a href="tivenninesongs@163.com">yaoxuguang</a>
      * @date 2020/4/15
      */
     List<DdfpdrRspBO> importIssuedInvoiceForJd(List<DdfpzxxBO> ddfpzxxList, String sourceType, String secretId, String interfaceVersion);
-    
+
     /**
      * 查询商品信息
      *
      * @param spxxcxReq 商品信息请求协议bean
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId  标识用户身份的SecretId
      * @return com.dxhy.order.consumer.protocol.v4.order.SPXXCX_RSP
      * @author <a href="tivenninesongs@163.com">yaoxuguang</a>
      * @date 2020/4/18
      */
     SpxxcxRspBO queryCommodityMessage(SpxxcxReqBO spxxcxReq, String secretId);
-    
+
     /**
      * 同步商品信息
      *
      * @param spxxtbReqList 同步商品信息协议bean集合
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId      标识用户身份的SecretId
      * @return com.dxhy.order.consumer.protocol.v4.commodity.SPXXTB_RSP
      * @author <a href="tivenninesongs@163.com">yaoxuguang</a>
      * @date 2020/4/20
      */
     List<SpxxtbRspBO> syncCommodityMessage(List<SpxxtbReqBO> spxxtbReqList, String secretId);
-    
+
     /**
      * 查询购买方信息
      *
      * @param gmfxxcxReq 购买方信息查询接口请求协议bean
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId   标识用户身份的SecretId
      * @return java.util.List<com.dxhy.order.consumer.protocol.v4.buyermanage.GMFXX_COMMON>
      * @author <a href="tivenninesongs@163.com">yaoxuguang</a>
      * @date 2020/4/20
      */
     GmfxxcxRspBO queryBuyerMessage(GmfxxcxReqBO gmfxxcxReq, String secretId);
-    
+
     /**
      * 同步购买方信息
      *
      * @param gmfxxtbReqList 同步购买方信息请求协议bean集合
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId       标识用户身份的SecretId
      * @return java.util.List<com.dxhy.order.consumer.protocol.v4.buyermanage.GMFXXTB_RSP>
      * @author <a href="tivenninesongs@163.com">yaoxuguang</a>
      * @date 2020/4/20
      */
     List<GmfxxtbRspBO> syncBuyerMessage(List<GmfxxtbReqBO> gmfxxtbReqList, String secretId);
-    
+
     /**
      * 税控设备信息同步
      *
@@ -180,7 +182,7 @@ public interface InterfaceServiceV3 {
      * @return
      */
     List<SksbxxtbRspBO> syncTaxEquipmentInfo(List<SksbxxtbReqBO> sksbxxtbReqList, String secretId);
-    
+
     /**
      * 发票余量查询接口
      *
@@ -189,7 +191,7 @@ public interface InterfaceServiceV3 {
      * @return
      */
     List<FpylcxRspBO> queryInvoiceStore(FpylcxReqBO fpylcxReq, String secretId);
-    
+
     /**
      * 企业状态信息接口
      *
@@ -198,7 +200,7 @@ public interface InterfaceServiceV3 {
      * @return
      */
     QyztcxRspBO getEnterpriseStatus(QyztcxReqBO qyztcxReq, String secretId);
-    
+
     /**
      * 清卡状态信息接口
      *
@@ -207,7 +209,7 @@ public interface InterfaceServiceV3 {
      * @return
      */
     QkztcxRspBO getCleanCardStatus(QkztcxReqBO qkztcxReq, String secretId);
-    
+
     /**
      * 设备在线状态信息接口
      *
@@ -216,158 +218,168 @@ public interface InterfaceServiceV3 {
      * @return
      */
     SbzxztcxRspBO getOnLineStatus(SbzxztcxReqBO sbzxztcxReq, String secretId);
-    
+
     /**
      * 企业下架接口
      *
      * @param qyxjReqBOList 请求参数
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId      标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.qyxj.QyxjRspBo 响应参数
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-08-18
      */
     QyxjRspBO takeDownTaxDisk(List<QyxjReqBO> qyxjReqBOList, String secretId);
-    
+
     /**
      * 发票申领结果接收(好活专用)
      *
      * @param jsfpslReqBO 请求参数
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId    标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.fpsl.JsfpslRspBO 响应参数
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-08-18
      */
     JsfpslRspBO receiveInvoiceApplication(JsfpslReqBO jsfpslReqBO, String secretId);
-    
+
     /**
      * 税控设备信息查询接口
      *
      * @param sksbxxCxReqBO 请求参数
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId      标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.taxequipment.SksbxxCxRspBO 响应参数
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-08-30
      */
     SksbxxCxRspBO queryTaxpayerInfo(SksbxxCxReqBO sksbxxCxReqBO, String secretId);
-    
+
     /**
      * 发票打印接口
      *
      * @param fpdyReqBO 请求参数
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId  标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.ResponseV4BO 响应参数
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-08-31
      */
     ResponseV4BO printInvoice(FpdyReqBO fpdyReqBO, String secretId);
-    
+
     /**
      * 打印机查询接口
      *
      * @param dyjcxReqBO 请求参数
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId   标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.fpdy.DyjcxRspBO 响应参数
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-08-31
      */
     DyjcxRspBO queryPrinter(DyjcxReqBO dyjcxReqBO, String secretId);
-    
+
     /**
      * 企业基本信息查询接口
      *
      * @param qyjbxxCxReqBO 请求协议
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId      标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.qyxx.QyjbxxCxRspBO 响应协议
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-09-10
      */
     QyjbxxCxRspBO queryTaxpayerGeneralInfo(QyjbxxCxReqBO qyjbxxCxReqBO, String secretId);
-    
+
     /**
      * 申领准备信息查询接口
      *
      * @param slzbxxCxReqBO 请求协议
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId      标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.fpslzb.SlzbxxCxRspBO 响应协议
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-09-10
      */
     SlzbxxCxRspBO queryApplicationPreparation(SlzbxxCxReqBO slzbxxCxReqBO, String secretId);
-    
+
     /**
      * 发票申领接口
      *
      * @param fpslReqBO 请求协议
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId  标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.fpsl.FpslRspBO 响应协议
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-09-13
      */
     FpslRspBO invoiceApply(FpslReqBO fpslReqBO, String secretId);
-    
+
     /**
      * 申领状态查询接口
      *
      * @param slztReqBO 请求协议
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId  标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.fpsl.SlztRspBO 响应协议
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-09-13
      */
     SlztRspBO queryInvoiceApplyStatus(SlztReqBO slztReqBO, String secretId);
-    
+
     /**
      * 纸票接收确认接口
      *
      * @param zpjsqrReqBO 请求协议
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId    标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.zpjsqr.ZpjsqrRspBO 响应协议
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-09-13
      */
     ZpjsqrRspBO confirmInvoiceApply(ZpjsqrReqBO zpjsqrReqBO, String secretId);
-    
+
     /**
      * 撤销申领接口
      *
      * @param cxslReqBO 请求协议
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId  标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.fpsl.CxslRspBO 响应协议
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-09-13
      */
     CxslRspBO cancelInvoiceApply(CxslReqBO cxslReqBO, String secretId);
-    
+
     /**
      * 抄报状态查询接口
      *
      * @param cbztcxReqBO 请求协议
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId    标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.fpcb.CbztcxRspBO 响应协议
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-09-13
      */
     CbztcxRspBO queryDeclareTaxStatus(CbztcxReqBO cbztcxReqBO, String secretId);
-    
+
     /**
      * 汇总抄报接口
      *
      * @param hzcbReqBO 请求协议
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId  标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.fpcb.HzcbRspBO 响应协议
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-09-13
      */
     HzcbRspBO declareTaxUpload(HzcbReqBO hzcbReqBO, String secretId);
-    
+
     /**
      * 作废结果查询接口（方格）
      *
      * @param zfcxReqBO 请求协议Bean
-     * @param secretId 标识用户身份的SecretId
+     * @param secretId  标识用户身份的SecretId
      * @return com.dxhy.order.consumer.openapi.protocol.v4.invalid.ZfcxRspBO
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2021-12-27
      */
     ZfcxRspBO queryInvalidInvoice(ZfcxReqBO zfcxReqBO, String secretId);
+
+
+    /**
+     * 同步集团商品税编表
+     *
+     * @param groupTaxReqBO
+     * @param secretId
+     * @return
+     */
+    GroupTaxRespBO syncGroupTax(List<GroupTaxReqBO> groupTaxReqBO, String secretId);
 }
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java
index ed99228a..309e8216 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java
@@ -19,6 +19,9 @@ import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
 import com.dxhy.order.baseservice.module.commodity.model.protocol.SpxxcxReqBO;
 import com.dxhy.order.baseservice.module.commodity.service.CommodityService;
 import com.dxhy.order.baseservice.module.commodity.service.VerifyCommodityCodeService;
+import com.dxhy.order.baseservice.module.taxclass.dao.GroupTaxClassCodeMapper;
+import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper;
+import com.dxhy.order.baseservice.module.taxclass.model.GroupTaxClassCodeEntity;
 import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
 import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService;
 import com.dxhy.order.baseservice.module.thirdservice.rabbitmq.service.RabbitMqSendMessageService;
@@ -53,6 +56,8 @@ import com.dxhy.order.consumer.openapi.protocol.v4.fpslzb.SlzbxxCxReqBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.fpslzb.SlzbxxCxRspBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.fpyl.FpylcxReqBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.fpyl.FpylcxRspBO;
+import com.dxhy.order.consumer.openapi.protocol.v4.grouptax.GroupTaxReqBO;
+import com.dxhy.order.consumer.openapi.protocol.v4.grouptax.GroupTaxRespBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.invalid.ZfcxReqBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.invalid.ZfcxRspBO;
 import com.dxhy.order.consumer.openapi.protocol.v4.invoice.*;
@@ -157,121 +162,128 @@ import static com.dxhy.order.constant.OrderInfoEnum.*;
 @Service
 @Slf4j
 public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
-    
+
     private static final String NEGATIVE_1 = "-1";
-    
+
     private static final String LOGGER_MSG = "(订单对外接口业务类V3)";
-    
+
     private static final String LOGGER_MSG_V4 = "(订单对外接口业务类V4)";
-    
+
     /**
      * 模糊查询的标识(0表示不进行模糊查询，1表示模糊查询)
      */
     private static final String FUZZY_QUERY_NO_FLAG = "0";
-    
+
     @Resource
     private OrderCommonService apiInvoiceCommonService;
-    
+
     @Resource
     private OrderInfoService orderInfoService;
-    
+
     @Resource
     private OrderInfoJdcService orderInfoJdcService;
-    
+
     @Resource
     private OrderInfoEscService orderInfoEscService;
-    
+
     @Resource
     private OrderProcessService orderProcessService;
-    
+
     @Resource
     private OrderInvoiceInfoService orderInvoiceInfoService;
-    
+
     @Resource
     private OrderItemInfoService orderItemInfoService;
-    
+
     @Resource
     private CommonInterfaceService commonInterfaceService;
-    
+
     @Resource
     private QuickCodeInfoService quickCodeInfoService;
-    
+
     @Resource
     private ValidateSpecialInvoiceService validateInterfaceSpecialInvoice;
-    
+
     @Resource
     private ValidateInterfaceOrderService validateInterfaceOrder;
-    
+
     @Resource
     private CommodityService commodityService;
-    
+
     @Resource
     private VerifyCommodityCodeService verifyCommodityCodeService;
-    
+
     @Resource
     private VerifyBuyerManageInfoService verifyBuyerManageInfoService;
-    
+
     @Resource
     private BuyerService buyerService;
-    
+
     @Resource
     private SpecialInvoiceService specialInvoiceService;
-    
+
     @Resource
     private RedisService redisService;
-    
+
     @Resource
     private FangGeService fangGeService;
-    
+
     @Resource
     private SpecialInvoiceReversalService specialInvoiceReversalService;
-    
+
     @Resource
     private ValidateTaxEquipmentInfoService validateTaxEquipmentInfoService;
-    
+
     @Resource
     private InvoiceCountService invoiceCountService;
-    
+
     @Resource
     private UserInfoService userInfoService;
-    
+
     @Resource
     private InvoiceService invoiceService;
-    
+
     @Resource
     private SimsBackService simsBackService;
-    
+
     @Resource
     private EnterpriseConfigService enterpriseConfigService;
-    
+
     @Resource
     private InvoiceBatchRequestItemMapper invoiceBatchRequestItemMapper;
-    
+
     @Resource
     private OpenApiConfig openApiConfig;
-    
+
     @Resource
     private BaseServiceConfig baseServiceConfig;
     @Resource
     private InvoiceConfig invoiceConfig;
     @Resource
     private UnifyService unifyService;
-    
+
     @Resource
     private BaseService baseService;
     @Resource
     private TaxClassCodeService taxClassCodeService;
-    
+
     @Resource
     private InvalidInvoiceService invalidInvoiceService;
-    
+
     @Resource
     private RabbitMqSendMessageService rabbitMqSendMessageService;
-    
+
     @Resource
     private CommonDisposeService commonDisposeService;
 
-    
+
+    @Resource
+    private TaxClassCodeMapper taxClassCodeMapper;
+
+    @Resource
+    private GroupTaxClassCodeMapper groupTaxClassCodeMapper;
+
+
     /**
      * 发票结果查询接口业务处理
      *
@@ -280,9 +292,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      * @return
      */
     @Override
-    @SentinelResource(value = "getAllocatedInvoicesV3",blockHandlerClass = InterfaceBlockExceptionUtil.class,blockHandler = "getAllocatedInvoicesV3Block")
+    @SentinelResource(value = "getAllocatedInvoicesV3", blockHandlerClass = InterfaceBlockExceptionUtil.class, blockHandler = "getAllocatedInvoicesV3Block")
     public DdkjxxRspBO getAllocatedInvoicesV3(DdkjxxReqBO ddkjxxReq, String secretId) {
-        
+
         DdkjxxRspBO getInvoiceRsp = new DdkjxxRspBO();
         getInvoiceRsp.setDDQQPCH(ddkjxxReq.getDDQQPCH());
         /**
@@ -305,7 +317,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
          *  如果查询不到数据,就返回失败
          * 2.查询到数据后,根据数据判断,返回开票成功的数据给客户
          */
-    
+
         List<OrderProcessInfo> orderProcessInfos = orderProcessService.selectOrderProcessInfoByDdqqpch(ddkjxxReq.getDDQQPCH(), shList);
         if (orderProcessInfos == null || orderProcessInfos.size() <= 0) {
             log.error("{}发票开具结果数据获取，请求批次号不存在!", LOGGER_MSG);
@@ -315,13 +327,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         //剔除删除状态为已删除的数据
         orderProcessInfos = orderProcessInfos.stream().filter(orderProcessInfo -> !OrderInfoEnum.DATE_DELETE_STATUS_1.getKey().equals(orderProcessInfo.getOrderStatus())).collect(Collectors.toList());
-    
+
         if (orderProcessInfos.size() == 0) {
             getInvoiceRsp.setZTDM(OrderInfoContentEnum.INVOICE_ERROR_CODE_021003_V3.getKey());
             getInvoiceRsp.setZTXX(OrderInfoContentEnum.INVOICE_ERROR_CODE_021003_V3.getMessage());
             return getInvoiceRsp;
         }
-    
+
         //2.根据查询出来的数据,循环处理.
         List<FpzxxBO> fpzxxes = new ArrayList<>();
         int successCount = 0;
@@ -334,7 +346,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 //如果发票代码号码不等于空,并且发票状态不是开票中,则返回数据,
                 if (StringUtils.isNotBlank(orderInvoiceInfo.getFpdm()) && StringUtils.isNotBlank(orderInvoiceInfo.getFphm()) && !OrderInfoEnum.INVOICE_STATUS_1.getKey().equals(orderInvoiceInfo.getKpzt())) {
                     fpzxx = BeanTransitionUtils.transitionCommonInvoiceInfoV3(orderInvoiceInfo);
-    
+
                 }
             }
             if (StringUtils.isNotBlank(ddkjxxReq.getFPLXDM())) {
@@ -345,9 +357,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     getInvoiceRsp.setZTXX(OrderInfoContentEnum.INVOICE_ERROR_CODE_204004_V3.getMessage());
                     return getInvoiceRsp;
                 }
-    
+
             }
-        
+
             /**
              * 赋值数据对应的订单状态
              */
@@ -363,32 +375,32 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     invoiceStatus = OrderInfoContentEnum.INVOICE_ERROR_CODE_021002_V3;
                     invoiceingCount++;
                 } else if (OrderInfoEnum.ORDER_STATUS_6.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_8.getKey().equals(orderProcessInfo.getDdzt())) {
-    
+
                     /**
                      * 订单状态为异常时,需要调用底层提供的查询接口进行查询,判断是否是开具中状态
                      *
                      */
                     invoiceStatus = OrderInfoContentEnum.INVOICE_ERROR_CODE_021999_V3;
                     if (ObjectUtil.isNotNull(orderInvoiceInfo) && StringUtils.isNotBlank(orderInvoiceInfo.getFpqqlsh())) {
-    
+
                         /**
                          * 税控设备为C48和A9的数据,如果是开票失败的,就是开票失败的直接返回,不用查询最终状态去判断是否需要进行编辑
                          * 其他税控设备还需要判断下最终状态,看下底层是否是真的开票失败
                          */
-    
+
                         CommonInvoiceStatus commonInvoiceStatus = invoiceService.queryInvoiceStatus(orderInvoiceInfo.getFpqqlsh(), orderInvoiceInfo.getXhfNsrsbh());
                         if (ObjectUtil.isNotNull(commonInvoiceStatus) && ConfigureConstant.STRING_0000.equals(commonInvoiceStatus.getStatusCode())) {
-    
+
                             // 2101换流水号,其他都不换,2001时提示开票失败,不允许编辑,不换流水号直接重试.
                             if (!OrderInfoEnum.INVOICE_QUERY_STATUS_2101.getKey().equals(commonInvoiceStatus.getFpzt())) {
                                 invoiceStatus = OrderInfoContentEnum.INVOICE_ERROR_CODE_021002_V3;
                                 invoiceingCount++;
                             }
-    
+
                         }
-    
+
                     }
-    
+
                 } else if (OrderInfoEnum.ORDER_STATUS_11.getKey().equals(orderProcessInfo.getDdzt())) {
                     invoiceStatus = OrderInfoContentEnum.INVOICE_ERROR_CODE_021003_V3;
                 }
@@ -412,14 +424,14 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             getInvoiceRsp.setZTXX(OrderInfoContentEnum.INVOICE_ERROR_CODE_020001_V3.getMessage());
         }
         if (returnfail && fpzxxes.size() > 0) {
-    
+
             getInvoiceRsp.setFPZXX(fpzxxes);
         }
-        
+
         return getInvoiceRsp;
-        
+
     }
-    
+
     /**
      * 数据校验
      */
@@ -480,10 +492,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
          * 是否返回失败,0:返回失败;1:不返回失败;默认为1;
          */
         if (StringUtils.isBlank(ddkjxxReq.getSFFHSBSJ())) {
-    
+
         } else {
             if (!ConfigureConstant.STRING_0.equals(ddkjxxReq.getSFFHSBSJ()) && !ConfigureConstant.STRING_1.equals(ddkjxxReq.getSFFHSBSJ())) {
-    
+
                 log.error("{}发票开具结果数据获取，是否返回失败数据参数只能为0或1", LOGGER_MSG);
                 getInvoiceRsp.setZTDM(OrderInfoContentEnum.INVOICE_ERROR_CODE_104007_V3.getKey());
                 getInvoiceRsp.setZTXX(OrderInfoContentEnum.INVOICE_ERROR_CODE_104007_V3.getMessage());
@@ -503,12 +515,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 return getInvoiceRsp;
             }
         }
-        
+
         getInvoiceRsp.setZTDM(OrderInfoContentEnum.SUCCESS.getKey());
         getInvoiceRsp.setZTXX(OrderInfoContentEnum.SUCCESS.getMessage());
         return getInvoiceRsp;
     }
-    
+
     /**
      * 根据订单号获取订单数据接口业务逻辑处理
      *
@@ -517,15 +529,15 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      * @return
      */
     @Override
-    @SentinelResource(value = "getOrderInfoAndInvoiceInfoV3",blockHandlerClass = InterfaceBlockExceptionUtil.class,blockHandler = "getOrderInfoAndInvoiceInfoV3Block")
+    @SentinelResource(value = "getOrderInfoAndInvoiceInfoV3", blockHandlerClass = InterfaceBlockExceptionUtil.class, blockHandler = "getOrderInfoAndInvoiceInfoV3Block")
     public DdfpcxRspBO getOrderInfoAndInvoiceInfoV3(DdfpcxReqBO ddfpcxReq, String secretId) {
         String jsonString2 = JsonUtils.getInstance().toJsonString(ddfpcxReq);
         log.debug("{},根据订单号获取订单数据以及发票数据接口数据:{}", LOGGER_MSG, jsonString2);
-        
+
         DdfpcxRspBO ddfpcxRsp = new DdfpcxRspBO();
         ddfpcxRsp.setZTDM(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_001000.getKey());
         ddfpcxRsp.setZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_001000.getMessage());
-        
+
         try {
             if (ddfpcxReq == null) {
                 ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_NULL_V3_009661.getKey());
@@ -543,7 +555,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 log.error("{},根据订单号获取订单数据以及发票数据接口,请求数据订单号和订单请求流水号不能同时为空", LOGGER_MSG);
                 return ddfpcxRsp;
             }
-    
+
             if (StringUtils.isEmpty(ddfpcxReq.getDDRQQ()) && StringUtils.isNotEmpty(ddfpcxReq.getDDRQZ())) {
                 ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009667.getKey());
                 ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009667.getMessage());
@@ -557,7 +569,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 return ddfpcxRsp;
             }
             if (StringUtils.isNotEmpty(ddfpcxReq.getDDRQQ()) && StringUtils.isNotEmpty(ddfpcxReq.getDDRQZ())) {
-    
+
                 //开票日期起日期
                 if (!ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S.equals(StringUtil.checkDateFormat(ddfpcxReq.getDDRQQ()))) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009668.getKey());
@@ -565,8 +577,8 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     log.error("{},根据订单号获取订单数据以及发票数据接口,订单日期起格式不正确", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-    
-    
+
+
                 //开票日期截止日期
                 if (!ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S.equals(StringUtil.checkDateFormat(ddfpcxReq.getDDRQZ()))) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009668.getKey());
@@ -574,30 +586,30 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     log.error("{},根据订单号获取订单数据以及发票数据接口,订单日期止格式不正确", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-    
+
                 Date ddrqq = DateUtil.parse(ddfpcxReq.getDDRQQ(), ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S);
                 Date ddrqz = DateUtil.parse(ddfpcxReq.getDDRQZ(), ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S);
-    
+
                 if (DateUtil.compare(ddrqq, ddrqz) > ConfigureConstant.INT_0) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009669.getKey());
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009669.getMessage());
                     log.error("{},根据订单号获取订单数据以及发票数据接口,订单日期起不能大于订单日期止", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-    
+
                 if (DateUtil.compare(ddrqz, DateUtil.date()) > ConfigureConstant.INT_0) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009670.getKey());
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009670.getMessage());
                     log.error("{},根据订单号获取订单数据以及发票数据接口,订单日期止不能大于当前时间", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-    
+
                 String redisKey = String.format(RedisConstant.REDIS_QUERY_INVOICE_TIME, ddfpcxReq.getNSRSBH());
                 String time = redisService.get(redisKey);
                 if (StringUtils.isEmpty(time)) {
                     time = ConfigureConstant.STRING_5;
                 }
-    
+
                 if (ddrqq != null && ddrqz != null && DateUtil.betweenDay(ddrqq, ddrqz, false) > Integer.parseInt(time)) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009671.getKey());
                     ddfpcxRsp.setZTXX(String.format(OrderInfoContentEnum.GET_ORDERS_INVOICE_PARAM_DDRQQ_V3_009671.getMessage(), time));
@@ -618,12 +630,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return ddfpcxRsp;
                 }
             }
-            
+
             //版式文件设置默认值
             if (StringUtils.isBlank(ddfpcxReq.getBSWJ())) {
                 ddfpcxReq.setBSWJ(ConfigureConstant.STRING_0);
             }
-            
+
             /**
              * 根据请求数据获取对应的订单信息.
              * 1.循环数据列表
@@ -639,24 +651,24 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             paraMap.put(ConfigureConstant.REQUEST_PARAM_TQM, ddfpcxReq.getTQM());
             paraMap.put(ConfigureConstant.REQUEST_PARAM_START_TIME, ddfpcxReq.getDDRQQ());
             paraMap.put(ConfigureConstant.REQUEST_PARAM_END_TIME, ddfpcxReq.getDDRQZ());
-    
+
             List<OrderProcessInfo> orderProcessInfos = orderProcessService.selectOrderProcessByFpqqlshDdhNsrsbh(paraMap, shList);
-    
+
             List<OrderProcessInfo> finalList = new ArrayList<>(orderProcessInfos);
-    
+
             for (OrderProcessInfo orderProcessInfo : orderProcessInfos) {
-        
+
                 List<OrderProcessInfo> findChildList = orderProcessService.findChildList(orderProcessInfo.getId(), shList);
                 finalList.addAll(findChildList);
             }
-    
+
             if (finalList.size() <= 0) {
                 ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_DATA_NULL_V3_009664.getKey());
                 ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_ORDERS_INVOICE_DATA_NULL_V3_009664.getMessage());
                 log.error("{},根据订单号:{}获取订单数据以及发票数据接口,查询订单处理表数据为空", LOGGER_MSG, ddfpcxReq.getDDH());
                 return ddfpcxRsp;
             }
-    
+
             List<DdfpzxxBO> commonOrderInvocies = new ArrayList<>();
             //计算有效订单数量,每次累加有效订单数量,判断开票成功数量
             int validCount = 0;
@@ -668,7 +680,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             int invoiceIngCount = 0;
             //未开票订单
             int unInvoiceCount = 0;
-    
+
             /**
              * 遍历数据
              */
@@ -679,13 +691,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         validCount++;
                     }
                 }
-    
+
                 DdfpzxxBO ddfpzxx = new DdfpzxxBO();
                 /**
                  * 根据orderid查询order信息表数据.
                  */
                 OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
-    
+
                 OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpqqlsh(orderProcessInfo.getFpqqlsh(), shList);
                 String ddzt = orderProcessInfo.getDdzt();
                 String sbyy = orderProcessInfo.getSbyy();
@@ -703,15 +715,15 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         return ddfpcxRsp;
                     }
                 }
-                
-                
+
+
                 /**
                  * 数据组装
                  * 订单状态  0 未开具 1 开具成功 2 开具失败
                  * ==>订单未开具状态 通过 流水号查询 批次明细表获取message
                  */
                 DdfpxxBO ddfpxx = BeanTransitionUtils.transitionOrderInvoiceInfoV3(orderInfo, orderProcessInfo, orderInvoiceInfo);
-    
+
                 /**
                  * 订单状态返回:
                  * 根据当前订单状态进行返回,
@@ -726,11 +738,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                  */
                 boolean checkFinalResult = false;
                 if (StringUtils.isNotBlank(ddzt)) {
-    
+
                     if (OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_1.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_2.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_3.getKey().equals(orderProcessInfo.getDdzt())) {
                         ddfpxx.setDDZT(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_001000.getKey());
                         ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_001000.getMessage());
-        
+
                         if (OrderInfoEnum.DATE_DELETE_STATUS_0.getKey().equals(orderProcessInfo.getOrderStatus())) {
                             unInvoiceCount++;
                         }
@@ -741,12 +753,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                             processSbyy = sbyy;
                         }
                         ddfpxx.setDDZTXX(processSbyy);
-        
+
                         if (OrderInfoEnum.DATE_DELETE_STATUS_0.getKey().equals(orderProcessInfo.getOrderStatus())) {
                             invoiceIngCount++;
                         }
                     } else if (OrderInfoEnum.ORDER_STATUS_5.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(orderProcessInfo.getDdzt())) {
-        
+
                         ddfpxx.setDDZT(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_000000.getKey());
                         ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_000000.getMessage());
                         /**
@@ -770,26 +782,26 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                                 ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_003000.getMessage());
                             }
                         }
-        
+
                         if (OrderInfoEnum.DATE_DELETE_STATUS_0.getKey().equals(orderProcessInfo.getOrderStatus())) {
                             successCount++;
                         }
-        
+
                     } else if (OrderInfoEnum.ORDER_STATUS_6.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_8.getKey().equals(orderProcessInfo.getDdzt())) {
-        
+
                         checkFinalResult = true;
                         ddfpxx.setDDZT(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_001999.getKey());
                         ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_001999.getMessage());
                         if (StringUtils.isNotBlank(sbyy)) {
                             ddfpxx.setDDZTXX(sbyy);
                         }
-        
+
                     } else if (OrderInfoEnum.ORDER_STATUS_11.getKey().equals(orderProcessInfo.getDdzt())) {
                         ddfpxx.setDDZT(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_002999.getKey());
                         ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_002999.getMessage());
                     }
                 }
-    
+
                 /**
                  * 税控设备为C48和A9的数据,如果是开票失败的,就是开票失败的直接返回,不用查询最终状态去判断是否需要进行编辑
                  * 其他税控设备还需要判断下最终状态,看下底层是否是真的开票失败
@@ -803,10 +815,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 }
                 if (checkFinalResult) {
                     if (ObjectUtil.isNotNull(orderInvoiceInfo) && StringUtils.isNotBlank(orderInvoiceInfo.getFpqqlsh())) {
-    
+
                         CommonInvoiceStatus commonInvoiceStatus = invoiceService.queryInvoiceStatus(orderInvoiceInfo.getFpqqlsh(), orderInvoiceInfo.getXhfNsrsbh());
                         if (ObjectUtil.isNotNull(commonInvoiceStatus) && ConfigureConstant.STRING_0000.equals(commonInvoiceStatus.getStatusCode())) {
-    
+
                             // 2101换流水号,其他都不换,2001时提示开票失败,不允许编辑,不换流水号直接重试.
                             if (OrderInfoEnum.INVOICE_QUERY_STATUS_2101.getKey().equals(commonInvoiceStatus.getFpzt())) {
                                 /**
@@ -814,60 +826,60 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                                  * 如果存在就返回订单异常原因
                                  * 如果不存在就返回底层错误原因
                                  */
-    
+
                                 ddfpxx.setDDZT(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_001999.getKey());
                                 ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_001999.getMessage());
-    
+
                                 if (OrderInfoEnum.DATE_DELETE_STATUS_0.getKey().equals(orderProcessInfo.getOrderStatus())) {
                                     failCount++;
                                 }
-    
+
                                 if (StringUtils.isNotEmpty(sbyy)) {
                                     ddfpxx.setDDZTXX(sbyy);
                                 }
                             } else {
                                 ddfpxx.setDDZT(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_002000.getKey());
                                 ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_002000.getMessage());
-    
-    
+
+
                                 if (OrderInfoEnum.DATE_DELETE_STATUS_0.getKey().equals(orderProcessInfo.getOrderStatus())) {
                                     invoiceIngCount++;
                                 }
-    
+
                             }
-    
+
                         }
                     }
                 }
-    
-    
+
+
                 boolean fpdmhmDp = StringUtils.isNotEmpty(ddfpxx.getFPDM()) && StringUtils.isNotEmpty(ddfpxx.getFPHM()) && (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(ddfpxx.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(ddfpxx.getFPLXDM()));
                 if (fpdmhmDp) {
                     /**
                      * 根据发票代码号码调用接口获取pdf字节流
                      */
                     if (ConfigureConstant.STRING_0.equals(ddfpcxReq.getBSWJ()) && ObjectUtil.isNotEmpty(orderInvoiceInfo) && OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) {
-    
+
                         terminalCode = orderInvoiceInfo.getSksbdm();
                         /**
                          * 获取PDF判断
                          */
-                        List<FileDownLoad> fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,"");
+                        List<FileDownLoad> fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode, "");
                         if (ObjectUtil.isNotEmpty(fileDownLoadList)) {
                             ddfpxx.setPDFZJL(fileDownLoadList.get(0).getFileContent());
                             ddfpxx.setZJLLX(CommonUtils.getZjlLx(fileDownLoadList.get(0).getFileSuffix()));
                         } else {
                             ddfpxx.setPDFZJL("");
                         }
-    
+
                     }
                     if (StringUtils.isNotBlank(ddfpxx.getPDFDZ()) && !ddfpxx.getPDFDZ().contains("http:")) {
                         ddfpxx.setPDFDZ("");
                     }
-    
+
                     //暂时不返回pdfurl
                     ddfpxx.setPDFDZ("");
-    
+
                     //补全动态码
                     if (StringUtils.isNotBlank(ddfpxx.getTQM())) {
                         QuickResponseCodeInfo quickResponseCodeInfo = quickCodeInfoService.queryQrCodeDetailByTqm(ddfpxx.getTQM(), shList, null);
@@ -876,16 +888,16 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         }
                     }
                 }
-    
+
                 /**
                  * 发票种类代码处理,改为底层的004,007,026
                  */
                 String fpzldm = ddfpxx.getFPLXDM();
                 if (StringUtils.isNotBlank(fpzldm)) {
                     ddfpxx.setFPLXDM(CommonUtils.transFplxdm(fpzldm));
-    
+
                 }
-    
+
                 /**
                  * 组装明细信息
                  */
@@ -897,7 +909,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return ddfpcxRsp;
                 }
                 List<DdmxxxBO> orderInvoiceItems = BeanTransitionUtils.transitionOrderInvoiceItemV3(orderItemInfos);
-    
+
                 /**
                  *
                  * 组装订单拆分合并关系协议信息：
@@ -905,11 +917,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                  */
                 List<OrderProcessInfo> orderProcessInfoRelevantList = orderProcessService.findTopParentList(orderProcessInfo, shList);
                 List<DdkzxxBO> orderExtensionInfos = BeanTransitionUtils.transitionOrderExtensionInfos(orderProcessInfoRelevantList);
-    
+
                 /**
                  * 如果是机动车,返回机动车信息
                  */
-    
+
                 if (OrderInfoEnum.ORDER_INVOICE_TYPE_12.getKey().equals(orderInfo.getFpzlDm())) {
                     /**
                      * 从数据库中获取机动车数据,组装请求底层数据
@@ -919,9 +931,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         JdctxxBO jdctxxBo = BeanTransitionUtils.transitionJdctxx(orderInfoJdc);
                         ddfpzxx.setJDCTXX(jdctxxBo);
                     }
-        
+
                 }
-    
+
                 /**
                  * 如果是二手车,返回二手车信息
                  */
@@ -934,15 +946,15 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         EsctxxBO esctxxBO = BeanTransitionUtils.transitionEsctxx(orderInfoEsc);
                         ddfpzxx.setESCTXX(esctxxBO);
                     }
-    
+
                 }
-    
+
                 ddfpzxx.setDDFPXX(ddfpxx);
                 ddfpzxx.setDDMXXX(orderInvoiceItems);
                 ddfpzxx.setDDKZXX(orderExtensionInfos);
                 commonOrderInvocies.add(ddfpzxx);
             }
-    
+
             ddfpcxRsp.setDDFPZXX(commonOrderInvocies);
             /**
              * 判断结果状态
@@ -954,7 +966,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
              * 如果开票成功数量大于0设置为部分成功
              *
              */
-    
+
             //如果明细信息只有一条数据,返回明细中的数据
             if (ObjectUtil.isNotEmpty(commonOrderInvocies) && commonOrderInvocies.size() == ConfigureConstant.INT_1) {
                 ddfpcxRsp.setZTDM(commonOrderInvocies.get(0).getDDFPXX().getDDZT());
@@ -980,20 +992,20 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.INTERFACE_GETORDERANDINVOICE_STATUS_007000.getMessage());
                 }
             }
-    
-    
+
+
         } catch (Exception e) {
             ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_ORDERS_INVOICE_ERROR_V3_009999.getKey());
             ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_ORDERS_INVOICE_ERROR_V3_009999.getMessage());
             log.error("{},根据订单号:{}获取订单数据以及发票数据接口异常,异常原因为:{}", LOGGER_MSG, ddfpcxReq.getDDH(), e.getMessage());
         }
-    
+
         String jsonString = JsonUtils.getInstance().toJsonString(ddfpcxRsp);
         log.debug("{},获取订单数据以及发票数据接口返回数据:{}", LOGGER_MSG, jsonString);
         return ddfpcxRsp;
     }
-    
-    
+
+
     /**
      * 发票查询接口
      *
@@ -1009,7 +1021,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         DdfpcxRspBO ddfpcxRsp = new DdfpcxRspBO();
         ddfpcxRsp.setZTDM(OrderInfoContentEnum.INTERFACE_GETINVOICE_STATUS_000000.getKey());
         ddfpcxRsp.setZTXX(OrderInfoContentEnum.INTERFACE_V5_STATUS_000000.getMessage());
-        
+
         try {
             if (fpcxReqBO == null) {
                 ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_NULL_V3_009661.getKey());
@@ -1027,30 +1039,30 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 log.error("{},查询发票数据接口,请求数据:{}", LOGGER_MSG, OrderInfoContentEnum.GET_INVOICE_PARAM_BSWJ_V3_009672.getMessage());
                 return ddfpcxRsp;
             }
-            
+
             if (!ConfigureConstant.STRING_0.equals(fpcxReqBO.getBSWJ()) && !ConfigureConstant.STRING_1.equals(fpcxReqBO.getBSWJ())) {
                 ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_BSWJ_V3_009673.getKey());
                 ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_INVOICE_PARAM_BSWJ_V3_009673.getMessage());
                 log.error("{},查询发票数据接口,请求数据:{}", LOGGER_MSG, OrderInfoContentEnum.GET_INVOICE_PARAM_BSWJ_V3_009673.getMessage());
                 return ddfpcxRsp;
             }
-    
-            if(StringUtils.isNotBlank(fpcxReqBO.getFPDM()) && StringUtils.isNotBlank(fpcxReqBO.getFPHM())){
+
+            if (StringUtils.isNotBlank(fpcxReqBO.getFPDM()) && StringUtils.isNotBlank(fpcxReqBO.getFPHM())) {
                 if (StringUtils.length(fpcxReqBO.getFPDM()) > ConfigureConstant.INT_12 || !NumberUtil.isNumber(fpcxReqBO.getFPDM())) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_FPDM_V3_009673.getKey());
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_INVOICE_PARAM_FPDM_V3_009673.getMessage());
                     log.error("{},查询发票数据接口,请求数据:{}", LOGGER_MSG, OrderInfoContentEnum.GET_INVOICE_PARAM_FPDM_V3_009673.getMessage());
                     return ddfpcxRsp;
                 }
-    
+
                 if (StringUtils.length(fpcxReqBO.getFPHM()) > ConfigureConstant.INT_8 || !NumberUtil.isNumber(fpcxReqBO.getFPHM())) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_FPHM_V3_009673.getKey());
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_INVOICE_PARAM_FPHM_V3_009673.getMessage());
                     log.error("{},查询发票数据接口,请求数据:{}", LOGGER_MSG, OrderInfoContentEnum.GET_INVOICE_PARAM_FPHM_V3_009673.getMessage());
                     return ddfpcxRsp;
                 }
-    
-            }else{
+
+            } else {
                 if (StringUtils.isBlank(fpcxReqBO.getKPRQQ())) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_KPRQQ_V3_009663.getKey());
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_INVOICE_PARAM_KPRQQ_V3_009663.getMessage());
@@ -1064,8 +1076,8 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return ddfpcxRsp;
                 }
             }
-    
-            if(StringUtils.isNotBlank(fpcxReqBO.getKPRQQ()) && StringUtils.isNotBlank(fpcxReqBO.getKPRQZ())){
+
+            if (StringUtils.isNotBlank(fpcxReqBO.getKPRQQ()) && StringUtils.isNotBlank(fpcxReqBO.getKPRQZ())) {
                 //开票日期起日期
                 if (!ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S.equals(StringUtil.checkDateFormat(fpcxReqBO.getKPRQQ()))) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_DDRQQ_V3_009668.getKey());
@@ -1073,8 +1085,8 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     log.error("{},查询发票数据接口,开票日期起格式不正确", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-    
-    
+
+
                 //开票日期截止日期
                 if (!ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S.equals(StringUtil.checkDateFormat(fpcxReqBO.getKPRQZ()))) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_DDRQQ_V3_009668.getKey());
@@ -1082,24 +1094,24 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     log.error("{},查询发票数据接口,开票日期止格式不正确", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-    
+
                 Date kprqq = DateUtil.parse(fpcxReqBO.getKPRQQ(), ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S);
                 Date kprqz = DateUtil.parse(fpcxReqBO.getKPRQZ(), ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S);
-    
+
                 if (DateUtil.compare(kprqq, kprqz) > ConfigureConstant.INT_0) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_DDRQQ_V3_009669.getKey());
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_INVOICE_PARAM_DDRQQ_V3_009669.getMessage());
                     log.error("{},查询发票数据接口,开票日期起不能大于开票日期止", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-    
+
                 if (DateUtil.compare(kprqz, DateUtil.date()) > ConfigureConstant.INT_0) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_PARAM_DDRQQ_V3_009670.getKey());
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_INVOICE_PARAM_DDRQQ_V3_009670.getMessage());
                     log.error("{},查询发票数据接口,开票日期止不能大于当前时间", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-                
+
                 String redisKey = String.format(RedisConstant.REDIS_QUERY_INVOICE_TIME, fpcxReqBO.getNSRSBH());
                 String time = redisService.get(redisKey);
                 if (StringUtils.isEmpty(time)) {
@@ -1112,8 +1124,8 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return ddfpcxRsp;
                 }
             }
-            
-            
+
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -1127,7 +1139,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return ddfpcxRsp;
                 }
             }
-            
+
             /**
              * 根据请求数据获取对应的订单信息.
              * 1.循环数据列表
@@ -1145,34 +1157,34 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             paraMap.put(ConfigureConstant.REQUEST_PARAM_END_TIME, fpcxReqBO.getKPRQZ());
             paraMap.put(ConfigureConstant.REQUEST_PARAM_FPDM, fpcxReqBO.getFPDM());
             paraMap.put(ConfigureConstant.REQUEST_PARAM_FPHM, fpcxReqBO.getFPHM());
-    
+
             List<OrderInvoiceInfo> orderInvoiceInfos = orderInvoiceInfoService.selectInvoiceInfoByPushStatus(paraMap, shList);
-    
-    
+
+
             List<DdfpzxxBO> ddfpzxxBOList = new ArrayList<>();
             /**
              * 遍历数据
              */
             for (OrderInvoiceInfo orderInvoiceInfo : orderInvoiceInfos) {
-                
+
                 DdfpzxxBO ddfpzxx = new DdfpzxxBO();
-                
+
                 OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(orderInvoiceInfo.getFpqqlsh(), shList);
                 /**
                  * 根据orderid查询order信息表数据.
                  */
                 OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
-                
+
                 if (ObjectUtil.isEmpty(orderProcessInfo)) {
                     ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_DATA_NULL_V3_009664.getKey());
                     ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_INVOICE_DATA_NULL_V3_009664.getMessage());
                     log.error("{},发票数据查询接口,查询订单表数据为空", LOGGER_MSG);
                     return ddfpcxRsp;
                 }
-                
-                
+
+
                 DdfpxxBO ddfpxx = BeanTransitionUtils.transitionOrderInvoiceInfoV3(orderInfo, orderProcessInfo, orderInvoiceInfo);
-                
+
                 ddfpxx.setDDZT(OrderInfoContentEnum.INTERFACE_GETINVOICE_STATUS_000000.getKey());
                 ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETINVOICE_STATUS_000000.getMessage());
                 /**
@@ -1196,34 +1208,34 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         ddfpxx.setDDZTXX(OrderInfoContentEnum.INTERFACE_GETINVOICE_STATUS_003000.getMessage());
                     }
                 }
-    
+
                 boolean fpdmhmDp = ObjectUtil.isNotNull(orderInvoiceInfo) && OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt()) && ConfigureConstant.STRING_0.equals(fpcxReqBO.getBSWJ()) && (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(ddfpxx.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(ddfpxx.getFPLXDM())) && StringUtils.isNotEmpty(ddfpxx.getFPDM()) && StringUtils.isNotEmpty(ddfpxx.getFPHM());
                 if (fpdmhmDp) {
                     /**
                      * 根据发票代码号码调用接口获取pdf字节流
                      */
                     String terminalCode = orderInvoiceInfo.getSksbdm();
-    
+
                     /**
                      * 获取PDF判断
                      */
-                    List<FileDownLoad> fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,"");
+                    List<FileDownLoad> fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode, "");
                     if (ObjectUtil.isNotEmpty(fileDownLoadList)) {
                         ddfpxx.setPDFZJL(fileDownLoadList.get(0).getFileContent());
                         ddfpxx.setZJLLX(CommonUtils.getZjlLx(fileDownLoadList.get(0).getFileSuffix()));
                     } else {
                         ddfpxx.setPDFZJL("");
                     }
-    
+
                     if (StringUtils.isNotBlank(ddfpxx.getPDFDZ()) && !ddfpxx.getPDFDZ().contains("http:")) {
                         ddfpxx.setPDFDZ("");
                     }
-    
+
                     //暂时不返回pdfurl
                     ddfpxx.setPDFDZ("");
-    
+
                 }
-                
+
                 //补全动态码
                 if (StringUtils.isNotBlank(ddfpxx.getTQM())) {
                     QuickResponseCodeInfo quickResponseCodeInfo = quickCodeInfoService.queryQrCodeDetailByTqm(ddfpxx.getTQM(), shList, null);
@@ -1231,16 +1243,16 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         ddfpxx.setDTM(String.format(openApiConfig.configQrCodeShortUrl(), quickResponseCodeInfo.getTqm()));
                     }
                 }
-                
+
                 /**
                  * 发票种类代码处理,改为底层的004,007,026
                  */
                 String fpzldm = ddfpxx.getFPLXDM();
                 if (StringUtils.isNotBlank(fpzldm)) {
                     ddfpxx.setFPLXDM(CommonUtils.transFplxdm(fpzldm));
-    
+
                 }
-                
+
                 /**
                  * 组装明细信息
                  */
@@ -1252,14 +1264,14 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return ddfpcxRsp;
                 }
                 List<DdmxxxBO> orderInvoiceItems = BeanTransitionUtils.transitionOrderInvoiceItemV3(orderItemInfos);
-    
+
                 ddfpzxx.setDDFPXX(ddfpxx);
                 ddfpzxx.setDDMXXX(orderInvoiceItems);
-    
+
                 /**
                  * 如果是机动车,返回机动车信息
                  */
-    
+
                 if (OrderInfoEnum.ORDER_INVOICE_TYPE_12.getKey().equals(orderInfo.getFpzlDm())) {
                     /**
                      * 从数据库中获取机动车数据,组装请求底层数据
@@ -1269,9 +1281,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         JdctxxBO jdctxxBo = BeanTransitionUtils.transitionJdctxx(orderInfoJdc);
                         ddfpzxx.setJDCTXX(jdctxxBo);
                     }
-        
+
                 }
-    
+
                 /**
                  * 如果是二手车,返回二手车信息
                  */
@@ -1284,30 +1296,30 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         EsctxxBO esctxxBO = BeanTransitionUtils.transitionEsctxx(orderInfoEsc);
                         ddfpzxx.setESCTXX(esctxxBO);
                     }
-    
+
                 }
-    
+
                 ddfpzxxBOList.add(ddfpzxx);
             }
-    
+
             ddfpcxRsp.setDDFPZXX(ddfpzxxBOList);
-            if(ObjectUtil.isNotEmpty(ddfpzxxBOList)){
+            if (ObjectUtil.isNotEmpty(ddfpzxxBOList)) {
                 ddfpcxRsp.setZTDM(OrderInfoContentEnum.INTERFACE_GETINVOICE_STATUS_000000.getKey());
                 ddfpcxRsp.setZTXX(OrderInfoContentEnum.INTERFACE_GETINVOICE_STATUS_000000.getMessage());
             }
-            
-            
+
+
         } catch (Exception e) {
             ddfpcxRsp.setZTDM(OrderInfoContentEnum.GET_INVOICE_ERROR_V3_009999.getKey());
             ddfpcxRsp.setZTXX(OrderInfoContentEnum.GET_INVOICE_ERROR_V3_009999.getMessage());
             log.error("{},发票数据查询接口异常,异常原因为:{}", LOGGER_MSG, e.getMessage());
         }
-        
+
         String jsonString = JsonUtils.getInstance().toJsonString(ddfpcxRsp);
         log.debug("{},获取订单数据以及发票数据接口返回数据:{}", LOGGER_MSG, jsonString);
         return ddfpcxRsp;
     }
-    
+
     /**
      * 红字发票申请单上传接口V3
      *
@@ -1317,10 +1329,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      * @return
      */
     @Override
-    public HzsqdscRspBO specialInvoiceRushRedV3(HzsqdscReqBO hzsqdscReq, String kpjh, String secretId,String interfaceVersion) {
+    public HzsqdscRspBO specialInvoiceRushRedV3(HzsqdscReqBO hzsqdscReq, String kpjh, String secretId, String interfaceVersion) {
         HzsqdscRspBO hzsqdscRsp = new HzsqdscRspBO();
         log.debug("{},接收红字发票申请单:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(hzsqdscReq));
-        
+
         Map<String, String> checkInvParam = validateInterfaceSpecialInvoice.checkSpecialInvoiceUpload(hzsqdscReq, secretId, interfaceVersion);
         if (!ConfigureConstant.STRING_0000.equals(checkInvParam.get(OrderManagementConstant.ERRORCODE))) {
             log.error("{}红字申请单上传数据非空校验未通过，未通过数据:{}", LOGGER_MSG, checkInvParam);
@@ -1328,13 +1340,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             hzsqdscRsp.setZTXX(checkInvParam.get(OrderManagementConstant.ERRORMESSAGE));
             return hzsqdscRsp;
         }
-        
+
         String nsrsbh = hzsqdscReq.getHZSQDSCPC().getNSRSBH();
         List<String> shList = NsrsbhUtils.transShListByNsrsbh(nsrsbh);
-       
+
         //如果开票日期为空 补全开票日期
         for (HzsqdsczxxBO hzsqdsczxx : hzsqdscReq.getHZSQDSCZXX()) {
-            
+
             if (StringUtils.isBlank(hzsqdsczxx.getHZSQDTXX().getYFPKPRQ())) {
                 log.warn("专票冲红企业传递的原开票日期为空,红字申请单编号:{}", hzsqdsczxx.getHZSQDTXX().getSQBSCQQLSH());
                 if (StringUtils.isNotBlank(hzsqdsczxx.getHZSQDTXX().getYFPDM()) && StringUtils.isNotBlank(hzsqdsczxx.getHZSQDTXX().getYFPHM())) {
@@ -1347,56 +1359,55 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     }
                 }
             }
-            
+
             //补全编码表版本号
             if (StringUtils.isBlank(hzsqdsczxx.getHZSQDTXX().getBMBBBH())) {
                 hzsqdsczxx.getHZSQDTXX().setBMBBBH(baseServiceConfig.configBmbbbh());
             }
             //原开票日期补全后进行校验，红字专票(非成品油)购方已抵扣可不填
             String xxbtsbs = hzsqdsczxx.getHZSQDTXX().getXXBTSBS();
-            String sqsm =hzsqdsczxx.getHZSQDTXX().getSQSM();
+            String sqsm = hzsqdsczxx.getHZSQDTXX().getSQSM();
             boolean isCheck = OrderInfoEnum.SPECIAL_INVOICE_REASON_0000000100.getKey().equals(sqsm) ||
                     OrderInfoEnum.SPECIAL_INVOICE_REASON_1010000000.getKey().equals(sqsm) ||
-                    CommonUtils.isGfsqAndOilProducts(sqsm,xxbtsbs);
-            if(isCheck && StringUtils.isBlank(hzsqdsczxx.getHZSQDTXX().getYFPKPRQ())){
+                    CommonUtils.isGfsqAndOilProducts(sqsm, xxbtsbs);
+            if (isCheck && StringUtils.isBlank(hzsqdsczxx.getHZSQDTXX().getYFPKPRQ())) {
                 log.error("{}红字申请单上传原开票日期校验未通过，未通过数据:{}", LOGGER_MSG, hzsqdsczxx);
                 hzsqdscRsp.setZTDM(OrderInfoContentEnum.CHECK_ISS7PRI_115091.getKey());
                 hzsqdscRsp.setZTXX(OrderInfoContentEnum.CHECK_ISS7PRI_115091.getMessage());
-                if(CommonUtils.isGfsqAndOilProducts(sqsm,xxbtsbs)){
+                if (CommonUtils.isGfsqAndOilProducts(sqsm, xxbtsbs)) {
                     hzsqdscRsp.setZTDM(OrderInfoContentEnum.CHECK_ISS7PRI_115092.getKey());
                     hzsqdscRsp.setZTXX(OrderInfoContentEnum.CHECK_ISS7PRI_115092.getMessage());
                 }
                 return hzsqdscRsp;
             }
         }
-        
-       
+
 
         //如果申请类别为空，根据申请说明补全
         HzsqdscpcBO hzsqdscpc1 = hzsqdscReq.getHZSQDSCPC();
-        if(StringUtils.isBlank(hzsqdscpc1.getSQLB())){
+        if (StringUtils.isBlank(hzsqdscpc1.getSQLB())) {
             HzsqdsczxxBO hzsqdsczxxBO = hzsqdscReq.getHZSQDSCZXX().get(0);
             HzsqdtxxBO hzsqdtxx = hzsqdsczxxBO.getHZSQDTXX();
             //购方申请
-            if(StringUtils.equals(OrderInfoEnum.SPECIAL_INVOICE_REASON_1100000000.getKey(), hzsqdtxx.getSQSM()) ||
-                    StringUtils.equals(OrderInfoEnum.SPECIAL_INVOICE_REASON_1010000000.getKey(), hzsqdtxx.getSQSM())){
+            if (StringUtils.equals(OrderInfoEnum.SPECIAL_INVOICE_REASON_1100000000.getKey(), hzsqdtxx.getSQSM()) ||
+                    StringUtils.equals(OrderInfoEnum.SPECIAL_INVOICE_REASON_1010000000.getKey(), hzsqdtxx.getSQSM())) {
                 hzsqdscpc1.setSQLB(ConfigureConstant.STRING_1);
             }
             //销方申请
-            if(StringUtils.equals(OrderInfoEnum.SPECIAL_INVOICE_REASON_0000000100.getKey(), hzsqdtxx.getSQSM())){
+            if (StringUtils.equals(OrderInfoEnum.SPECIAL_INVOICE_REASON_0000000100.getKey(), hzsqdtxx.getSQSM())) {
                 hzsqdscpc1.setSQLB(ConfigureConstant.STRING_0);
             }
         }
-        
+
         HzsqdscpcBO hzsqdscpc = hzsqdscReq.getHZSQDSCPC();
         String sldid = hzsqdscReq.getHZSQDSCPC().getKPZD();
-    
-    
+
+
         /**
          * 种类代码转换
          */
         String fplb = CommonUtils.transFpzldm(hzsqdscReq.getHZSQDSCPC().getFPLXDM());
-    
+
         String fplx = CommonUtils.getKplx(fplb);
         /**
          * 获取配置的设备信息
@@ -1404,7 +1415,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         String terminalCode = simsBackService.getTerminalCode(hzsqdscReq.getHZSQDSCPC().getNSRSBH(), null);
         if (StringUtils.isBlank(terminalCode)) {
             log.warn("{}企业未配置税控设备,税号:{}", LOGGER_MSG, hzsqdscReq.getHZSQDSCPC().getNSRSBH());
-            hzsqdscRsp.setZTDM(StringUtils.leftPad(OrderInfoContentEnum.COMMON_ERROR.getKey(),6,"0"));
+            hzsqdscRsp.setZTDM(StringUtils.leftPad(OrderInfoContentEnum.COMMON_ERROR.getKey(), 6, "0"));
             hzsqdscRsp.setZTXX(OrderInfoContentEnum.COMMON_ERROR.getMessage());
             return hzsqdscRsp;
         }
@@ -1417,7 +1428,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         if (StringUtils.isBlank(sldid) || NEGATIVE_1.equals(sldid)) {
             sldid = "";
         }
-    
+
         /*
          * 如果受理点为空,补全受理点信息和开票机号信息
          * 查询受理点信息不根据成品油企业类型查询
@@ -1428,7 +1439,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         if (!OrderInfoContentEnum.SUCCESS.getKey().equals(String.valueOf(result.get(OrderManagementConstant.CODE)))) {
             log.error("{}红字申请单上传数据自动匹配受理点失败:{}", LOGGER_MSG, checkInvParam);
             hzsqdscRsp.setZTDM(result.get(OrderManagementConstant.CODE) == null ? ConfigureConstant.STRING_009999
-                    : StringUtils.leftPad(String.valueOf(result.get(OrderManagementConstant.CODE)),6,"0"));
+                    : StringUtils.leftPad(String.valueOf(result.get(OrderManagementConstant.CODE)), 6, "0"));
             hzsqdscRsp.setZTXX(result.get(OrderManagementConstant.MESSAGE) == null ? "红字申请单上传数据自动匹配受理点失败"
                     : String.valueOf(result.get(OrderManagementConstant.MESSAGE)));
             return hzsqdscRsp;
@@ -1437,7 +1448,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             sldid = String.valueOf(result.get(ConfigureConstant.SLD_ID));
             kpjh = String.valueOf(result.get(ConfigureConstant.KPJH));
         }
-    
+
         /*
          * 1.红字信息表数据保存到数据库
          * 2.请求税控红字信息表上传接口
@@ -1452,11 +1463,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 List<HzsqdscjgBO> hzsqdscjgs = new ArrayList<>();
                 //方格税控红字信息表上传接口出参集合
                 List<HzsqdscjgBO> hzsqdscjgsReturn = new ArrayList<>();
-                
+
                 for (HzsqdsczxxBO hzsqdsczxx : hzsqdscReq.getHZSQDSCZXX()) {
                     HzsqdtxxBO hzsqdtxx = hzsqdsczxx.getHZSQDTXX();
                     HzsqdscjgBO hzsqdscjg = new HzsqdscjgBO();
-                   
+
                     //查询数据库中是否存在数据
                     SpecialInvoiceReversalEntity specialInvoiceReversal = specialInvoiceReversalService.selectSpecialInvoiceReversalBySqdqqlsh(hzsqdsczxx.getHZSQDTXX().getSQBSCQQLSH());
                     //上传成功的不允许重复上传
@@ -1479,11 +1490,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         hzsqdscRsp.setHZSQDSCJG(hzsqdscjgsReturn);
                         return hzsqdscRsp;
                     }
-    
+
                     //如果为调用税控版本的方格,需要调用税控接口,如果为订单的需要发送指令
-                    if(CommonUtils.judgeIsFgTerminalNew(terminalCode, fgSkKpShList, sh)){
+                    if (CommonUtils.judgeIsFgTerminalNew(terminalCode, fgSkKpShList, sh)) {
                         String uploadUrl = invoiceConfig.configFgApplicationUpload();
-                        
+
                         //当对外接口一批次上传多条红字申请单时，按单条轮询上传
                         ////创建只包含一条上传申请单的请求报文
                         HzsqdscReqBO hzsqdscReq1 = new HzsqdscReqBO();
@@ -1491,9 +1502,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         List<HzsqdsczxxBO> HZSQDSCZXX = new ArrayList<>(1);
                         HZSQDSCZXX.add(hzsqdsczxx);
                         hzsqdscReq1.setHZSQDSCZXX(HZSQDSCZXX);
-                        
+
                         HzfpsqbsReq req = BeanTransitionUtils.transitionSpecialInvoiceRushRedV3(hzsqdscReq1, sldid, kpjh, fplx, fplb);
-                        HpUploadResponse hpUploadResponse = HttpInvoiceRequestUtil.redInvoiceUpload(uploadUrl, req, terminalCode,fgSkKpShList,sh);
+                        HpUploadResponse hpUploadResponse = HttpInvoiceRequestUtil.redInvoiceUpload(uploadUrl, req, terminalCode, fgSkKpShList, sh);
                         String statusCode = hpUploadResponse.getResult().getStatusCode();
                         String statusMsg = hpUploadResponse.getResult().getStatusMessage();
 
@@ -1501,25 +1512,25 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         hzsqdscjg.setSQDH("");
                         hzsqdscjg.setXXBBH("");
                         List<HpUploadResponseHzfpsqbsc> hpUploadResponseHzfpsqbscList = hpUploadResponse.getResult().getResponse_HZFPSQBSC();
-                        if(CollectionUtil.isNotEmpty(hpUploadResponseHzfpsqbscList)
-                                && Objects.nonNull(hpUploadResponseHzfpsqbscList.get(0))){
+                        if (CollectionUtil.isNotEmpty(hpUploadResponseHzfpsqbscList)
+                                && Objects.nonNull(hpUploadResponseHzfpsqbscList.get(0))) {
                             HpUploadResponseHzfpsqbsc hpUploadResponseHzfpsqbsc = hpUploadResponseHzfpsqbscList.get(0);
                             hzsqdscjg.setSQDH(hpUploadResponseHzfpsqbsc.getSQDH());
                             hzsqdscjg.setXXBBH(hpUploadResponseHzfpsqbsc.getXXBBH());
                         }
-                       
-                        if(ConfigureConstant.STRING_0000.equals(statusCode)){
+
+                        if (ConfigureConstant.STRING_0000.equals(statusCode)) {
                             hzsqdscjg.setZTDM(OrderInfoEnum.SPECIAL_INVOICE_STATUS_TZD0501.getKey());
                             hzsqdscjg.setZTXX(OrderInfoEnum.SPECIAL_INVOICE_STATUS_TZD0501.getValue());
-                        }else{
+                        } else {
                             hzsqdscjg.setZTDM(statusCode);
                             hzsqdscjg.setZTXX(statusMsg);
                         }
                         hzsqdscjgs.add(hzsqdscjg);
-                        
-                    }else{
+
+                    } else {
                         //存放上传信息到redis队列
-                        fangGeService.saveMqttToRedis(hzsqdscReq.getHZSQDSCPC().getNSRSBH(), sldid, OrderInfoEnum.FANGGE_INTERFACE_TYPE_2.getKey(), hzsqdsczxx.getHZSQDTXX().getSQBSCQQLSH(),false);
+                        fangGeService.saveMqttToRedis(hzsqdscReq.getHZSQDSCPC().getNSRSBH(), sldid, OrderInfoEnum.FANGGE_INTERFACE_TYPE_2.getKey(), hzsqdsczxx.getHZSQDTXX().getSQBSCQQLSH(), false);
                         //消费下一条数据
                         fangGeService.handleRedisMsg(hzsqdscReq.getHZSQDSCPC().getNSRSBH(), sldid);
 
@@ -1529,9 +1540,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         hzsqdscjg.setXXBBH("");
                         hzsqdscjgs.add(hzsqdscjg);
                     }
-                    
-                    if(Objects.nonNull(specialInvoiceReversal)
-                        && !SPECIAL_INVOICE_STATUS_TZD0500.getKey().equals(specialInvoiceReversal.getStatusCode())){
+
+                    if (Objects.nonNull(specialInvoiceReversal)
+                            && !SPECIAL_INVOICE_STATUS_TZD0500.getKey().equals(specialInvoiceReversal.getStatusCode())) {
                         //如果数据库存在该红字信息表，返回数据库中的红字信息表状态
                         HzsqdscjgBO hzsqdscjg1 = new HzsqdscjgBO();
                         hzsqdscjg1.setSQBSCQQLSH(hzsqdtxx.getSQBSCQQLSH());
@@ -1539,10 +1550,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         hzsqdscjg1.setZTDM(specialInvoiceReversal.getStatusCode());
                         hzsqdscjg1.setZTXX(specialInvoiceReversal.getStatusMessage());
                         hzsqdscjg1.setXXBBH(specialInvoiceReversal.getXxbbh());
-                        
+
                         //如果是新版方格，税控接口返回失败时对外接口返回税控接口的错误信息
-                        if(CommonUtils.judgeIsFgTerminalNew(terminalCode, fgSkKpShList, sh)
-                            && !ConfigureConstant.STRING_0000.equals(hzsqdscjg.getZTDM())){
+                        if (CommonUtils.judgeIsFgTerminalNew(terminalCode, fgSkKpShList, sh)
+                                && !ConfigureConstant.STRING_0000.equals(hzsqdscjg.getZTDM())) {
                             hzsqdscjg1.setZTDM(hzsqdscjg.getZTDM());
                             hzsqdscjg1.setZTXX(hzsqdscjg.getZTXX());
                             hzsqdscjg1.setXXBBH(hzsqdscjg.getXXBBH());
@@ -1552,7 +1563,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     } else {
                         hzsqdscjgsReturn.add(hzsqdscjg);
                     }
-                    
+
                 }
 
                 //更新数据库
@@ -1564,14 +1575,14 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
 
                 //组装对外接口出参数据
                 hzsqdscRsp.setHZSQDSCJG(hzsqdscjgsReturn);
-                
-            } else if(CommonUtils.judgeNewInterface(terminalCode)){
-                
+
+            } else if (CommonUtils.judgeNewInterface(terminalCode)) {
+
                 //上传成功的红字申请单集合
                 List<HpUploadResponse> successHpUploadResponseList = new ArrayList<>(hzsqdscReq.getHZSQDSCZXX().size());
                 //上传失败的红字申请单集合
                 List<HpUploadResponse> failHpUploadResponseList = new ArrayList<>(hzsqdscReq.getHZSQDSCZXX().size());
-                
+
                 //当对外接口一批次上传多条红字申请单时，按单条轮询上传
                 for (HzsqdsczxxBO hzsqdsczxx : hzsqdscReq.getHZSQDSCZXX()) {
                     ////创建只包含一条上传申请单的请求报文
@@ -1585,33 +1596,33 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     log.debug("{},转换后数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(req));
 
                     String uploadUrl = invoiceConfig.configApplicationUpload();
-                    HpUploadResponse redInvoiceUpload = HttpInvoiceRequestUtil.redInvoiceUpload(uploadUrl, req, terminalCode, fgSkKpShList,sh);
+                    HpUploadResponse redInvoiceUpload = HttpInvoiceRequestUtil.redInvoiceUpload(uploadUrl, req, terminalCode, fgSkKpShList, sh);
                     List<HpUploadResponseHzfpsqbsc> hpUploadResponseHzfpsqbscList = redInvoiceUpload.getResult().getResponse_HZFPSQBSC();
                     //是否存在申请单明细信息
                     boolean isExistHpUploadResponseHzfpsqbsc = CollectionUtil.isNotEmpty(hpUploadResponseHzfpsqbscList)
                             && Objects.nonNull(hpUploadResponseHzfpsqbscList.get(0));
-                    
-                    if(ConfigureConstant.STRING_0000.equals(redInvoiceUpload.getCode())
-                        && isExistHpUploadResponseHzfpsqbsc
-                        && (SPECIAL_INVOICE_STATUS_TZD0000.getKey().equals(hpUploadResponseHzfpsqbscList.get(0).getSTATUS_CODE())
+
+                    if (ConfigureConstant.STRING_0000.equals(redInvoiceUpload.getCode())
+                            && isExistHpUploadResponseHzfpsqbsc
+                            && (SPECIAL_INVOICE_STATUS_TZD0000.getKey().equals(hpUploadResponseHzfpsqbscList.get(0).getSTATUS_CODE())
                             || SPECIAL_INVOICE_STATUS_TZD0001.getKey().equals(hpUploadResponseHzfpsqbscList.get(0).getSTATUS_CODE())
-                            || SPECIAL_INVOICE_STATUS_TZD1000.getKey().equals(hpUploadResponseHzfpsqbscList.get(0).getSTATUS_CODE()))){
-                        
-                       successHpUploadResponseList.add(redInvoiceUpload);
-                   } else {
-                       failHpUploadResponseList.add(redInvoiceUpload);
-                   }
-                }
-                
+                            || SPECIAL_INVOICE_STATUS_TZD1000.getKey().equals(hpUploadResponseHzfpsqbscList.get(0).getSTATUS_CODE()))) {
+
+                        successHpUploadResponseList.add(redInvoiceUpload);
+                    } else {
+                        failHpUploadResponseList.add(redInvoiceUpload);
+                    }
+                }
+
                 //合并所有红字发票申请单上传结果
                 List<HpUploadResponse> hpUploadResponseList = new ArrayList<>(10);
                 hpUploadResponseList.addAll(successHpUploadResponseList);
                 hpUploadResponseList.addAll(failHpUploadResponseList);
                 HpUploadResponse redInvoiceUpload = hpUploadResponseList.get(0);
-                
+
                 List<HpUploadResponseHzfpsqbsc> hpUploadResponseHzfpsqbscList = new ArrayList<>(10);
                 for (HpUploadResponse hpUploadResponse : hpUploadResponseList) {
-                    if(ConfigureConstant.STRING_0000.equals(hpUploadResponse.getCode())){
+                    if (ConfigureConstant.STRING_0000.equals(hpUploadResponse.getCode())) {
                         hpUploadResponseHzfpsqbscList.addAll(hpUploadResponse.getResult().getResponse_HZFPSQBSC());
                     } else {
                         HpUploadResponseHzfpsqbsc hpUploadResponseHzfpsqbsc = new HpUploadResponseHzfpsqbsc();
@@ -1624,13 +1635,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     }
                 }
                 redInvoiceUpload.getResult().setResponse_HZFPSQBSC(hpUploadResponseHzfpsqbscList);
-                
+
                 hzsqdscRsp = BeanTransitionUtils.transitionSpecialInvoiceRushRedRspV3(redInvoiceUpload);
-                if(hzsqdscReq.getHZSQDSCZXX().size() == failHpUploadResponseList.size()){
+                if (hzsqdscReq.getHZSQDSCZXX().size() == failHpUploadResponseList.size()) {
                     //红字申请单批量上传全部失败
                     hzsqdscRsp.setZTDM(OrderInfoContentEnum.CHECK_ISS7PRI_SC_060002.getKey());
                     hzsqdscRsp.setZTXX(OrderInfoContentEnum.CHECK_ISS7PRI_SC_060002.getMessage());
-                } else if(hzsqdscReq.getHZSQDSCZXX().size() == successHpUploadResponseList.size()) {
+                } else if (hzsqdscReq.getHZSQDSCZXX().size() == successHpUploadResponseList.size()) {
                     //红字申请单批量上传全部成功
                     hzsqdscRsp.setZTDM(OrderInfoContentEnum.CHECK_ISS7PRI_SC_060000.getKey());
                     hzsqdscRsp.setZTXX(OrderInfoContentEnum.CHECK_ISS7PRI_SC_060000.getMessage());
@@ -1639,18 +1650,18 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     hzsqdscRsp.setZTDM(OrderInfoContentEnum.CHECK_ISS7PRI_SC_060001.getKey());
                     hzsqdscRsp.setZTXX(OrderInfoContentEnum.CHECK_ISS7PRI_SC_060001.getMessage());
                 }
-                
+
                 //更新数据库
                 updateSpecialInvoiceRequest(hzsqdscReq, hzsqdscRsp);
-                
+
             } else {
                 HzfpsqbsReq req = BeanTransitionUtils.transitionSpecialInvoiceRushRedV3(hzsqdscReq, sldid, kpjh, fplx, fplb);
                 log.debug("{},转换后数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(req));
 
                 String uploadUrl = invoiceConfig.configRedInvoiceUpload();
-                HpUploadResponse redInvoiceUpload = HttpInvoiceRequestUtil.redInvoiceUpload(uploadUrl, req, terminalCode, fgSkKpShList,sh);
+                HpUploadResponse redInvoiceUpload = HttpInvoiceRequestUtil.redInvoiceUpload(uploadUrl, req, terminalCode, fgSkKpShList, sh);
                 hzsqdscRsp = BeanTransitionUtils.transitionSpecialInvoiceRushRedRspV3(redInvoiceUpload);
-                
+
                 //更新数据库
                 updateSpecialInvoiceRequest(hzsqdscReq, hzsqdscRsp);
             }
@@ -1666,10 +1677,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             hzsqdscRsp.setZTDM(ConfigureConstant.STRING_009999);
             hzsqdscRsp.setZTXX("红字信息表上传异常");
         }
-        
+
         return hzsqdscRsp;
     }
-    
+
     /**
      * 红字发票申请单审核结果下载V3
      *
@@ -1681,10 +1692,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      */
     @Override
     public HzsqdxzRspBO downSpecialInvoiceV3(HzsqdxzReqBO hzsqdxzReq, String sldid, String kpjh, String secretId) {
-        
+
         HzsqdxzRspBO hzsqdxzRsp = new HzsqdxzRspBO();
         hzsqdxzRsp.setSQBXZQQPCH(hzsqdxzReq.getSQBXZQQPCH());
-        
+
         Map<String, String> checkInvParam = validateInterfaceSpecialInvoice.checkSpecialInvoiceDownload(hzsqdxzReq, secretId);
         if (!ConfigureConstant.STRING_0000.equals(checkInvParam.get(OrderManagementConstant.ERRORCODE))) {
             log.error("{}红字申请单下载数据非空校验未通过，未通过数据:{}", LOGGER_MSG, checkInvParam);
@@ -1692,22 +1703,22 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             hzsqdxzRsp.setZTXX(checkInvParam.get(OrderManagementConstant.ERRORMESSAGE));
             return hzsqdxzRsp;
         }
-    
-    
+
+
         /**
          * 种类代码转换
          */
         String fplb = CommonUtils.transFpzldm(hzsqdxzReq.getFPLXDM());
-    
+
         String fplx = CommonUtils.getKplx(fplb);
-    
+
         /**
          * 获取配置的设备信息
          */
         String terminalCode = simsBackService.getTerminalCode(hzsqdxzReq.getNSRSBH(), null);
         if (StringUtils.isBlank(terminalCode)) {
             log.warn("{}企业未配置税控设备,税号:{}", LOGGER_MSG, hzsqdxzReq.getNSRSBH());
-            hzsqdxzRsp.setZTDM(StringUtils.leftPad(OrderInfoContentEnum.COMMON_ERROR.getKey(),6,"0"));
+            hzsqdxzRsp.setZTDM(StringUtils.leftPad(OrderInfoContentEnum.COMMON_ERROR.getKey(), 6, "0"));
             hzsqdxzRsp.setZTXX(OrderInfoContentEnum.COMMON_ERROR.getMessage());
             return hzsqdxzRsp;
         }
@@ -1715,14 +1726,14 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.info("税盘编码：{}", terminalCode);
         //方格税盘特殊处理
         String fgSkKpShList = baseServiceConfig.getFgSkKpShList();
-        if (CommonUtils.judgeIsFgTerminalOld(terminalCode,fgSkKpShList,sh)) {
-    
+        if (CommonUtils.judgeIsFgTerminalOld(terminalCode, fgSkKpShList, sh)) {
+
             /**
              * 请求协议转换
              */
             HpInvoiceRequest hpInvocieRequest = BeanTransitionUtils.transitionDownSpecialInvoiceV3(hzsqdxzReq, sldid, kpjh, fplx, fplb);
-    
-            HpResponseBean redInvoiceDown = specialInvoiceService.downloadSpecialInvoiceReversalFg(hpInvocieRequest,terminalCode);
+
+            HpResponseBean redInvoiceDown = specialInvoiceService.downloadSpecialInvoiceReversalFg(hpInvocieRequest, terminalCode);
             hzsqdxzRsp = BeanTransitionUtils.transitionDownSpecialInvoiceRspV3(redInvoiceDown);
             recodeXxbtsbs(hzsqdxzRsp);
         } else {
@@ -1730,24 +1741,24 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
              * 请求协议转换
              */
             HpInvoiceRequest hpInvocieRequest = BeanTransitionUtils.transitionDownSpecialInvoiceV3(hzsqdxzReq, sldid, kpjh, fplx, fplb);
-    
+
             //调用下载前自动轮训可用开票点进行赋值
-            List<SearchFjh> searchFjhList = unifyService.getFjh(hzsqdxzReq.getNSRSBH(), "", "",terminalCode);
-            if(CollectionUtil.isEmpty(searchFjhList)){
+            List<SearchFjh> searchFjhList = unifyService.getFjh(hzsqdxzReq.getNSRSBH(), "", "", terminalCode);
+            if (CollectionUtil.isEmpty(searchFjhList)) {
                 log.error("{}红字申请单下载获取分机为空!,请求信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(hpInvocieRequest));
                 hzsqdxzRsp.setZTDM(ConfigureConstant.STRING_009999);
                 hzsqdxzRsp.setZTXX("红字申请单下载获取分机为空");
                 return hzsqdxzRsp;
             }
-            
+
             //下载成功的红字信息表集合
             List<HpResponseBean> successRedInvoiceDownList = new ArrayList<>(searchFjhList.size());
             //下载失败的红字信息表集合
             List<HpResponseBean> failRedInvoiceDownList = new ArrayList<>(searchFjhList.size());
-            
+
             for (SearchFjh searchFjh : searchFjhList) {
                 hpInvocieRequest.setKPJH(searchFjh.getFjh());
-                if(CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)) {
+                if (CommonUtils.judgeIsFgTerminalNew(terminalCode, fgSkKpShList, sh)) {
                     hpInvocieRequest.setKPJH(searchFjh.getJqbh());
                 }
 
@@ -1755,24 +1766,24 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 if (CommonUtils.judgeNewInterface(terminalCode)) {
                     downUrl = invoiceConfig.configApplicationDownload();
                 }
-                if(CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)){
+                if (CommonUtils.judgeIsFgTerminalNew(terminalCode, fgSkKpShList, sh)) {
                     downUrl = invoiceConfig.configFgApplicationDownload();
                 }
-                HpResponseBean redInvoiceDown = HttpInvoiceRequestUtil.redInvoiceDown(downUrl, hpInvocieRequest, terminalCode,fgSkKpShList,sh);
+                HpResponseBean redInvoiceDown = HttpInvoiceRequestUtil.redInvoiceDown(downUrl, hpInvocieRequest, terminalCode, fgSkKpShList, sh);
                 //如果调用税控红字信息表下载接口异常，轮询下一个分机
-                if(ExceptionContentEnum.HZSQD_UPLOAD_ERROR_999999.getKey().equals(redInvoiceDown.getCode())){
+                if (ExceptionContentEnum.HZSQD_UPLOAD_ERROR_999999.getKey().equals(redInvoiceDown.getCode())) {
                     failRedInvoiceDownList.add(redInvoiceDown);
                     continue;
                 }
                 //如果下载成功，继续轮询下一个分机
-                if(CollectionUtil.isNotEmpty(redInvoiceDown.getResult().getRedinvreqbillxx())){
+                if (CollectionUtil.isNotEmpty(redInvoiceDown.getResult().getRedinvreqbillxx())) {
                     successRedInvoiceDownList.add(redInvoiceDown);
                 }
             }
 
             HpResponseBean redInvoiceDown;
             //如果轮询分机都下载失败则返回第一个分机失败信息
-            if(searchFjhList.size() == CollectionUtil.size(failRedInvoiceDownList)){
+            if (searchFjhList.size() == CollectionUtil.size(failRedInvoiceDownList)) {
                 redInvoiceDown = failRedInvoiceDownList.get(0);
             } else {
                 redInvoiceDown = successRedInvoiceDownList.get(0);
@@ -1782,11 +1793,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 for (HpResponseBean hpResponseBean : successRedInvoiceDownList) {
                     redinvreqbillxx.addAll(hpResponseBean.getResult().getRedinvreqbillxx());
                 }
-                if(CollectionUtil.isNotEmpty(redinvreqbillxx)){
+                if (CollectionUtil.isNotEmpty(redinvreqbillxx)) {
                     redInvoiceDown.getResult().setRedinvreqbillxx(redinvreqbillxx);
                 }
             }
-            
+
             hzsqdxzRsp = BeanTransitionUtils.transitionDownSpecialInvoiceRspV3(redInvoiceDown);
             recodeXxbtsbs(hzsqdxzRsp);
 
@@ -1802,12 +1813,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 hzsqdxzRsp.setZTXX("红字信息表下载异常");
             }
         }
-    
+
         String jsonString2 = JsonUtils.getInstance().toJsonString(hzsqdxzRsp);
         log.debug("红字发票下载返回数据:{},{}", jsonString2, LOGGER_MSG);
         return hzsqdxzRsp;
     }
-    
+
     /**
      * 重新赋值红字信息表特殊标识
      */
@@ -1835,7 +1846,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             });
         }
     }
-    
+
     /**
      * 数据导入
      *
@@ -1864,58 +1875,58 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             try {
                 //校验前补充数据
                 //清单项目名称（税控发票修复功能）
-                if(!StringUtils.equals(ConfigurerInfo.INTERFACE_VERSION_V5, interfaceVersion)
-                    && !StringUtils.equals(ConfigurerInfo.INTERFACE_VERSION_V6, interfaceVersion)){
+                if (!StringUtils.equals(ConfigurerInfo.INTERFACE_VERSION_V5, interfaceVersion)
+                        && !StringUtils.equals(ConfigurerInfo.INTERFACE_VERSION_V6, interfaceVersion)) {
                     DdfpxxBO ddfpxx = ddfpzxx.getDDFPXX();
-                    if(Objects.nonNull(ddfpxx)){
+                    if (Objects.nonNull(ddfpxx)) {
                         //补全清单项目名称
-                        if(StringUtils.isBlank(ddfpxx.getQDXMMC()) &&
-                                StringUtils.isNotBlank(ddfpxx.getQDBZ())){
+                        if (StringUtils.isBlank(ddfpxx.getQDXMMC()) &&
+                                StringUtils.isNotBlank(ddfpxx.getQDBZ())) {
                             String qdxmmcConstant = ConfigureConstant.XJXHQD;
                             if (OrderInfoEnum.INVOICE_BILLING_TYPE_1.getKey().equals(ddfpxx.getKPLX())) {
                                 qdxmmcConstant = ConfigureConstant.XJZSXHQD;
                             }
-                            if(StringUtils.equals(OrderInfoEnum.QDBZ_CODE_1.getKey(),ddfpxx.getQDBZ()) ||
-                                    StringUtils.equals(OrderInfoEnum.QDBZ_CODE_3.getKey(),ddfpxx.getQDBZ())){
+                            if (StringUtils.equals(OrderInfoEnum.QDBZ_CODE_1.getKey(), ddfpxx.getQDBZ()) ||
+                                    StringUtils.equals(OrderInfoEnum.QDBZ_CODE_3.getKey(), ddfpxx.getQDBZ())) {
                                 ddfpxx.setQDXMMC(qdxmmcConstant);
                             }
                         }
                         //补全编码表版本号
-                        if(StringUtils.isBlank(ddfpxx.getBMBBBH())){
+                        if (StringUtils.isBlank(ddfpxx.getBMBBBH())) {
                             ddfpxx.setBMBBBH(baseServiceConfig.configBmbbbh());
                         }
-                        
+
                         //如果是全电发票，发票行性质，优惠政策标识需要特殊处理
-                        if(CommonUtils.judgeIsQdfp("", ddfpxx.getFPLXDM())){
+                        if (CommonUtils.judgeIsQdfp("", ddfpxx.getFPLXDM())) {
                             ddfpzxx.getDDMXXX().forEach(ddmxxxBO -> {
                                 //发票行性质
                                 ddmxxxBO.setFPHXZ(CommonUtils.transFphxz(ddmxxxBO.getFPHXZ()));
 
                                 //优惠政策标识、增值税特殊管理、零税率标识
-                                if(StringUtils.isNotBlank(ddmxxxBO.getYHZCBS())){
+                                if (StringUtils.isNotBlank(ddmxxxBO.getYHZCBS())) {
                                     String zzstsgl = CommonUtils.transLocalZzstsgl(ddmxxxBO.getYHZCBS());
                                     //免税和不征税需要设置零税率标识,如其他零税率标识设置为空,
-                                    if(OrderInfoEnum.ORDER_QD_YHZCBS_03.getValue().equals(zzstsgl)){
+                                    if (OrderInfoEnum.ORDER_QD_YHZCBS_03.getValue().equals(zzstsgl)) {
                                         ddmxxxBO.setLSLBS(OrderInfoEnum.LSLBS_1.getKey());
                                         ddmxxxBO.setYHZCBS(OrderInfoEnum.YHZCBS_1.getKey());
                                         ddmxxxBO.setZZSTSGL(zzstsgl);
-                                    } else if(OrderInfoEnum.ORDER_QD_YHZCBS_04.getValue().equals(zzstsgl)){
+                                    } else if (OrderInfoEnum.ORDER_QD_YHZCBS_04.getValue().equals(zzstsgl)) {
                                         ddmxxxBO.setLSLBS(OrderInfoEnum.LSLBS_2.getKey());
                                         ddmxxxBO.setYHZCBS(OrderInfoEnum.YHZCBS_1.getKey());
                                         ddmxxxBO.setZZSTSGL(zzstsgl);
                                     } else {
-                                        if(DecimalCalculateUtil.stringCompare(ConfigureConstant.STRING_000,CommonUtils.formatSl(ddmxxxBO.getSL())) == 0){
+                                        if (DecimalCalculateUtil.stringCompare(ConfigureConstant.STRING_000, CommonUtils.formatSl(ddmxxxBO.getSL())) == 0) {
                                             ddmxxxBO.setLSLBS(OrderInfoEnum.LSLBS_3.getKey());
                                             ddmxxxBO.setYHZCBS(OrderInfoEnum.YHZCBS_0.getKey());
                                             ddmxxxBO.setZZSTSGL("");
-                                        }else {
+                                        } else {
                                             ddmxxxBO.setLSLBS("");
                                             ddmxxxBO.setYHZCBS(OrderInfoEnum.YHZCBS_1.getKey());
                                             ddmxxxBO.setZZSTSGL(zzstsgl);
                                         }
 
                                     }
-                                }else {
+                                } else {
                                     ddmxxxBO.setYHZCBS(OrderInfoEnum.YHZCBS_0.getKey());
                                     ddmxxxBO.setZZSTSGL("");
                                 }
@@ -1926,7 +1937,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 //1.订单发票协议bean数据校验
                 Map<String, String> checkCommonDdffzxx = validateInterfaceOrder.checkCommonDdffzxx(ddfpzxx, sourceType, interfaceVersion);
                 if (!ConfigureConstant.STRING_0000.equals(checkCommonDdffzxx.get(OrderManagementConstant.ERRORCODE))) {
-    
+
                     ddfpdrRsp.setZTDM(checkCommonDdffzxx.get(OrderManagementConstant.ERRORCODE));
                     ddfpdrRsp.setZTXX(" [发票信息第" + (i + 1) + "条] " + checkCommonDdffzxx.get(OrderManagementConstant.ERRORMESSAGE));
                     ddfpdrRspList.add(ddfpdrRsp);
@@ -1934,7 +1945,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                             JsonUtils.getInstance().toJsonStringNullToEmpty(ddfpzxx), JsonUtils.getInstance().toJsonStringNullToEmpty(checkCommonDdffzxx));
                     continue;
                 }
-    
+
                 /*
                  * 校验当前税号数据合法性
                  * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -1949,11 +1960,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         continue;
                     }
                 }
-    
+
                 //请求参数中设置数据库查询的值
                 ddfpzxx = validateInterfaceOrder.setDatabaseValueToddfpzxx(ddfpzxx);
                 DdfpxxBO ddfpxx = ddfpzxx.getDDFPXX();
-    
+
                 /*
                  * 如果数据来源类型是`发票修复`，则根据开票流水号查询订单和发票关系表`order_invoice_info`,
                  * 如果数据存在则调用发票推送接受接口
@@ -1973,12 +1984,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         }
                     }
                 }
-                
+
                 Map<String, Object> paraMap = new HashMap<>(5);
                 paraMap.put(ConfigureConstant.REQUEST_PARAM_FPQQLSH, ddfpxx.getDDQQLSH());
                 paraMap.put(ConfigureConstant.REQUEST_PARAM_DDH, ddfpxx.getDDH());
                 paraMap.put(ConfigureConstant.REQUEST_PARAM_TQM, ddfpxx.getTQM());
-                
+
                 //2.查询订单处理表，判断导入数据是否已存在
                 List<OrderProcessInfo> orderProcessInfos = orderProcessService.selectOrderProcessByFpqqlshDdhNsrsbh(paraMap, shList);
                 if (CollectionUtil.isEmpty(orderProcessInfos)) {
@@ -2001,7 +2012,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         /*
                          * 订单业务bean
                          */
-                        List<OrderInfo> insertOrder = buildOrderInfo(ddfpzxx, sourceType, terminalCode,entId,qdfwlx);
+                        List<OrderInfo> insertOrder = buildOrderInfo(ddfpzxx, sourceType, terminalCode, entId, qdfwlx);
 
                         /**
                          * 全电发票业务bean
@@ -2016,7 +2027,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                          * 批量开票bean
                          */
                         List<InvoiceBatchRequest> transitionBatchRequest = buildInvoiceBatchRequest(ddfpxx, terminalCode);
-    
+
                         /*
                          * 发票批量开票明细bean
                          */
@@ -2044,12 +2055,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                          */
                         List<OrderInvoiceInfo> insertInvoiceInfo = buildOrderInvoiceInfo(ddfpxx, insertOrder.get(0), insertProcessInfo.get(0),
                                 insertBatchItem.get(0).get(0), terminalCode, qdfwlx);
-    
+
                         /*
                          * 原始订单到最终订单的关系bean
                          */
                         List<OrderOriginExtendInfo> originExtendList = buildOrderOriginExtendInfo(insertOrder.get(0));
-    
+
                         //4.调用保存接口
                         apiInvoiceCommonService.saveHistoryData(transitionBatchRequest, insertOrder, insertOrderInfoQd,
                                 insertOrderItem, insertProcessInfo, insertBatchItem, insertInvoiceInfo, obr,
@@ -2070,8 +2081,8 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         return ddfpdrRspList;
     }
-    
-    
+
+
     /**
      * 京东数据导入
      *
@@ -2100,24 +2111,24 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             try {
                 //校验前补充数据
                 //清单项目名称（税控发票修复功能）
-                if(!StringUtils.equals(ConfigurerInfo.INTERFACE_VERSION_V5, interfaceVersion)
-                    && !StringUtils.equals(ConfigurerInfo.INTERFACE_VERSION_V6, interfaceVersion)){
+                if (!StringUtils.equals(ConfigurerInfo.INTERFACE_VERSION_V5, interfaceVersion)
+                        && !StringUtils.equals(ConfigurerInfo.INTERFACE_VERSION_V6, interfaceVersion)) {
                     DdfpxxBO ddfpxx = ddfpzxx.getDDFPXX();
-                    if(Objects.nonNull(ddfpxx)){
+                    if (Objects.nonNull(ddfpxx)) {
                         //补全清单项目名称
-                        if(StringUtils.isBlank(ddfpxx.getQDXMMC()) &&
-                                StringUtils.isNotBlank(ddfpxx.getQDBZ())){
+                        if (StringUtils.isBlank(ddfpxx.getQDXMMC()) &&
+                                StringUtils.isNotBlank(ddfpxx.getQDBZ())) {
                             String qdxmmcConstant = ConfigureConstant.XJXHQD;
                             if (OrderInfoEnum.INVOICE_BILLING_TYPE_1.getKey().equals(ddfpxx.getKPLX())) {
                                 qdxmmcConstant = ConfigureConstant.XJZSXHQD;
                             }
-                            if(StringUtils.equals(OrderInfoEnum.QDBZ_CODE_1.getKey(),ddfpxx.getQDBZ()) ||
-                                    StringUtils.equals(OrderInfoEnum.QDBZ_CODE_3.getKey(),ddfpxx.getQDBZ())){
+                            if (StringUtils.equals(OrderInfoEnum.QDBZ_CODE_1.getKey(), ddfpxx.getQDBZ()) ||
+                                    StringUtils.equals(OrderInfoEnum.QDBZ_CODE_3.getKey(), ddfpxx.getQDBZ())) {
                                 ddfpxx.setQDXMMC(qdxmmcConstant);
                             }
                         }
                         //补全编码表版本号
-                        if(StringUtils.isBlank(ddfpxx.getBMBBBH())){
+                        if (StringUtils.isBlank(ddfpxx.getBMBBBH())) {
                             ddfpxx.setBMBBBH(baseServiceConfig.configBmbbbh());
                         }
                     }
@@ -2125,7 +2136,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 //1.订单发票协议bean数据校验
                 Map<String, String> checkCommonDdffzxx = validateInterfaceOrder.checkCommonDdffzxxForJd(ddfpzxx, sourceType, interfaceVersion);
                 if (!ConfigureConstant.STRING_0000.equals(checkCommonDdffzxx.get(OrderManagementConstant.ERRORCODE))) {
-                    
+
                     ddfpdrRsp.setZTDM(checkCommonDdffzxx.get(OrderManagementConstant.ERRORCODE));
                     ddfpdrRsp.setZTXX(" [发票信息第" + (i + 1) + "条] " + checkCommonDdffzxx.get(OrderManagementConstant.ERRORMESSAGE));
                     ddfpdrRspList.add(ddfpdrRsp);
@@ -2133,7 +2144,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                             JsonUtils.getInstance().toJsonStringNullToEmpty(ddfpzxx), JsonUtils.getInstance().toJsonStringNullToEmpty(checkCommonDdffzxx));
                     continue;
                 }
-                
+
                 /*
                  * 校验当前税号数据合法性
                  * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -2148,17 +2159,17 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         continue;
                     }
                 }
-                
+
                 //请求参数中设置数据库查询的值
                 ddfpzxx = validateInterfaceOrder.setDatabaseValueToddfpzxx(ddfpzxx);
                 DdfpxxBO ddfpxx = ddfpzxx.getDDFPXX();
-                
-                
+
+
                 Map<String, Object> paraMap = new HashMap<>(5);
                 paraMap.put(ConfigureConstant.REQUEST_PARAM_FPQQLSH, ddfpxx.getDDQQLSH());
                 paraMap.put(ConfigureConstant.REQUEST_PARAM_DDH, ddfpxx.getDDH());
                 paraMap.put(ConfigureConstant.REQUEST_PARAM_TQM, ddfpxx.getTQM());
-                
+
                 //2.查询订单处理表，判断导入数据是否已存在
                 List<OrderProcessInfo> orderProcessInfos = orderProcessService.selectOrderProcessByFpqqlshDdhNsrsbh(paraMap, shList);
                 if (CollectionUtil.isEmpty(orderProcessInfos)) {
@@ -2181,12 +2192,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         /*
                          * 订单业务bean
                          */
-                        List<OrderInfo> insertOrder = buildOrderInfo(ddfpzxx, sourceType, terminalCode,entId,qdfwlx);
+                        List<OrderInfo> insertOrder = buildOrderInfo(ddfpzxx, sourceType, terminalCode, entId, qdfwlx);
                         /*
                          * 订单明细业务bean
                          */
                         List<List<OrderItemInfo>> insertOrderItem = buildOrderItemInfo(ddfpzxx, insertOrder.get(0));
-                        
+
                         //京东数据需要做价税分离
                         CommonOrderInfo commonOrderInfo = new CommonOrderInfo();
                         commonOrderInfo.setOrderInfo(insertOrder.get(0));
@@ -2200,15 +2211,15 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         CommonOrderInfo taxSeparationService = PriceTaxSeparationUtilNew.taxSeparationService(commonOrderInfo, config);
                         insertOrder.clear();
                         insertOrder.add(taxSeparationService.getOrderInfo());
-                        
+
                         insertOrderItem.clear();
                         insertOrderItem.add(taxSeparationService.getOrderItemInfo());
-    
+
                         /*
                          * 批量开票bean
                          */
                         List<InvoiceBatchRequest> transitionBatchRequest = buildInvoiceBatchRequest(ddfpxx, terminalCode);
-                        
+
                         /*
                          * 发票批量开票明细bean
                          */
@@ -2236,12 +2247,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                          */
                         List<OrderInvoiceInfo> insertInvoiceInfo = buildOrderInvoiceInfo(ddfpxx, insertOrder.get(0), insertProcessInfo.get(0),
                                 insertBatchItem.get(0).get(0), terminalCode, qdfwlx);
-                        
+
                         /*
                          * 原始订单到最终订单的关系bean
                          */
                         List<OrderOriginExtendInfo> originExtendList = buildOrderOriginExtendInfo(insertOrder.get(0));
-                        
+
                         //4.调用保存接口
                         apiInvoiceCommonService.saveHistoryData(transitionBatchRequest, insertOrder, null, insertOrderItem, insertProcessInfo,
                                 insertBatchItem, insertInvoiceInfo, obr, originExtendList, ddfpxx.getPDFZJL(), ddfpxx.getZJLLX(), shList);
@@ -2261,7 +2272,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         return ddfpdrRspList;
     }
-    
+
     @Override
     public SpxxcxRspBO queryCommodityMessage(SpxxcxReqBO spxxcxReq, String secretId) {
         SpxxcxRspBO spxxcxRsp = SpxxcxRspBO.build(OrderInfoContentEnum.COMMODITY_MESSAGE_QUERY_SUCCESS);
@@ -2291,7 +2302,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return spxxcxRsp;
                 }
             }
-            
+
             //2.请求参数的转换
             Map<String, Object> param = new HashMap<>(5);
             param.put(ConfigureConstant.STRING_PAGE_SIZE, spxxcxReq.getGS());
@@ -2305,8 +2316,8 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             //销货方纳税人名称
             param.put("qymc", spxxcxReq.getXHFMC());
             param.put("fuzzyQuery", InterfaceServiceImplV3.FUZZY_QUERY_NO_FLAG);
-    
-    
+
+
             //3.按照纳税人识别号查询
             PageUtils pageUtils = commodityService.queryCommodityList(param, shList);
             List<SpxxBO> spxxCommonList = new ArrayList<>();
@@ -2329,7 +2340,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         return spxxcxRsp;
     }
-    
+
     @Override
     public List<SpxxtbRspBO> syncCommodityMessage(List<SpxxtbReqBO> spxxtbReqList, String secretId) {
         log.info("{}同步商品信息接收参数：{}", LOGGER_MSG_V4, spxxtbReqList);
@@ -2345,14 +2356,14 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             //初始化返回参数对象
             SpxxtbRspBO.initResponse(spxxtbReq, spxxtbRsp);
             try {
-    
+
                 //2.请求协议bean转换
                 CommodityCodeEntity commodityCodeEntity = BeanTransitionUtils.transitionCommodityCodeEntity(spxxtbReq);
                 commodityCodeEntity.setId(baseService.getGenerateShotKey());
-    
+
                 List<CommodityCodeEntity> commodityCodeEntityList = new ArrayList<>();
                 commodityCodeEntityList.add(commodityCodeEntity);
-    
+
                 //1.请求参数校验
                 List<Map<String, String>> verifyCommodityMap = verifyCommodityCodeService.checkCommodityParams(commodityCodeEntityList, ConfigureConstant.STRING_0, 0);
                 if (ObjectUtil.isNotEmpty(verifyCommodityMap)) {
@@ -2370,7 +2381,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     spxxtbRspList.add(spxxtbRsp);
                     continue;
                 }
-    
+
                 /*
                  * 校验当前税号数据合法性
                  * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -2385,12 +2396,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         continue;
                     }
                 }
-    
-    
+
+
                 if (StringUtils.isNotBlank(commodityCodeEntity.getSl()) && commodityCodeEntity.getSl().contains(ConfigureConstant.STRING_PERCENT)) {
                     commodityCodeEntity.setSl(CommonUtils.formatSl(commodityCodeEntity.getSl()));
                 }
-    
+
                 //3.根据操作类型，调用DAO层同步数据库
                 R r = commodityService.syncCommodity(commodityCodeEntity, spxxtbReq.getCZLX());
                 spxxtbRsp.setZTDM(String.valueOf(r.get(OrderManagementConstant.CODE)));
@@ -2403,7 +2414,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         return spxxtbRspList;
     }
-    
+
     @Override
     public GmfxxcxRspBO queryBuyerMessage(GmfxxcxReqBO gmfxxcxReq, String secretId) {
         log.info("{}查询购买方信息接收参数：{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(gmfxxcxReq));
@@ -2434,7 +2445,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return gmfxxcxRsp;
                 }
             }
-            
+
             //2.组装查询数据
             //组装参数
             Map<String, Object> param = new HashMap<>(5);
@@ -2453,7 +2464,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             List<String> shList = new ArrayList<>();
             shList.add(gmfxxcxReq.getXHFSBH());
             param.put("fuzzyQuery", InterfaceServiceImplV3.FUZZY_QUERY_NO_FLAG);
-    
+
             //3.查询购买方信息
             PageUtils pageUtils = buyerService.queryBuyerList(param, shList);
             List<BuyerEntity> buyerEntityList = (List<BuyerEntity>) pageUtils.getList();
@@ -2476,7 +2487,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         return gmfxxcxRsp;
     }
-    
+
     @Override
     public List<GmfxxtbRspBO> syncBuyerMessage(List<GmfxxtbReqBO> gmfxxtbReqList, String secretId) {
         log.info("{}同步购买方信息接收参数：{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(gmfxxtbReqList));
@@ -2522,10 +2533,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         continue;
                     }
                 }
-    
+
                 //2.请求协议bean转换
                 BuyerEntity buyerEntity = BeanTransitionUtils.transitionBuyerEntity(gmfxxtbReq);
-    
+
                 //3.根据操作类型，调用DAO层同步数据库
                 R r = buyerService.syncBuyer(buyerEntity, gmfxxtbReq.getCZLX());
                 gmfxxtbRsp.setZTDM(String.valueOf(r.get(OrderManagementConstant.CODE)));
@@ -2538,19 +2549,19 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         return gmfxxtbRspList;
     }
-    
-    
+
+
     @Override
     public List<SksbxxtbRspBO> syncTaxEquipmentInfo(List<SksbxxtbReqBO> sksbxxtbReqList, String secretId) {
         log.info("{}同步税控设备信息接收参数：{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(sksbxxtbReqList));
         List<SksbxxtbRspBO> sksbxxtbRsps = CollectionUtil.newArrayList();
-        
+
         if (ObjectUtil.isEmpty(sksbxxtbReqList)) {
             SksbxxtbRspBO sksbxxtbRsp = SksbxxtbRspBO.build(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193001);
             sksbxxtbRsps.add(sksbxxtbRsp);
             return sksbxxtbRsps;
         }
-        
+
         for (SksbxxtbReqBO sksbxxtbReq : sksbxxtbReqList) {
             SksbxxtbRspBO sksbxxtbRsp = SksbxxtbRspBO.build(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193000);
             sksbxxtbRsp.setXHFSBH(sksbxxtbReq.getXHFSBH());
@@ -2568,7 +2579,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     sksbxxtbRsps.add(sksbxxtbRsp);
                     continue;
                 }
-    
+
                 /*
                  * 校验当前税号数据合法性
                  * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -2583,7 +2594,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         continue;
                     }
                 }
-    
+
                 DeptEntity sysDeptEntity = userInfoService.querySysDeptEntityFromUrl(sksbxxtbReq.getXHFSBH(), sksbxxtbReq.getXHFMC(), sksbxxtbReq.getENTID());
                 if (ObjectUtil.isEmpty(sysDeptEntity)) {
                     log.error("{}无法获取当前税号的销方信息，税号：{}", LOGGER_MSG, sksbxxtbReq.getXHFSBH());
@@ -2592,29 +2603,29 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     sksbxxtbRsps.add(sksbxxtbRsp);
                     continue;
                 }
-    
+
                 //2.请求协议bean转换
                 TaxEquipmentInfo taxEquipmentInfo = BeanTransitionUtils.transitionTaxEquipment(sksbxxtbReq);
-    
+
                 //3.根据操作类型，调用DAO层同步数据库
-    
+
                 //查询当前税号是否已经存在
                 TaxEquipmentInfo taxEquipmentInfo1 = simsBackService.queryTaxEquipment(taxEquipmentInfo.getXhfNsrsbh(), taxEquipmentInfo.getEnterpriseNumbers());
-    
+
                 boolean insert = false;
                 if (ObjectUtil.isNull(taxEquipmentInfo1) || StringUtils.isBlank(taxEquipmentInfo.getSksbCode())) {
                     if (ConfigureConstant.STRING_2.equals(sksbxxtbReq.getCZLX())) {
                         sksbxxtbRsp.setZTDM(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193016.getKey());
                         sksbxxtbRsp.setZTXX(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193016.getMessage());
                     } else {
-    
+
                         taxEquipmentInfo.setDeleted(OrderInfoEnum.DATE_DELETE_STATUS_0.getKey());
                         insert = true;
-    
+
                     }
-    
+
                 }
-    
+
                 R r = simsBackService.syncTaxEquipment(taxEquipmentInfo);
                 if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE)) || ConfigureConstant.STRING_9000.equals(r.get(OrderManagementConstant.CODE))) {
                     sksbxxtbRsp.setZTDM(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193000.getKey());
@@ -2627,18 +2638,18 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         sksbxxtbRsp.setZTDM(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193014.getKey());
                         sksbxxtbRsp.setZTXX(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193014.getMessage());
                     }
-    
+
                 }
-    
+
                 if (OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193000.getKey().equals(sksbxxtbRsp.getZTDM())) {
-        
+
                     /**
                      * 自动初始化企业信息
                      */
                     enterpriseConfigService.autoConfigEnterprise(taxEquipmentInfo.getXhfNsrsbh(), taxEquipmentInfo.getXhfMc(), taxEquipmentInfo.getEnterpriseNumbers());
                 }
-    
-    
+
+
             } catch (Exception e) {
                 log.error("{}同步税控设备信息异常：{}", LOGGER_MSG_V4, e);
                 SksbxxtbRspBO.build(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193014);
@@ -2647,7 +2658,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         return sksbxxtbRsps;
     }
-    
+
     /**
      * 发票余量信息查询
      *
@@ -2659,14 +2670,14 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
     public List<FpylcxRspBO> queryInvoiceStore(FpylcxReqBO fpylcxReq, String secretId) {
         log.info("{}查询发票余量信息接收参数：{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(fpylcxReq));
         List<FpylcxRspBO> fpylcxRsps = CollectionUtil.newArrayList();
-        
-        
+
+
         try {
             //1.校验请求参数
             Map<String, String> checkResultMap = new HashMap<>(10);
             String successCode = OrderInfoContentEnum.SUCCESS.getKey();
             checkResultMap.put(OrderManagementConstant.ERRORCODE, successCode);
-            
+
             //销货方纳税人识别号
             checkResultMap = CheckParamUtil.checkNsrsbhParam(OrderInfoContentEnum.QUERY_INVOICE_STORE_194001,
                     OrderInfoContentEnum.QUERY_INVOICE_STORE_194003, fpylcxReq.getXHFSBH());
@@ -2677,7 +2688,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 fpylcxRsps.add(fpylcxRsp);
                 return fpylcxRsps;
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -2692,7 +2703,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     return fpylcxRsps;
                 }
             }
-    
+
             TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(fpylcxReq.getXHFSBH(), fpylcxReq.getENTID());
             if (ObjectUtil.isNull(taxEquipmentInfo) || StringUtils.isBlank(taxEquipmentInfo.getSksbCode())) {
                 log.warn("{}企业未配置税控设备,税号:{}", LOGGER_MSG, fpylcxReq.getXHFSBH());
@@ -2702,7 +2713,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 fpylcxRsps.add(fpylcxRsp);
                 return fpylcxRsps;
             }
-           
+
             CountToB countToB = new CountToB();
             countToB.setTaxpayerCode(fpylcxReq.getXHFSBH());
             countToB.setNsrmc(taxEquipmentInfo.getXhfMc());
@@ -2722,7 +2733,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     fpylcxRsp.setQDFPYL(countSurplusVO.getQdfpyl());
                     fpylcxRsps.add(fpylcxRsp);
                 }
-    
+
             } else {
                 log.error("{}查询发票余量失败:{}", LOGGER_MSG_V4,
                         JsonUtils.getInstance().toJsonStringNullToEmpty(fpylcxReq));
@@ -2742,7 +2753,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         }
         return fpylcxRsps;
     }
-    
+
     /**
      * UKey企业初始化信息查询接口
      *
@@ -2752,10 +2763,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      */
     @Override
     public QyztcxRspBO getEnterpriseStatus(QyztcxReqBO qyztcxReq, String secretId) {
-        
+
         log.debug("{}企业初始化状态信息查询接收参数：{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(qyztcxReq));
         QyztcxRspBO qyztcxRsp = QyztcxRspBO.build(OrderInfoContentEnum.GET_ENTERPRISE_STATUS_000000);
-        
+
         try {
             //1.校验请求参数
             Map<String, String> checkResultMap = new HashMap<>(10);
@@ -2767,7 +2778,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (!successCode.equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
                 throw new OrderReceiveException(checkResultMap.get(OrderManagementConstant.ERRORCODE), checkResultMap.get(OrderManagementConstant.ERRORMESSAGE));
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -2779,18 +2790,18 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.GET_ENTERPRISE_STATUS_195004.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-    
+
             String terminalCode = simsBackService.getTerminalCode(qyztcxReq.getNSRSBH(), null);
-            
+
             if (!OrderInfoEnum.TAX_EQUIPMENT_UKEY.getKey().equals(terminalCode)) {
                 throw new OrderReceiveException(OrderInfoContentEnum.GET_ENTERPRISE_STATUS_195004);
             }
-            
+
             QyztcxRequest qyztcxRequest = new QyztcxRequest();
             qyztcxRequest.setNsrsbh(qyztcxReq.getNSRSBH());
-    
+
             Qyztxx enterpriseStatus = HttpInvoiceRequestUtil.getEnterpriseStatusForUkey(invoiceConfig.configQueryTaxpayerInit(), qyztcxRequest, terminalCode);
-    
+
             QyztxxBO qyztxxBo = new QyztxxBO();
             qyztxxBo.setNSRSBH(qyztcxReq.getNSRSBH());
             String code = enterpriseStatus.getQyztdm();
@@ -2810,7 +2821,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             qyztxxBo.setQYZTDM(code);
             qyztxxBo.setQYZTMS(enterpriseStatus.getQyztms());
             qyztcxRsp.setQYZTXX(qyztxxBo);
-    
+
         } catch (OrderReceiveException orderReceiveException) {
             log.error("{}企业初始化状态信息查询异常：{}", LOGGER_MSG_V4, orderReceiveException);
             qyztcxRsp.setZTDM(orderReceiveException.getCode());
@@ -2822,7 +2833,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}企业初始化状态信息查询结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(qyztcxRsp));
         return qyztcxRsp;
     }
-    
+
     /**
      * UKey清卡信息查询接口
      *
@@ -2832,10 +2843,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      */
     @Override
     public QkztcxRspBO getCleanCardStatus(QkztcxReqBO qkztcxReq, String secretId) {
-        
+
         log.debug("{}清卡状态信息查询接收参数:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(qkztcxReq));
         QkztcxRspBO qkztcxRsp = QkztcxRspBO.build(OrderInfoContentEnum.GET_CLEAN_CARD_STATUS_000000);
-        
+
         try {
             //1.校验请求参数
             Map<String, String> checkResultMap = new HashMap<>(10);
@@ -2847,7 +2858,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (!successCode.equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
                 throw new OrderReceiveException(checkResultMap.get(OrderManagementConstant.ERRORCODE), checkResultMap.get(OrderManagementConstant.ERRORMESSAGE));
             }
-            
+
             //发票类型代码
             checkResultMap = CheckParamUtil.checkParam(OrderInfoContentEnum.INVOICE_HEAD_INFO_FPLXDM_ERROR_144038, qkztcxReq.getFPLXDM());
             if (!successCode.equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
@@ -2857,7 +2868,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (CommonUtils.checkFpzldm(qkztcxReq.getFPLXDM())) {
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_HEAD_INFO_FPLXDM_ERROR_144039);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -2869,20 +2880,20 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_HEAD_INFO_FPLXDM_ERROR_144039.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-    
+
             String terminalCode = simsBackService.getTerminalCode(qkztcxReq.getNSRSBH(), null);
-            
+
             if (!OrderInfoEnum.TAX_EQUIPMENT_UKEY.getKey().equals(terminalCode)) {
                 throw new OrderReceiveException(OrderInfoContentEnum.GET_CLEAN_CARD_STATUS_205004);
             }
-            
+
             QkztcxRequest qkztcxRequest = new QkztcxRequest();
             qkztcxRequest.setNsrsbh(qkztcxReq.getNSRSBH());
             qkztcxRequest.setFpzldm(CommonUtils.transFpzldm(qkztcxReq.getFPLXDM()));
-    
+
             QkztcxResponse cleanCardStatus = HttpInvoiceRequestUtil.getCleanCardStatusForUkey(invoiceConfig.configQueryQkzt(), qkztcxRequest, terminalCode);
-    
-    
+
+
             List<QkztxxBO> qkztxxBOList = new ArrayList<>();
             if (ConfigureConstant.STRING_0000.equals(cleanCardStatus.getCode())) {
                 for (Qkztxx qkztxx1 : cleanCardStatus.getResult()) {
@@ -2902,13 +2913,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     qkztxx.setQKZTMS(qkztxx1.getQkztms());
                     qkztxxBOList.add(qkztxx);
                 }
-    
+
                 qkztcxRsp.setQKZTXX(qkztxxBOList);
             } else {
                 throw new OrderReceiveException(cleanCardStatus.getCode(), cleanCardStatus.getMsg());
             }
-    
-    
+
+
         } catch (OrderReceiveException orderReceiveException) {
             log.error("{}清卡状态信息查询异常：{}", LOGGER_MSG_V4, orderReceiveException);
             qkztcxRsp.setZTDM(orderReceiveException.getCode());
@@ -2920,7 +2931,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}清卡状态信息查询结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(qkztcxRsp));
         return qkztcxRsp;
     }
-    
+
     /**
      * UKey设备在线状态查询接口
      *
@@ -2930,10 +2941,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      */
     @Override
     public SbzxztcxRspBO getOnLineStatus(SbzxztcxReqBO sbzxztcxReq, String secretId) {
-        
+
         log.debug("{}设备在线状态信息查询接收参数:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(sbzxztcxReq));
         SbzxztcxRspBO sbzxztcxRsp = SbzxztcxRspBO.build(OrderInfoContentEnum.GET_ON_LINE_STATUS_000000);
-        
+
         try {
             //1.校验请求参数
             Map<String, String> checkResultMap = new HashMap<>(10);
@@ -2945,7 +2956,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (!successCode.equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
                 throw new OrderReceiveException(checkResultMap.get(OrderManagementConstant.ERRORCODE), checkResultMap.get(OrderManagementConstant.ERRORMESSAGE));
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -2957,19 +2968,19 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.GET_ON_LINE_STATUS_215004.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-    
+
             String terminalCode = simsBackService.getTerminalCode(sbzxztcxReq.getNSRSBH(), null);
-            
+
             if (!OrderInfoEnum.TAX_EQUIPMENT_UKEY.getKey().equals(terminalCode)) {
                 throw new OrderReceiveException(OrderInfoContentEnum.GET_ON_LINE_STATUS_215004);
             }
-            
+
             SbzxztcxRequest sbzxztcxRequest = new SbzxztcxRequest();
             sbzxztcxRequest.setNsrsbh(sbzxztcxReq.getNSRSBH());
-    
+
             SbzxztcxResponse onLineStatus = HttpInvoiceRequestUtil.getOnLineStatusForUkey(invoiceConfig.configQuerySbzxztcx(), sbzxztcxRequest, terminalCode);
-    
-    
+
+
             List<SbzxztxxBO> sbzxztxxBOList = new ArrayList<>();
             if (ConfigureConstant.STRING_0000.equals(onLineStatus.getCode())) {
                 for (Sbzxztxx sbzxztxx : onLineStatus.getResult()) {
@@ -2988,13 +2999,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     sbzxztxxBO.setSBZXZTMS(sbzxztxx.getZxztms());
                     sbzxztxxBOList.add(sbzxztxxBO);
                 }
-    
+
                 sbzxztcxRsp.setSBZXZTXX(sbzxztxxBOList);
             } else {
                 throw new OrderReceiveException(onLineStatus.getCode(), onLineStatus.getMsg());
             }
-    
-    
+
+
         } catch (OrderReceiveException orderReceiveException) {
             log.error("{}设备在线状态信息查询异常：{}", LOGGER_MSG_V4, orderReceiveException);
             sbzxztcxRsp.setZTDM(orderReceiveException.getCode());
@@ -3006,7 +3017,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}设备在线状态信息查询结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(sbzxztcxRsp));
         return sbzxztcxRsp;
     }
-    
+
     @Override
     public QyxjRspBO takeDownTaxDisk(List<QyxjReqBO> qyxjReqBOList, String secretId) {
         log.debug("{}企业下架接口,请求参数:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(qyxjReqBOList));
@@ -3040,9 +3051,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         throw new OrderReceiveException(checkResultMap.get(OrderManagementConstant.ERRORCODE),
                                 indexStr + checkResultMap.get(OrderManagementConstant.ERRORMESSAGE));
                     }
-                    
+
                 }
-                
+
                 /*
                  * 校验当前税号数据合法性
                  * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -3055,7 +3066,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                                 OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                     }
                 }
-    
+
                 String terminalCode = simsBackService.getTerminalCode(qyxjReqBo.getNSRSBH(), null);
                 if (!OrderInfoEnum.TAX_EQUIPMENT_A9.getKey().equals(terminalCode) &&
                         !OrderInfoEnum.TAX_EQUIPMENT_UKEY.getKey().equals(terminalCode) &&
@@ -3065,18 +3076,18 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                             indexStr + OrderInfoContentEnum.TAKEDOWN_TAX_DISK_000005.getMessage());
                 }
             }
-            
+
             // 2.请求协议bean转换
             List<QyxjRequest> qyxjRequestList = new ArrayList<>(qyxjReqBOList.size());
             qyxjReqBOList.forEach(qyxjReqBO -> {
-    
+
                 QyxjRequest qyxjRequest = new QyxjRequest();
                 qyxjRequest.setXhfNsrsbh(qyxjReqBO.getNSRSBH());
                 qyxjRequest.setSjzt(qyxjReqBO.getQYZT());
                 qyxjRequest.setJqbh(qyxjReqBO.getJQBH());
                 qyxjRequestList.add(qyxjRequest);
             });
-    
+
             // 3.调用销项后台 `企业下架接口`
             String url = baseServiceConfig.configTakeDownTaxDisk();
             String requestData = JsonUtils.getInstance().toJsonString(qyxjRequestList);
@@ -3085,7 +3096,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             log.debug("{}调用销项后台企业下架接口,URL为:{},入参:{}", LOGGER_MSG, url, requestData);
             String result = HttpUtils.doPostWithHeader(url, requestData, headMap);
             log.debug("{}调用销项后台企业下架接口,出参:{}", LOGGER_MSG, result);
-    
+
             if (StringUtils.isNotBlank(result)) {
                 QyxjResponse qyxjResponse = JsonUtils.getInstance().parseObject(result, QyxjResponse.class);
                 if (ConfigureConstant.STRING_0000.equals(qyxjResponse.getCode())) {
@@ -3124,7 +3135,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}企业下架接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(qyxjRspBo));
         return qyxjRspBo;
     }
-    
+
     @Override
     public JsfpslRspBO receiveInvoiceApplication(JsfpslReqBO jsfpslReqBO, String secretId) {
         log.debug("{}发票申领结果接收接口,请求参数:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(jsfpslReqBO));
@@ -3182,7 +3193,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                             OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-    
+
             /*
              * 2. 协议Bean转换
              */
@@ -3195,7 +3206,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             fpslInfo.setCreateTime(DateUtil.format(new Date(), ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S));
             fpslInfo.setUpdateTime(DateUtil.format(new Date(), ConfigureConstant.DATE_FORMAT_DATE_Y_M_DH_M_S));
             fpsljgjsRequest.setFpslInfo(fpslInfo);
-    
+
             List<PyxxBO> pyxxList = jsfpslReqBO.getPYXX();
             if (CollectionUtil.isNotEmpty(pyxxList)) {
                 pyxxList.forEach(pyxxBO -> {
@@ -3208,7 +3219,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 });
             }
             fpsljgjsRequest.setFpslItemInfoList(fpslItemInfoList);
-    
+
             /*
              * 3. 请求销项后台 发票申领结果接收接口
              */
@@ -3238,7 +3249,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}发票申领结果接收接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(jsfpslRspBO));
         return jsfpslRspBO;
     }
-    
+
     @Override
     public SksbxxCxRspBO queryTaxpayerInfo(SksbxxCxReqBO sksbxxCxReqBO, String secretId) {
         log.debug("{}设备信息查询口,请求参数:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(sksbxxCxReqBO));
@@ -3279,7 +3290,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     !StringUtils.equals(OrderInfoEnum.ESC_QYLX_3.getKey(), sksbxxCxReqBO.getESCBS())) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYTAXPAYERINFO_000005);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -3291,13 +3302,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.QUERYTAXPAYERINFO_000005.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             /*
              * 2. 请求协议bean转换
              */
             TaxpayerInfoRequest taxpayerInfoRequest = new TaxpayerInfoRequest();
             BeanUtils.copyProperties(sksbxxCxReqBO, taxpayerInfoRequest);
-            
+
             /*
              * 3. 获取设备信息
              */
@@ -3362,7 +3373,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}设备信息查询口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(sksbxxCxRspBO));
         return sksbxxCxRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public ResponseV4BO printInvoice(FpdyReqBO fpdyReqBO, String secretId) {
@@ -3464,7 +3475,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.PRINTINVOICE_000010.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             // 2.请求协议bean转换
             DyRequest dyRequest = new DyRequest();
             dyRequest.setNsrsbh(fpdyReqBO.getNSRSBH());
@@ -3483,7 +3494,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 invoicePrintPackageDetailList.add(dyRequestExtend);
             });
             dyRequest.setInvoicePrintPackageDetailList(invoicePrintPackageDetailList);
-    
+
             // 3.调用税控 `发票打印接口`
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(fpdyReqBO.getNSRSBH(), fpdyReqBO.getENTID());
@@ -3492,11 +3503,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 throw new OrderReceiveException(OrderInfoContentEnum.COMMON_ERROR);
             }
             String sh = fpdyReqBO.getNSRSBH();
-           
+
             DyResponse dyResponse = new DyResponse();
             String fgSkKpShList = baseServiceConfig.getFgSkKpShList();
-    
-            if (CommonUtils.judgeIsFgTerminalOld(terminalCode,fgSkKpShList,sh)) {
+
+            if (CommonUtils.judgeIsFgTerminalOld(terminalCode, fgSkKpShList, sh)) {
                 //新增校验,验证方格客户端是否在线,如果不在线直接返回异常
                 boolean subscriptions = unifyService.querySpzxzt(fpdyReqBO.getNSRSBH(),
                         invoicePrintPackageDetailList.get(0).getFjh(), terminalCode);
@@ -3527,32 +3538,32 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     //设置为待打印
                     printInfo.setFgStatus(ConfigureConstant.STRING_2);
                     fangGeService.saveInvoicePrintInfo(printInfo);
-    
+
                     //如果为调用税控版本的方格,需要调用税控接口,如果为订单的需要发送指令
-                    if(CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)){
-        
+                    if (CommonUtils.judgeIsFgTerminalNew(terminalCode, fgSkKpShList, sh)) {
+
                         String fgInvoicePrint = invoiceConfig.configFgInvoicePrint();
-        
+
                         dyRequest.setInvoicePrintPackageDetailList(invoicePrintPackageDetailList);
-        
-                        dyResponse = HttpInvoiceRequestUtil.batchPrint(fgInvoicePrint, dyRequest, terminalCode,fgSkKpShList,sh);
-        
+
+                        dyResponse = HttpInvoiceRequestUtil.batchPrint(fgInvoicePrint, dyRequest, terminalCode, fgSkKpShList, sh);
+
                         String statusCode = dyResponse.getCode();
                         String statusMsg = dyResponse.getMsg();
-        
+
                         dyResponse.setCode(statusCode);
                         dyResponse.setMsg(statusMsg);
-        
-        
-                    }else{
-        
+
+
+                    } else {
+
                         //存放打印信息到redis队列
                         fangGeService.saveMqttToRedis(dyRequestExtend.getNsrsbh(), dyRequestExtend.getFjh(),
-                                OrderInfoEnum.FANGGE_INTERFACE_TYPE_5.getKey(), printInfo.getFpdypch(),false);
+                                OrderInfoEnum.FANGGE_INTERFACE_TYPE_5.getKey(), printInfo.getFpdypch(), false);
                         //消费下一条数据
                         fangGeService.handleRedisMsg(dyRequestExtend.getNsrsbh(), dyRequestExtend.getFjh());
                     }
-                    
+
                 }
                 dyResponse.setCode(OrderInfoContentEnum.PRINT_INVOICE_0000.getKey());
                 dyResponse.setMsg(OrderInfoContentEnum.PRINT_INVOICE_0000.getMessage());
@@ -3564,7 +3575,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 } else if (CommonUtils.judgeNewInterface(terminalCode)) {
                     requestUrl = invoiceConfig.configPrintInvoiceInfo();
                 }
-                dyResponse = HttpInvoiceRequestUtil.batchPrint(requestUrl, dyRequest, terminalCode, fgSkKpShList,sh);
+                dyResponse = HttpInvoiceRequestUtil.batchPrint(requestUrl, dyRequest, terminalCode, fgSkKpShList, sh);
             }
 
             if (ConfigureConstant.STRING_0000.equals(dyResponse.getCode())) {
@@ -3596,7 +3607,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}发票打印接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(responseV4BO));
         return responseV4BO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public DyjcxRspBO queryPrinter(DyjcxReqBO dyjcxReqBO, String secretId) {
@@ -3629,7 +3640,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.QUERYPRINTER_000004.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             // 3.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(dyjcxReqBO.getNSRSBH(), dyjcxReqBO.getENTID());
@@ -3641,8 +3652,8 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
 
             //3.调用税控接口
             String fgSkKpShList = baseServiceConfig.getFgSkKpShList();
-    
-            if(CommonUtils.judgeIsFgTerminalOld(terminalCode,fgSkKpShList,sh)){
+
+            if (CommonUtils.judgeIsFgTerminalOld(terminalCode, fgSkKpShList, sh)) {
                 //方格
                 FgkpSkDyjmcCxParam fgkpSkDyjmcCxParam = new FgkpSkDyjmcCxParam();
                 fgkpSkDyjmcCxParam.setXhfNsrsbh(NsrsbhUtils.transShListByXhfNsrsbh(dyjcxReqBO.getNSRSBH()));
@@ -3651,10 +3662,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         fgkpSkDyjmcCxParam, terminalCode);
                 if (ConfigureConstant.STRING_0000.equals(skDyjByShZl.getCode())) {
                     List<FgkpSkDyjEntity> fgkpSkDyjEntityList = skDyjByShZl.getData();
-                    if(CollectionUtil.isEmpty(fgkpSkDyjEntityList)){
+                    if (CollectionUtil.isEmpty(fgkpSkDyjEntityList)) {
                         throw new OrderReceiveException(OrderInfoContentEnum.QUERYPRINTER_000005);
                     }
-                    
+
                     List<Dyjxx> dyjxxes = new ArrayList<>(fgkpSkDyjEntityList.size());
                     for (FgkpSkDyjEntity fgkpSkDyjEntity : fgkpSkDyjEntityList) {
                         Dyjxx dyjxx = new Dyjxx();
@@ -3666,7 +3677,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         dyjxxes.add(dyjxx);
                     }
                     dyjcxRspBO.setDYJXX(dyjxxes);
-                    
+
                 } else {
                     throw new OrderReceiveException(skDyjByShZl.getCode(), skDyjByShZl.getMsg());
                 }
@@ -3681,10 +3692,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 if (CommonUtils.judgeNewInterface(terminalCode)) {
                     dyjListUrl = invoiceConfig.configQueryPrinterInfo();
                 }
-                if (CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)) {
+                if (CommonUtils.judgeIsFgTerminalNew(terminalCode, fgSkKpShList, sh)) {
                     dyjListUrl = invoiceConfig.configFgQueryPrinterInfo();
                 }
-                DydResponse dyResponse = HttpInvoiceRequestUtil.queryDydxxcxList(dyjListUrl, dydListRequst, terminalCode,fgSkKpShList,sh);
+                DydResponse dyResponse = HttpInvoiceRequestUtil.queryDydxxcxList(dyjListUrl, dydListRequst, terminalCode, fgSkKpShList, sh);
 
                 if (ConfigureConstant.STRING_0000.equals(dyResponse.getCode())) {
                     // 4.响应协议Bean转换
@@ -3708,19 +3719,19 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(dyResponse.getCode(), dyResponse.getMsg());
                 }
             }
-            
+
             //如果打印机名称不为空，根据打印机名称过滤从税控底层查询到打印机列表
-            if(StringUtils.isNotBlank(dyjcxReqBO.getDYJMC())){
+            if (StringUtils.isNotBlank(dyjcxReqBO.getDYJMC())) {
                 List<Dyjxx> dyjxxList = dyjcxRspBO.getDYJXX();
-                if(CollectionUtil.isNotEmpty(dyjxxList)){
+                if (CollectionUtil.isNotEmpty(dyjxxList)) {
                     List<Dyjxx> dyjxxes = dyjxxList.stream()
                             .filter(dyjxx -> StringUtils.equals(dyjcxReqBO.getDYJMC(), dyjxx.getDYJMC()))
                             .collect(Collectors.toList());
-                    
+
                     dyjcxRspBO.setDYJXX(dyjxxes);
                 }
             }
-            
+
         } catch (OrderReceiveException orderReceiveException) {
             log.error("{}打印机查询接口,异常：{}", LOGGER_MSG_V4, orderReceiveException);
             dyjcxRspBO.setZTDM(OrderInfoContentEnum.QUERYPRINTER_009999.getKey());
@@ -3732,7 +3743,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}打印机查询接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(dyjcxRspBO));
         return dyjcxRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public QyjbxxCxRspBO queryTaxpayerGeneralInfo(QyjbxxCxReqBO qyjbxxCxReqBO, String secretId) {
@@ -3751,13 +3762,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(nsrsbh) > ConfigureConstant.INT_20) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYTAXPAYERGENERALINFO_000003);
             }
-            
+
             //分机号
             String fjh = qyjbxxCxReqBO.getFJH();
             if (StringUtils.isNotBlank(fjh) && StringUtils.length(fjh) > ConfigureConstant.INT_12) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYTAXPAYERGENERALINFO_000005);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -3769,7 +3780,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.QUERYTAXPAYERGENERALINFO_000005.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             // 2.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(nsrsbh, qyjbxxCxReqBO.getENTID());
@@ -3777,7 +3788,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 log.warn("{}企业未配置税控设备,税号:{}", LOGGER_MSG, nsrsbh);
                 throw new OrderReceiveException(OrderInfoContentEnum.COMMON_ERROR);
             }
-            
+
             QueryTaxpayerInfoRequestBO queryTaxpayerInfoRequestBO = new QueryTaxpayerInfoRequestBO();
             queryTaxpayerInfoRequestBO.setNsrsbh(nsrsbh);
             queryTaxpayerInfoRequestBO.setFjh(fjh);
@@ -3793,9 +3804,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             // 4.响应协议Bean转换
             qyjbxxCxRspBO.setNSRSBH(nsrsbh);
             qyjbxxCxRspBO.setNSRMC(taxEquipmentInfo.getXhfMc());
-            
+
             //税控
-            if(CollectionUtil.isNotEmpty(taxpayermachineinfos)){
+            if (CollectionUtil.isNotEmpty(taxpayermachineinfos)) {
                 List<Sbjcxx> sbjcxxList = new ArrayList<>(taxpayermachineinfos.size());
                 taxpayermachineinfos.forEach(taxpayerMachineInfo -> {
                     Sbjcxx sbjcxx = new Sbjcxx();
@@ -3805,20 +3816,20 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                         List<Fplxdmxx> fplxdmxxList = new ArrayList<>(invoiceTypeList.size());
                         for (InvoiceType invoiceType : invoiceTypeList) {
                             //过滤掉 41（卷票） 数据
-                            if(StringUtils.equals(OrderInfoEnum.ORDER_INVOICE_TYPE_41.getKey(),invoiceType.getFPZLDM())){
+                            if (StringUtils.equals(OrderInfoEnum.ORDER_INVOICE_TYPE_41.getKey(), invoiceType.getFPZLDM())) {
                                 continue;
                             }
                             Fplxdmxx fplxdmxx = new Fplxdmxx();
                             BeanUtils.copyProperties(invoiceType, fplxdmxx);
                             fplxdmxx.setFPLXDM(CommonUtils.transFplxdm(invoiceType.getFPZLDM()));
-                            if(StringUtils.isNotBlank(invoiceType.getSJBSQSSJ())){
-                                fplxdmxx.setSJBSQSSJ(DateUtil.format(DateUtil.parse(invoiceType.getSJBSQSSJ()),ConfigureConstant.DATE_FORMAT_DATE));
+                            if (StringUtils.isNotBlank(invoiceType.getSJBSQSSJ())) {
+                                fplxdmxx.setSJBSQSSJ(DateUtil.format(DateUtil.parse(invoiceType.getSJBSQSSJ()), ConfigureConstant.DATE_FORMAT_DATE));
                             }
-                            if(StringUtils.isNotBlank(invoiceType.getZXBSSJ())){
-                                fplxdmxx.setZXBSSJ(DateUtil.format(DateUtil.parse(invoiceType.getZXBSSJ()),ConfigureConstant.DATE_FORMAT_DATE));
+                            if (StringUtils.isNotBlank(invoiceType.getZXBSSJ())) {
+                                fplxdmxx.setZXBSSJ(DateUtil.format(DateUtil.parse(invoiceType.getZXBSSJ()), ConfigureConstant.DATE_FORMAT_DATE));
                             }
-                            if(StringUtils.isNotBlank(invoiceType.getKPJZRQ())){
-                                fplxdmxx.setKPJZRQ(DateUtil.format(DateUtil.parse(invoiceType.getKPJZRQ()),ConfigureConstant.DATE_FORMAT_DATE));
+                            if (StringUtils.isNotBlank(invoiceType.getKPJZRQ())) {
+                                fplxdmxx.setKPJZRQ(DateUtil.format(DateUtil.parse(invoiceType.getKPJZRQ()), ConfigureConstant.DATE_FORMAT_DATE));
                             }
                             fplxdmxxList.add(fplxdmxx);
                         }
@@ -3828,9 +3839,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 });
                 qyjbxxCxRspBO.setSBJCXX(sbjcxxList);
             }
-           
+
             //全电
-            if(Objects.nonNull(qdjcxx) && Objects.nonNull(qdjcxx.getJCXX())){
+            if (Objects.nonNull(qdjcxx) && Objects.nonNull(qdjcxx.getJCXX())) {
                 qyjbxxCxRspBO.setNSRMC(qdjcxx.getJCXX().getNSRMC());
                 QdjcxxBO qdjcxxBO = new QdjcxxBO();
                 JcxxBO jcxxBO = new JcxxBO();
@@ -3854,7 +3865,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}企业基本信息查询接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(qyjbxxCxRspBO));
         return qyjbxxCxRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public SlzbxxCxRspBO queryApplicationPreparation(SlzbxxCxReqBO slzbxxCxReqBO, String secretId) {
@@ -3873,7 +3884,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(nsrsbh) > ConfigureConstant.INT_20) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYAPPLICATIONPREPARATION_000003);
             }
-            
+
             //分机号 长度12位
             String fjh = slzbxxCxReqBO.getFJH();
             if (StringUtils.isBlank(fjh)) {
@@ -3882,7 +3893,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(fjh) > ConfigureConstant.INT_12) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYAPPLICATIONPREPARATION_000005);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -3894,9 +3905,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.QUERYAPPLICATIONPREPARATION_000005.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             // 2.请求协议bean转换
-            
+
             // 3.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(nsrsbh, slzbxxCxReqBO.getENTID());
@@ -3920,7 +3931,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     });
                     slzbxxCxRspBO.setJBRXX(jbrxxList);
                 }
-                
+
                 //收件人
                 List<Consignee> consigneeList = response.getCONSIGNEES();
                 if (CollectionUtil.isNotEmpty(consigneeList)) {
@@ -3932,7 +3943,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     });
                     slzbxxCxRspBO.setSJRXX(sjrxxList);
                 }
-                
+
                 //发票类型代码信息
                 List<InvoiceTypeRatify> invoicetyperatifys = response.getINVOICETYPERATIFYS();
                 if (CollectionUtil.isNotEmpty(invoicetyperatifys)) {
@@ -3959,7 +3970,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}申领准备信息查询接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(slzbxxCxRspBO));
         return slzbxxCxRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public FpslRspBO invoiceApply(FpslReqBO fpslReqBO, String secretId) {
@@ -3978,7 +3989,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(nsrsbh) > ConfigureConstant.INT_20) {
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000003);
             }
-    
+
             //分机号 长度12位
             String fjh = fpslReqBO.getFJH();
             if (StringUtils.isBlank(fjh)) {
@@ -3987,7 +3998,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(fjh) > ConfigureConstant.INT_12) {
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000005);
             }
-    
+
             //发票种类代码
             if (StringUtils.isBlank(fpslReqBO.getFPLXDM())) {
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000006);
@@ -4020,7 +4031,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     !OrderInfoEnum.SLFS_2.getKey().equals(fpslReqBO.getSLFS())) {
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000019);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -4032,7 +4043,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000019.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             //查询申领准备信息接口，获取收件人、经办人、票种核定信息，用于校验该接口请求参数
             SlzbxxCxReqBO slzbxxCxReqBO = new SlzbxxCxReqBO();
             slzbxxCxReqBO.setNSRSBH(nsrsbh);
@@ -4045,26 +4056,26 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 List<Sjrxx> sjrxx = slzbxxCxRspBO.getSJRXX();
                 //票种核定信息
                 List<com.dxhy.order.consumer.openapi.protocol.v4.fpslzb.Fplxdmxx> fplxdmxx = slzbxxCxRspBO.getFPLXDMXX();
-    
+
                 //发票类型代码
                 com.dxhy.order.consumer.openapi.protocol.v4.fpslzb.Fplxdmxx fplxdmxxFplxdm = fplxdmxx.stream()
                         .filter(fplxdmxx1 -> fpslReqBO.getFPLXDM().equals(fplxdmxx1.getFPLXDM())).findFirst().orElse(null);
                 if (Objects.isNull(fplxdmxxFplxdm)) {
                     throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000007);
                 }
-                
+
                 //发票联次代码
                 com.dxhy.order.consumer.openapi.protocol.v4.fpslzb.Fplxdmxx fplxdmxxskFplcdm = fplxdmxx.stream()
                         .filter(fplxdmxx1 -> fpslReqBO.getFPLCDM().equals(fplxdmxx1.getFPLCDM())).findFirst().orElse(null);
                 if (Objects.isNull(fplxdmxxskFplcdm)) {
                     throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000009);
                 }
-                
+
                 //申领数量
                 if (Integer.parseInt(fpslReqBO.getSLSL()) > Integer.parseInt(fplxdmxxskFplcdm.getMCSLFPXE())) {
                     throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000011);
                 }
-                
+
                 //经办人姓名
                 Jbrxx jbrxxXm = jbrxx.stream().filter(jbrxx1 -> fpslReqBO.getJBRXM().equals(jbrxx1.getJBRXM()))
                         .findFirst().orElse(null);
@@ -4083,7 +4094,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 if (Objects.isNull(jbrxxZjhm)) {
                     throw new OrderReceiveException(OrderInfoContentEnum.INVOICEAPPLY_000017);
                 }
-                
+
                 //如果申领方式为2时，收件人信息不能为空
                 if (OrderInfoEnum.SLFS_2.getKey().equals(fpslReqBO.getSLFS())) {
                     //收件人地址
@@ -4118,12 +4129,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     }
                 }
             }
-    
+
             // 2.请求协议bean转换
             InvoiceApplyRequest invoiceApplyRequest = new InvoiceApplyRequest();
             BeanUtils.copyProperties(fpslReqBO, invoiceApplyRequest);
             invoiceApplyRequest.setFPZLDM(CommonUtils.transFpzldm(fpslReqBO.getFPLXDM()));
-    
+
             // 3.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(nsrsbh, fpslReqBO.getENTID());
@@ -4153,7 +4164,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}发票申领接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(fpslRspBO));
         return fpslRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public SlztRspBO queryInvoiceApplyStatus(SlztReqBO slztReqBO, String secretId) {
@@ -4172,7 +4183,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(nsrsbh) > ConfigureConstant.INT_20) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000003);
             }
-    
+
             //分机号 长度12位
             String fjh = slztReqBO.getFJH();
             if (StringUtils.isBlank(fjh)) {
@@ -4181,13 +4192,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(fjh) > ConfigureConstant.INT_12) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000005);
             }
-            
+
             //发票类型代码
             String fplxdm = slztReqBO.getFPLXDM();
             if (CommonUtils.checkFpzldm(fplxdm)) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000007);
             }
-    
+
             //查询时间起、查询时间止
             String cxsjq = slztReqBO.getCXSJQ();
             String cxsjz = slztReqBO.getCXSJZ();
@@ -4208,7 +4219,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000010);
                 }
             }
-            
+
             //处理状态
             String clzt = slztReqBO.getCLZT();
             boolean isClzt = !StringUtils.equals(OrderInfoEnum.CLZT_0.getKey(), clzt) &&
@@ -4217,7 +4228,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.isNotBlank(clzt) && isClzt) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000011);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -4229,12 +4240,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000011.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             // 2.请求协议bean转换
             InvoiceApplyStatusRequest invoiceApplyStatusRequest = new InvoiceApplyStatusRequest();
             BeanUtils.copyProperties(slztReqBO, invoiceApplyStatusRequest);
             invoiceApplyStatusRequest.setFPZLDM(CommonUtils.transFpzldm(slztReqBO.getFPLXDM()));
-            
+
             // 3.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(nsrsbh, slztReqBO.getENTID());
@@ -4284,7 +4295,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}申领状态查询接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(slztRspBO));
         return slztRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public ZpjsqrRspBO confirmInvoiceApply(ZpjsqrReqBO zpjsqrReqBO, String secretId) {
@@ -4303,7 +4314,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(nsrsbh) > ConfigureConstant.INT_20) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000003);
             }
-    
+
             //分机号 长度12位
             String fjh = zpjsqrReqBO.getFJH();
             if (StringUtils.isBlank(fjh)) {
@@ -4312,12 +4323,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(fjh) > ConfigureConstant.INT_12) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000005);
             }
-    
+
             String slxh = zpjsqrReqBO.getSLXH();
             if (StringUtils.isBlank(slxh)) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVOICEAPPLYSTATUS_000012);
             }
-    
+
             //发票类型代码
             String fplxdm = zpjsqrReqBO.getFPLXDM();
             if (StringUtils.isBlank(fplxdm)) {
@@ -4326,7 +4337,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (CommonUtils.checkFpzldm(fplxdm)) {
                 throw new OrderReceiveException(OrderInfoContentEnum.CONFIRMINVOICEAPPLY_000007);
             }
-            
+
             //发票代码信息
             List<com.dxhy.order.consumer.openapi.protocol.v4.zpjsqr.Fpdmxx> fpdmxxList = zpjsqrReqBO.getFPDMXX();
             if (CollectionUtil.isEmpty(fpdmxxList)) {
@@ -4376,7 +4387,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                             indexStr + OrderInfoContentEnum.CONFIRMINVOICEAPPLY_000016.getMessage());
                 }
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -4388,7 +4399,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.CONFIRMINVOICEAPPLY_000007.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             // 2.请求协议bean转换
             PaperInvoiceConfirmRequest paperInvoiceConfirmRequest = new PaperInvoiceConfirmRequest();
             BeanUtils.copyProperties(zpjsqrReqBO, paperInvoiceConfirmRequest);
@@ -4400,7 +4411,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 invoicesectionList.add(invoicesection);
             });
             paperInvoiceConfirmRequest.setINVOICESECTIONLIST(invoicesectionList);
-    
+
             // 3.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(nsrsbh, zpjsqrReqBO.getENTID());
@@ -4427,7 +4438,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}纸票接收确认接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(zpjsqrRspBO));
         return zpjsqrRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public CxslRspBO cancelInvoiceApply(CxslReqBO cxslReqBO, String secretId) {
@@ -4446,7 +4457,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(nsrsbh) > ConfigureConstant.INT_20) {
                 throw new OrderReceiveException(OrderInfoContentEnum.CANCELINVOICEAPPLY_000003);
             }
-    
+
             //分机号 长度12位
             String fjh = cxslReqBO.getFJH();
             if (StringUtils.isBlank(fjh)) {
@@ -4455,14 +4466,14 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(fjh) > ConfigureConstant.INT_12) {
                 throw new OrderReceiveException(OrderInfoContentEnum.CANCELINVOICEAPPLY_000005);
             }
-            
+
             //发票类型代码
             String fplxdm = cxslReqBO.getFPLXDM();
 
             if (CommonUtils.checkFpzldm(fplxdm)) {
                 throw new OrderReceiveException(OrderInfoContentEnum.CANCELINVOICEAPPLY_000007);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -4474,12 +4485,12 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.CANCELINVOICEAPPLY_000007.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             // 2.请求协议bean转换
             InvoiceApplyCancelRequest invoiceApplyCancelRequest = new InvoiceApplyCancelRequest();
             BeanUtils.copyProperties(cxslReqBO, invoiceApplyCancelRequest);
             invoiceApplyCancelRequest.setFPZLDM(CommonUtils.transFpzldm(cxslReqBO.getFPLXDM()));
-            
+
             // 3.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(nsrsbh, cxslReqBO.getENTID());
@@ -4506,7 +4517,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}撤销申领接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(cxslRspBO));
         return cxslRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public CbztcxRspBO queryDeclareTaxStatus(CbztcxReqBO cbztcxReqBO, String secretId) {
@@ -4525,7 +4536,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(nsrsbh) > ConfigureConstant.INT_20) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYDECLARETAXSTATUS_000003);
             }
-    
+
             //分机号 长度12位
             String fjh = cbztcxReqBO.getFJH();
             if (StringUtils.isBlank(fjh)) {
@@ -4534,7 +4545,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(fjh) > ConfigureConstant.INT_12) {
                 throw new OrderReceiveException(OrderInfoContentEnum.QUERYDECLARETAXSTATUS_000005);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -4547,13 +4558,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                             OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             // 2.请求协议bean转换
             String fplxdm = cbztcxReqBO.getFPLXDM();
             DeclareTaxStatusRequest declareTaxStatusRequest = new DeclareTaxStatusRequest();
             BeanUtils.copyProperties(cbztcxReqBO, declareTaxStatusRequest);
             declareTaxStatusRequest.setFPZLDM(CommonUtils.transFpzldm(fplxdm));
-            
+
             // 3.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(nsrsbh, cbztcxReqBO.getENTID());
@@ -4572,7 +4583,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             }
             declareTaxStatusRequest.setTerminalCode(terminalCode);
             String url = invoiceConfig.configQueryDeclareTaxStatus();
-            
+
             //4.调用税控接口
             DeclareTaxStatusResponse response = HttpInvoiceRequestUtil.declareTaxStatus(url,
                     declareTaxStatusRequest, terminalCode);
@@ -4602,7 +4613,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}抄报状态查询接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(cbztcxRspBO));
         return cbztcxRspBO;
     }
-    
+
     @SuppressWarnings("AlibabaUndefineMagicConstant")
     @Override
     public HzcbRspBO declareTaxUpload(HzcbReqBO hzcbReqBO, String secretId) {
@@ -4621,7 +4632,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(nsrsbh) > ConfigureConstant.INT_20) {
                 throw new OrderReceiveException(OrderInfoContentEnum.DECLARETAXUPLOAD_000003);
             }
-    
+
             //分机号 长度12位
             String fjh = hzcbReqBO.getFJH();
             if (StringUtils.isBlank(fjh)) {
@@ -4630,7 +4641,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(fjh) > ConfigureConstant.INT_12) {
                 throw new OrderReceiveException(OrderInfoContentEnum.DECLARETAXUPLOAD_000005);
             }
-            
+
             //上报类型 长度1位
             if (StringUtils.isBlank(hzcbReqBO.getSBLX())) {
                 throw new OrderReceiveException(OrderInfoContentEnum.DECLARETAXUPLOAD_000008);
@@ -4638,7 +4649,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.length(hzcbReqBO.getSBLX()) != 1) {
                 throw new OrderReceiveException(OrderInfoContentEnum.DECLARETAXUPLOAD_000009);
             }
-            
+
             /*
              * 校验当前税号数据合法性
              * 1.校验当前税号secretId和数据库维护的数据是否一致
@@ -4650,7 +4661,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.DECLARETAXUPLOAD_000009.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-    
+
             // 2.请求协议bean转换
             DeclareTaxUploadRequest declareTaxUploadRequest = new DeclareTaxUploadRequest();
             BeanUtils.copyProperties(hzcbReqBO, declareTaxUploadRequest);
@@ -4658,8 +4669,8 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             if (StringUtils.isNotBlank(fplxdm)) {
                 declareTaxUploadRequest.setFPZLDM(CommonUtils.transFpzldm(fplxdm));
             }
-    
-    
+
+
             // 3.调用销项后台
             //根据纳税人识别号获取维护的税控设备信息
             String terminalCode = simsBackService.getTerminalCode(nsrsbh, hzcbReqBO.getENTID());
@@ -4692,7 +4703,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}汇总抄报接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(hzcbRspBO));
         return hzcbRspBO;
     }
-    
+
     @Override
     public ZfcxRspBO queryInvalidInvoice(ZfcxReqBO zfcxReqBO, String secretId) {
         log.debug("{}作废结果查询接口,请求参数:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(zfcxReqBO));
@@ -4722,9 +4733,9 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVALIDINVOICE_009999.getKey(), OrderInfoContentEnum.INVOICE_ERROR_CODE_009999_V3.getMessage());
                 }
             }
-            
+
             //2.获取作废信息
-            
+
             // 查询 `paper_invalid_invoice_info`
             InvalidInvoiceInfo invalidInvoiceInfoParam = new InvalidInvoiceInfo();
             invalidInvoiceInfoParam.setXhfNsrsbh(zfcxReqBO.getNSRSBH());
@@ -4742,14 +4753,14 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             } else {
                 // 查询表 `order_invoice_info`
                 OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(zfcxReqBO.getFPDM(), zfcxReqBO.getFPHM(), shList);
-                if(Objects.nonNull(orderInvoiceInfo)){
+                if (Objects.nonNull(orderInvoiceInfo)) {
                     zfBz = orderInvoiceInfo.getZfBz();
                     zfsj = orderInvoiceInfo.getZfsj();
                 } else {
                     throw new OrderReceiveException(OrderInfoContentEnum.QUERYINVALIDINVOICE_009999.getKey(), "未查询到发票作废数据");
                 }
             }
-            
+
             //3.返回作废查询结果
             if (StringUtils.equals(OrderInfoEnum.INVALID_INVOICE_1.getKey(), zfBz)) {
                 //已作废
@@ -4779,7 +4790,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         log.debug("{}作废结果查询接口,返回结果:{}", LOGGER_MSG_V4, JsonUtils.getInstance().toJsonString(zfcxRspBO));
         return zfcxRspBO;
     }
-    
+
     /**
      * 构建批量开票数据库实体对象
      *
@@ -4806,7 +4817,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         invoiceBatchRequestList.add(transitionBatchRequest);
         return invoiceBatchRequestList;
     }
-    
+
     /**
      * 构建订单请求批次对象
      *
@@ -4825,7 +4836,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         obr.setDdqqpch(transitionBatchRequest.get(0).getFpqqpch());
         return obr;
     }
-    
+
     /**
      * 构建订单发票协议bean
      *
@@ -4834,7 +4845,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
      * @author <a href="tivenninesongs@163.com">yaoxuguang</a>
      * @date 2020/4/24
      */
-    private List<OrderInfo> buildOrderInfo(DdfpzxxBO ddfpzxx, String sourceType, String terminalCode,String entId,String qdfwlx) {
+    private List<OrderInfo> buildOrderInfo(DdfpzxxBO ddfpzxx, String sourceType, String terminalCode, String entId, String qdfwlx) {
         List<OrderInfo> insertOrder = CollectionUtil.newArrayList();
         OrderInfo orderInfo = BeanTransitionUtils.transitionInsertOrderInfo(ddfpzxx.getDDFPXX());
         if (StringUtils.isEmpty(orderInfo.getDdh())) {
@@ -4843,7 +4854,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         /**
          * 设置订单数据类型
          */
-        if(CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm())){
+        if (CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm())) {
             orderInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_0.getKey());
         } else {
             if (OrderInfoEnum.ORDER_SOURCE_7.getKey().equals(sourceType)) {
@@ -4854,7 +4865,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 orderInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_6.getKey());
             }
         }
-      
+
         if (OrderInfoEnum.INVOICE_BILLING_TYPE_1.getKey().equals(orderInfo.getKplx()) && StringUtils.isEmpty(orderInfo.getThdh())) {
             orderInfo.setThdh(RandomUtil.randomNumbers(ConfigureConstant.INT_12));
         }
@@ -4869,13 +4880,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         orderInfo.setBz(resultBz);
         //记录当前税控设备代码
         orderInfo.setSksbCode(terminalCode);
-        if(CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm())
-                && StringUtils.isNotBlank(CommonUtils.getQdSksbdm(qdfwlx))){
+        if (CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm())
+                && StringUtils.isNotBlank(CommonUtils.getQdSksbdm(qdfwlx))) {
             orderInfo.setSksbCode(CommonUtils.getQdSksbdm(qdfwlx));
         }
-    
+
         orderInfo.setEntId(entId);
-    
+
         if (StringUtils.isEmpty(orderInfo.getHzxxbbh())) {
             String resultHzxxbbh = CommonUtils.getHzxxbbh(resultBz, terminalCode);
             orderInfo.setHzxxbbh(resultHzxxbbh);
@@ -4886,20 +4897,21 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
 
     /**
      * 构建全电订单信息bean
-     * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
-     * @date 2022-10-20
+     *
      * @param ddfpzxx 订单发票全数据返回协议bean
      * @return java.util.List<com.dxhy.order.model.qd.OrderInfoQd>
+     * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
+     * @date 2022-10-20
      */
     private List<OrderInfoQd> buildOrderInfoQd(DdfpzxxBO ddfpzxx) {
         List<OrderInfoQd> orderInfoQdList = new ArrayList<>(5);
-        if(Objects.nonNull(ddfpzxx.getQDTXXBO())){
+        if (Objects.nonNull(ddfpzxx.getQDTXXBO())) {
             OrderInfoQd orderInfoQd = BeanTransitionUtils.transitionOrderInfoQd(ddfpzxx.getQDTXXBO());
             orderInfoQdList.add(orderInfoQd);
         }
         return orderInfoQdList;
     }
-    
+
     /**
      * 构建订单明细业务bean集合
      *
@@ -4920,7 +4932,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         insertOrderItem.add(orderItemInfos);
         return insertOrderItem;
     }
-    
+
     /**
      * 构建原始订单到最终订单的关系bean
      *
@@ -4936,7 +4948,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         originExtendList.add(orderOriginExtendInfo);
         return originExtendList;
     }
-    
+
     /**
      * 构建订单处理业务bean
      *
@@ -4949,11 +4961,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         List<OrderProcessInfo> insertProcessInfo = CollectionUtil.newArrayList();
         OrderProcessInfo orderProcessInfo = new OrderProcessInfo();
         BeanTransitionUtils.transitionAutoProcessInfo(orderProcessInfo, orderInfo);
-        
+
         /**
          * 设置订单数据类型
          */
-        if(CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm())){
+        if (CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm())) {
             orderProcessInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_1.getKey());
         } else {
             if (OrderInfoEnum.ORDER_TYPE_6.getKey().equals(orderInfo.getDdlx())) {
@@ -4964,7 +4976,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                 orderProcessInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_7.getKey());
             }
         }
-        
+
         orderProcessInfo.setKpfs(OrderInfoEnum.ORDER_REQUEST_TYPE_0.getKey());
         //蓝票
         if (StringUtils.equals(OrderInfoEnum.ORDER_BILLING_INVOICE_TYPE_0.getKey(), orderInfo.getKplx())) {
@@ -4978,13 +4990,13 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         orderProcessInfo.setId(orderInfo.getProcessId());
         //订单表id
         orderProcessInfo.setOrderInfoId(orderInfo.getId());
-        if(StringUtils.isNotBlank(orderInfo.getSksbCode())){
+        if (StringUtils.isNotBlank(orderInfo.getSksbCode())) {
             orderProcessInfo.setSksbCode(orderInfo.getSksbCode());
         }
         insertProcessInfo.add(orderProcessInfo);
         return insertProcessInfo;
     }
-    
+
     /**
      * 构建发票批量开票明细bean
      *
@@ -5006,7 +5018,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         invoiceList.add(insertBatchItem);
         return invoiceList;
     }
-    
+
     /**
      * 构建订单与发票对应关系业务bean
      *
@@ -5025,10 +5037,10 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         orderInvoiceInfo.setId(apiInvoiceCommonService.getGenerateShotKey());
         //发票来源和订单来源共用
         orderInvoiceInfo.setFply(orderProcessInfo.getDdly());
-        if(StringUtils.isNotBlank(orderInfo.getSksbCode())){
+        if (StringUtils.isNotBlank(orderInfo.getSksbCode())) {
             orderInvoiceInfo.setSksbdm(orderInfo.getSksbCode());
         }
-        
+
         insertInvoiceInfo.add(orderInvoiceInfo);
         return insertInvoiceInfo;
     }
@@ -5059,21 +5071,21 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                     }
                     specialInvoiceReversalEntity.setType(type);
                     specialInvoiceReversalEntity.setSqdh(hzsqdtxx.getSQBSCQQLSH());
-                    
+
                     //如果是旧版方格，赋值申请单号
-                    if(CommonUtils.judgeIsFgTerminalOld(terminalCode, baseServiceConfig.getFgSkKpShList(),
-                            hzsqdscReq.getHZSQDSCPC().getNSRSBH())){
+                    if (CommonUtils.judgeIsFgTerminalOld(terminalCode, baseServiceConfig.getFgSkKpShList(),
+                            hzsqdscReq.getHZSQDSCPC().getNSRSBH())) {
                         //为了防止并发生成相同的申请单号加分布式锁，锁的过期时间为1秒
                         String hzxxbscSqdhRedisLock = String.format(RedisConstant.REDIS_ORDER_LOCK__FG_HZXXBSC_SQDH_KEY, kpjh);
                         String redisValue = hzsqdscReq.getHZSQDSCPC().getNSRSBH() + "," + kpjh;
-                        if(redisService.setNx(hzxxbscSqdhRedisLock, redisValue, 1)){
+                        if (redisService.setNx(hzxxbscSqdhRedisLock, redisValue, 1)) {
                             //方格重新生成申请单号,税号对应的12位机器编号 + 12位时间
                             String sqdh = kpjh + DateUtil.format(new Date(), ConfigureConstant.DATE_FORMAT_DATE_YMDHMS).substring(2);
                             specialInvoiceReversalEntity.setSqdh(sqdh);
                             Thread.sleep(1000);
                             redisService.del(redisValue);
                         } else {
-                            synchronized (this){
+                            synchronized (this) {
                                 Thread.sleep(1000);
                                 //方格重新生成申请单号,税号对应的12位机器编号 + 12位时间
                                 String sqdh = kpjh + DateUtil.format(new Date(), ConfigureConstant.DATE_FORMAT_DATE_YMDHMS).substring(2);
@@ -5081,7 +5093,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
                             }
                         }
                     }
-                    
+
                     specialInvoiceReversalEntity.setInvoiceType(fplx);
                     specialInvoiceReversalEntity.setFpzlDm(fplb);
                     specialInvoiceReversalEntity.setSqsm(hzsqdtxx.getSQSM());
@@ -5262,7 +5274,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
             }
         }
     }
-    
+
     /**
      * 调用发票开具结果接收接口
      */
@@ -5303,9 +5315,110 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
         invoicePush.setYFP_HM(ddfpxx.getYFPHM());
         log.info("接收发票修复数据,调用发票开具结果接收接口请求参数:{}", JsonUtils.getInstance().toJsonString(invoicePush));
         rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.ORDER_RECEIVE_INVOICE_MESSAGE.getValue(), JsonUtils.getInstance().toJsonString(invoicePush));
-        
+
         ddfpdrRsp.setZTDM(ConfigureConstant.STRING_0000);
         ddfpdrRsp.setZTXX("接收请求成功,等待异步处理");
         return ddfpdrRsp;
     }
+
+
+    /**
+     * 同步集团商品税编表
+     *
+     * @param groupTaxReqBO
+     * @param secretId
+     * @return
+     */
+    @Override
+    public GroupTaxRespBO syncGroupTax(List<GroupTaxReqBO> groupTaxReqBO, String secretId) {
+        GroupTaxRespBO resp = GroupTaxRespBO.build(OrderInfoContentEnum.SUCCESS);
+        // 根据商品名称和和商品编码查下商品编码公司是否已经录入了物料编码
+        try {
+            for (GroupTaxReqBO tempBO : groupTaxReqBO) {
+                GroupTaxRespBO tempResp = syncGroupTax(tempBO, secretId);
+                if (tempResp.isFailed()) {
+                    return tempResp;
+                }
+            }
+        } catch (OrderReceiveException e) {
+            log.error("{}同步集团商品税编表异常", LOGGER_MSG_V4, e);
+            resp.setZTDM(e.getCode());
+            resp.setZTXX(e.getMessage());
+        }
+
+        return resp;
+    }
+
+    private GroupTaxRespBO syncGroupTax(GroupTaxReqBO groupTaxReqBO, String secretId) throws OrderReceiveException {
+        if (StringUtils.isEmpty(groupTaxReqBO.getSpmc())) {
+            throw new OrderReceiveException(OrderInfoContentEnum.SYNC_GROUP_TAX_009999.getKey(), OrderInfoContentEnum.SYNC_GROUP_TAX_009999.getMessage());
+        }
+        GroupTaxRespBO groupTaxRespBO = new GroupTaxRespBO();
+        if (StringUtils.isNotBlank(secretId)) {
+            String dbSecretId = commonDisposeService.getAuthMap(groupTaxReqBO.getNsrsbh());
+            if (!secretId.equals(dbSecretId)) {
+                log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG);
+                groupTaxRespBO.setZTDM(OrderInfoContentEnum.SYNC_GROUP_TAX_009998.getKey());
+                groupTaxRespBO.setZTXX(OrderInfoContentEnum.SYNC_GROUP_TAX_009998.getMessage());
+                return groupTaxRespBO;
+            }
+        }
+
+        // 处理、保存明细
+        // 先从集团群里查询税收分类编码是否存在
+        GroupTaxClassCodeEntity myEntity = groupTaxClassCodeMapper.selectGroupTaxClassCodeByNsrsbhAndCode(groupTaxReqBO.getNsrsbh(), groupTaxReqBO.getEncoding());
+        if (myEntity == null) {
+            myEntity = new GroupTaxClassCodeEntity();
+        }
+
+        // 查询税收分类编码
+        TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCacheBySpmcOrMs(groupTaxReqBO.getSpmc());
+        if (taxClassCodeEntity == null) {
+            log.info("syncGroupTax:{}税收分类编码不存在!", LOGGER_MSG);
+            groupTaxRespBO.setZTDM(OrderInfoContentEnum.SYNC_GROUP_TAX_009997.getKey());
+            groupTaxRespBO.setZTXX(OrderInfoContentEnum.SYNC_GROUP_TAX_009997.getMessage());
+            return groupTaxRespBO;
+        }
+
+        // 维护GroupTaxClassCodeEntity 参考的GroupTaxClassCodeServiceImpl -> transtionGroupTaxClassCode
+        myEntity.setMerchandiseName(groupTaxReqBO.getSpmc());
+        myEntity.setEncoding(groupTaxReqBO.getEncoding());
+        //分组id
+        myEntity.setGroupId(null);
+        //税收编码
+        myEntity.setTaxClassCode(taxClassCodeEntity.getSpbm());
+        //税收名称
+        myEntity.setTaxClassificationName(taxClassCodeEntity.getSpmc());
+        myEntity.setTaxClassAbbreviation(taxClassCodeEntity.getSpjc());
+        myEntity.setDescription(taxClassCodeEntity.getSm());
+        //规格型号
+        myEntity.setSpecificationModel(null);
+        //计量单位
+        myEntity.setMeteringUnit(groupTaxReqBO.getUnit());
+        //单价
+        myEntity.setUnitPrice(null);
+        //数据来源
+        myEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_5.getKey());
+        //匹配状态
+        myEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey());
+        //数据状态
+        myEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey());
+        //共享状态
+        myEntity.setShareState(TaxClassCodeEnum.SHARE_STATE_1.getKey());
+        myEntity.setDeptId(null);
+
+        if (StringUtils.isEmpty(myEntity.getId())) {
+            myEntity.setId(baseService.getGenerateShotKey());
+            myEntity.setCreateTime(new Date());
+            // 插入
+            groupTaxClassCodeMapper.insert(myEntity);
+        } else {
+            // 更新
+            groupTaxClassCodeMapper.updateByPrimaryKey(myEntity);
+        }
+
+        groupTaxRespBO.setZTDM(OrderInfoContentEnum.SYNC_GROUP_TAX_000000.getKey());
+        groupTaxRespBO.setZTXX(OrderInfoContentEnum.SYNC_GROUP_TAX_000000.getMessage());
+        return groupTaxRespBO;
+    }
 }