From 5a89d660f8304fd1aa9da1b677f23c596a46ca1d Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 28 Aug 2025 11:09:54 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7-=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E4=BC=81=E4=B8=9A=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E3=80=81=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 | 34 +++++++--
.../emis/mapper/EmisCustomerUserMapper.java | 32 ++++----
.../service/IEmisCustomerUserService.java | 26 ++++---
.../impl/EmisCustomerUserServiceImpl.java | 30 +++++---
.../mapper/EmisCustomerUserMapper.xml | 73 +++++++++++++++++++
5 files changed, 159 insertions(+), 36 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 08b4ada3c..1c5d13efc 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
@@ -19,6 +19,7 @@ import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.service.EmisBaseService;
+import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -240,21 +241,36 @@ public class EmisCustomerUserController extends EmisBaseController
@PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:add')")
@Log(title = "新增月结用户", businessType = BusinessType.INSERT)
@PostMapping("/addMonthUser")
- public AjaxResult addMonthUser(@RequestBody EmisCustomerUser emisCustomerUser)
- {
+ 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);
} catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
- EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
- if(oldUser!=null){
+ EmisCustomerUser oldUser = emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
+ if (oldUser != null) {
return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
}
- if(!StringUtils.isEmpty(emisCustomerUser.getMonthlyPayCode() )) {
+ if (!StringUtils.isEmpty(emisCustomerUser.getMonthlyPayCode())) {
oldUser = emisBaseService.getCustomerUserByMonthlyPayCode(emisCustomerUser.getMonthlyPayCode());
if (oldUser != null) {
return AjaxResult.error("月结卡号已存在");
@@ -282,6 +298,14 @@ public class EmisCustomerUserController extends EmisBaseController
if (!"0086".equals(emisCustomerUser.getCountry())) {
return;
}
+ checkEnterpriseDetail(emisCustomerUser);
+ }
+
+ private void checkEnterpriseDetail(EmisCustomerUser emisCustomerUser) throws EmisBizError {
+ if (StringUtil.isBlank(emisCustomerUser.getEnterpriseTaxId())
+ || StringUtil.isBlank(emisCustomerUser.getEnterpriseName())) {
+ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "企业名称/企业税号不能为空");
+ }
// 验证企业名称格式
if (!emisBaseService.validateEnterpriseName(emisCustomerUser.getEnterpriseName())) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业名称不能包含空格、回车、@、#、$、%、&、数字等特殊符号");
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java
index f001691e0..7706e40b2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java
@@ -1,10 +1,10 @@
-/**
+/**
* @Project: emis
* @Title: EmisCustomerUserMapper.java
* @author linfso
* @date 2024-03-01 03:51:54
* @Copyright: ShangHai Doitinfo 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description: 快递客户用户 Mapper 接口
* Warning : This file is generate by ai tools,don't edit!!!
*/
@@ -24,32 +24,32 @@ public interface EmisCustomerUserMapper extends BaseMapper
/**
* 主键查询
* @param id
- * @return
+ * @return
*/
public EmisCustomerUser selectEmisCustomerUserById(Long id);
/**
* 查询列表
- *
- * @param emisCustomerUser
+ *
+ * @param emisCustomerUser
* @return 集合
*/
public List selectEmisCustomerUserList(EmisCustomerUser emisCustomerUser);
/**
- * 新增
- *
+ * 新增
+ *
* @param emisCustomerUser
- * @return
+ * @return
*/
public int insertEmisCustomerUser(EmisCustomerUser emisCustomerUser);
/**
* 修改
- *
- * @param emisCustomerUser
- * @return
+ *
+ * @param emisCustomerUser
+ * @return
*/
public int updateEmisCustomerUser(EmisCustomerUser emisCustomerUser);
@@ -64,7 +64,7 @@ public interface EmisCustomerUserMapper extends BaseMapper
/**
* 删除
- *
+ *
* @param id 主键
* @return 结果
*/
@@ -72,7 +72,7 @@ public interface EmisCustomerUserMapper extends BaseMapper
/**
* 批量删除
- *
+ *
* @param ids 需要删除的数据主键集合
* @return 结果
*/
@@ -99,5 +99,11 @@ public interface EmisCustomerUserMapper extends BaseMapper
public int insertSysOmsUserRole(Long omsUserId);
+ /** 根据月结卡号修改企业名称和企业税号
+ *
+ * @param emisCustomerUser
+ * @return
+ */
+ public int updateEnterpriseInfoByMonthlyPayCode(EmisCustomerUser emisCustomerUser);
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerUserService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerUserService.java
index c48efe44d..7f6311e17 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerUserService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerUserService.java
@@ -1,10 +1,10 @@
- /**
+ /**
* @Project: emis
* @Title: EmisCustomerUserService.java
* @author linfso
* @date 2024-03-01 03:51:54
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description: 快递客户用户 服务类接口
*/
package com.xdadan.erp.emis.service;
@@ -18,18 +18,18 @@ import com.xdadan.erp.emis.domain.EmisCustomerUser;
* @author linfso
* @date 2024-03-01 03:51:54
*/
-public interface IEmisCustomerUserService
+public interface IEmisCustomerUserService
{
/**
* 主键查询
* @param id
- * @return
+ * @return
*/
public EmisCustomerUser selectEmisCustomerUserById(Long id);
/**
* 查询快递客户用户列表
- *
+ *
* @param emisCustomerUser 快递客户用户
* @return 快递客户用户集合
*/
@@ -37,7 +37,7 @@ public interface IEmisCustomerUserService
/**
* 新增快递客户用户
- *
+ *
* @param emisCustomerUser 快递客户用户
* @return 结果
*/
@@ -57,7 +57,7 @@ public interface IEmisCustomerUserService
/**
* 修改快递客户用户
- *
+ *
* @param emisCustomerUser 快递客户用户
* @return 结果
*/
@@ -65,7 +65,7 @@ public interface IEmisCustomerUserService
/**
* 批量删除快递客户用户
- *
+ *
* @param ids 需要删除的快递客户用户主键集合
* @return 结果
*/
@@ -73,9 +73,17 @@ public interface IEmisCustomerUserService
/**
* 删除快递客户用户信息
- *
+ *
* @param id 快递客户用户主键
* @return 结果
*/
public int deleteEmisCustomerUserById(Long id);
+
+ /**
+ * 根据月结卡号修改企业名称和企业税号
+ *
+ * @param emisCustomerUser 客户用户对象（包含月结卡号、企业名称、企业税号）
+ * @return 结果
+ */
+ public int updateEnterpriseInfoByMonthlyPayCode(EmisCustomerUser emisCustomerUser);
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
index 8132d9a03..651ea7b40 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
@@ -1,10 +1,10 @@
- /**
+ /**
* @Project: emis
* @Title: EmisCustomerUserServiceImpl.java
* @author linfso
* @date 2024-03-01 03:51:54
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description: 快递客户用户 实体类
*/
@@ -22,7 +22,7 @@ import com.xdadan.erp.emis.service.IEmisCustomerUserService;
/**
* 快递客户用户Service业务层处理
- *
+ *
* @author linfso
* @date 2024-03-01 03:51:54
*/
@@ -34,7 +34,7 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
/**
* 查询快递客户用户
- *
+ *
* @param id 快递客户用户主键
* @return 快递客户用户
*/
@@ -46,7 +46,7 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
/**
* 查询快递客户用户列表
- *
+ *
* @param emisCustomerUser 快递客户用户
* @return 快递客户用户
*/
@@ -58,7 +58,7 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
/**
* 新增快递客户用户
- *
+ *
* @param emisCustomerUser 快递客户用户
* @return 结果
*/
@@ -94,7 +94,7 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
/**
* 修改快递客户用户
- *
+ *
* @param emisCustomerUser 快递客户用户
* @return 结果
*/
@@ -112,7 +112,7 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
/**
* 批量删除快递客户用户
- *
+ *
* @param ids 需要删除的快递客户用户主键
* @return 结果
*/
@@ -124,7 +124,7 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
/**
* 删除快递客户用户信息
- *
+ *
* @param id 快递客户用户主键
* @return 结果
*/
@@ -134,4 +134,16 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
return emisCustomerUserMapper.deleteEmisCustomerUserById(id);
}
+ /**
+ * 根据月结卡号修改企业名称和企业税号
+ *
+ * @param emisCustomerUser 客户用户对象（包含月结卡号、企业名称、企业税号）
+ * @return 结果
+ */
+ @Override
+ public int updateEnterpriseInfoByMonthlyPayCode(EmisCustomerUser emisCustomerUser) {
+
+ return emisCustomerUserMapper.updateEnterpriseInfoByMonthlyPayCode(emisCustomerUser);
+ }
+
}
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index aed3f6cbd..a940ed2d0 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -469,5 +469,78 @@
+
+
+ update emis_customer_user
+
+ customer_code = #{customerCode},
+ customer_name = #{customerName},
+ customer_name_en = #{customerNameEn},
+ simple_name = #{simpleName},
+ contact = #{contact},
+ phone = #{phone},
+ mobile = #{mobile},
+ customer_type = #{customerType},
+ settled_type = #{settledType},
+ user_type = #{userType},
+ company = #{company},
+ lic_no = #{licNo},
+ dept_id = #{deptId},
+ avatar = #{avatar},
+ sex = #{sex},
+ invitation_info = #{invitationInfo},
+ login_ip = #{loginIp},
+ login_date = #{loginDate},
+ nick_name = #{nickName},
+ union_id = #{unionId},
+ openid = #{openid},
+ monthly_pay_code = #{monthlyPayCode},
+ user_name = #{userName},
+ password = #{password},
+ owner_site = #{ownerSite},
+ biz_site = #{bizSite},
+ biz_site_name = #{bizSiteName},
+ country = #{country},
+ province = #{province},
+ city = #{city},
+ county = #{county},
+ town = #{town},
+ address = #{address},
+ email = #{email},
+ post_code = #{postCode},
+ real_name = #{realName},
+ id_no = #{idNo},
+ id_type = #{idType},
+ id_pic1 = #{idPic1},
+ id_pic2 = #{idPic2},
+ id_verify_status = #{idVerifyStatus},
+ payee = #{payee},
+ salesmen = #{salesmen},
+ data_from = #{dataFrom},
+ bl_open_oms = #{blOpenOms},
+ bl_sms = #{blSms},
+ op_emp_code = #{opEmpCode},
+ first_signing_day = #{firstSigningDay},
+ credit_period_type = #{creditPeriodType},
+ credit_period = #{creditPeriod},
+ settle_day = #{settleDay},
+ status = #{status},
+ order_num = #{orderNum},
+ sales_support = #{salesSupport},
+ sales_executive = #{salesExecutive},
+ enterprise_name = #{enterpriseName},
+ enterprise_tax_id = #{enterpriseTaxId},
+ remark = #{remark},
+ del_flag = #{delFlag},
+ create_by = #{createBy},
+ create_time = #{createTime},
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+ create_site = #{createSite},
+ update_site = #{updateSite},
+
+ WHERE monthly_pay_code = #{monthlyPayCode}
+ AND del_flag = '0'
+