From 872ceaa4717d9bb7c6d058b2d5a26bd0228bbc32 Mon Sep 17 00:00:00 2001
From: gongquanlin <1025081659@qq.com>
Date: Wed, 15 Feb 2023 18:44:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=92=8C=E6=B5=8B=E8=AF=95=EF=BC=8C=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java  | 3 ++-
 .../module/taxclass/service/impl/TaxClassCodeServiceImpl.java | 3 ---
 .../src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml  | 4 ++--
 .../java/com/dxhy/order/constant/OrderInfoContentEnum.java    | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java
index 23c31060..843b006f 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java
@@ -259,7 +259,8 @@ public class VerifyBuyerManageInfoServiceImpl implements VerifyBuyerManageInfoSe
         } else {
             if (!StringUtils.equals(ConfigureConstant.STRING_0, gmfxxtbReq.getCZLX())
                     && !StringUtils.equals(ConfigureConstant.STRING_1, gmfxxtbReq.getCZLX())
-                    && !StringUtils.equals(ConfigureConstant.STRING_2, gmfxxtbReq.getCZLX())) {
+                    && !StringUtils.equals(ConfigureConstant.STRING_2, gmfxxtbReq.getCZLX())
+                    && !StringUtils.equals(ConfigureConstant.STRING_3, gmfxxtbReq.getCZLX())) {
                 Map<String, String> checkResultMap3 = new HashMap<>(2);
                 checkResultMap3.put(OrderManagementConstant.ERRORCODE, OrderInfoContentEnum.BUYER_MESSAGE_SYNC_CZLX_ERROR_183019.getKey());
                 checkResultMap3.put(OrderManagementConstant.ERRORMESSAGE, preStr + OrderInfoContentEnum.BUYER_MESSAGE_SYNC_CZLX_ERROR_183019.getMessage());
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 e35a9902..19b7d4da 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
@@ -78,9 +78,6 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService {
         if (StringUtils.isBlank(spmc)) {
             return null;
         }
-        if (StringUtils.isBlank(spmc)) {
-            return null;
-        }
 
         return taxClassCodeMapper.queryTaxClassCodeEntityBySpmcOrMs(spmc);
     }
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 cbf2ae81..c7490f3f 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
@@ -122,15 +122,15 @@
 
     <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},'%')
+          or tcc.sm like concat('%',#{sm,jdbcType=VARCHAR},'%')
         and tcc.kyzt = 'Y'
         AND tcc.hzx = 'N'
+        limit 1
     </select>
 
     <select id="queryAllTaxClassCode" resultMap="BaseResultMap">
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 46e780a5..6d9d3a85 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
@@ -2395,7 +2395,7 @@ public enum OrderInfoContentEnum {
     BUYER_MESSAGE_SYNC_GMFDZ_GMFDH_ERROR_183016("183016", "购买方银行名称", 0, 100, true, false),
     BUYER_MESSAGE_SYNC_GMFDZ_GMFYH_ERROR_183017("183017", "购买方银行账号", 0, 30, true, false),
     BUYER_MESSAGE_SYNC_GMFYH_GMFZH_ERROR_183018("183018", "购买方银行名称和账号", 0, 100, true, false),
-    BUYER_MESSAGE_SYNC_CZLX_ERROR_183019("183019", "操作类型不能为空且只能等于0,1,2"),
+    BUYER_MESSAGE_SYNC_CZLX_ERROR_183019("183019", "操作类型不能为空且只能等于0,1,2,3"),
     BUYER_MESSAGE_SYNC_CZLX_ERROR_183019A("183019", "操作类型", 1, 1, true, true),
     BUYER_MESSAGE_SYNC_GMFSBH_ERROR_183020("183020", "购买方纳税人识别号", 6, 20, true, false),
     BUYER_MESSAGE_SYNC_ERROR_183021("183021", "备注", 0, 200, true, false),