From f5991f70761175eac643bbe818c608e22af8ddea Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 28 Aug 2025 14:16:08 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../web/emis/EmisCustomerUserController.java  | 39 +++++++++++--------
 .../mapper/EmisCustomerUserMapper.xml         |  1 -
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
index 1c5d13efc..987fdba03 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
@@ -243,22 +243,6 @@ public class EmisCustomerUserController extends EmisBaseController
     @PostMapping("/addMonthUser")
     public AjaxResult addMonthUser(@RequestBody EmisCustomerUser emisCustomerUser) {
         try {
-            if ("2".equals(emisCustomerUser.getBlImport())) {
-                // 批量导入企业名称和企业税号
-                try {
-                    checkEnterpriseDetail(emisCustomerUser);
-                    if (StringUtil.isBlank(emisCustomerUser.getMonthlyPayCode())) {
-                        throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "月结卡号不能为空");
-                    }
-                    EmisCustomerUser editUser = new EmisCustomerUser();
-                    editUser.setMonthlyPayCode(emisCustomerUser.getMonthlyPayCode());
-                    editUser.setEnterpriseName(emisCustomerUser.getEnterpriseName());
-                    editUser.setEnterpriseTaxId(emisCustomerUser.getEnterpriseTaxId());
-                    return toAjax(emisCustomerUserService.updateEnterpriseInfoByMonthlyPayCode(editUser));
-                } catch (Exception e) {
-                    return AjaxResult.error(e.getMessage());
-                }
-            }
             // 验证企业名称和企业税号
             try {
                 checkEnterprise(emisCustomerUser);
@@ -294,6 +278,29 @@ public class EmisCustomerUserController extends EmisBaseController
 
     }
 
+    /**
+     * 批量导入企业税号
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:batchImportEnterprise')")
+    @Log(title = "新增月结用户", businessType = BusinessType.INSERT)
+    @PostMapping("/batchImportEnterprise")
+    public AjaxResult batchImportEnterprise(@RequestBody EmisCustomerUser emisCustomerUser) {
+        // 批量导入企业名称和企业税号
+        try {
+            checkEnterpriseDetail(emisCustomerUser);
+            if (StringUtil.isBlank(emisCustomerUser.getMonthlyPayCode())) {
+                throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "月结卡号不能为空");
+            }
+            EmisCustomerUser editUser = new EmisCustomerUser();
+            editUser.setMonthlyPayCode(emisCustomerUser.getMonthlyPayCode());
+            editUser.setEnterpriseName(emisCustomerUser.getEnterpriseName());
+            editUser.setEnterpriseTaxId(emisCustomerUser.getEnterpriseTaxId());
+            return toAjax(emisCustomerUserService.updateEnterpriseInfoByMonthlyPayCode(editUser));
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
     private void checkEnterprise(EmisCustomerUser emisCustomerUser) throws EmisBizError {
         if (!"0086".equals(emisCustomerUser.getCountry())) {
             return;
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index a940ed2d0..9bab1489f 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -494,7 +494,6 @@
             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
             <if test="unionId != null and unionId != ''">union_id = #{unionId},</if>
             <if test="openid != null and openid != ''">openid = #{openid},</if>
-            <if test="monthlyPayCode != null and monthlyPayCode != ''">monthly_pay_code = #{monthlyPayCode},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
             <if test="password != null and password != ''">password = #{password},</if>
             <if test="ownerSite != null and ownerSite != ''">owner_site = #{ownerSite},</if>