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 617c29766..2a1c729d2 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 @@ -1,11 +1,11 @@ -/** +/** * @Project: emis * @Title: EmisCustomerUserController.java * @author linfso * @date 2024-03-01 03:51:54 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

快递客户用户 控制器

*/ @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; 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 org.springframework.beans.factory.annotation.Autowired; @@ -42,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisCustomerUserService; /** * 快递客户用户Controller - * + * * @author linfso * @date 2024-03-01 03:51:54 */ @@ -242,6 +243,20 @@ public class EmisCustomerUserController extends EmisBaseController public AjaxResult addMonthUser(@RequestBody EmisCustomerUser emisCustomerUser) { try { + // 验证企业名称和企业税号 + try { + // 验证企业名称格式 + if (!emisBaseService.validateEnterpriseName(emisCustomerUser.getEnterpriseName())) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业名称不能包含空格、回车、@、#、$、%、&、数字等特殊符号"); + } + + // 验证企业税号格式 + if (!emisBaseService.validateEnterpriseTaxId(emisCustomerUser.getEnterpriseTaxId())) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业税号必须为8-18位数字和大写字母组成,不能包含汉字、空格等特殊符号"); + } + } catch (Exception e) { + return AjaxResult.error(e.getMessage()); + } EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone()); if(oldUser!=null){ return AjaxResult.error("该客户电话号码已被占用,请使用新号码"); @@ -345,6 +360,20 @@ public class EmisCustomerUserController extends EmisBaseController public AjaxResult editMonthUser(@RequestBody EmisCustomerUser emisCustomerUser) { try { + // 验证企业名称和企业税号 + try { + // 验证企业名称格式 + if (!emisBaseService.validateEnterpriseName(emisCustomerUser.getEnterpriseName())) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业名称不能包含空格、回车、@、#、$、%、&、数字等特殊符号"); + } + + // 验证企业税号格式 + if (!emisBaseService.validateEnterpriseTaxId(emisCustomerUser.getEnterpriseTaxId())) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业税号必须为8-18位数字和大写字母组成,不能包含汉字、空格等特殊符号"); + } + } catch (Exception e) { + return AjaxResult.error(e.getMessage()); + } EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone()); if(oldUser!=null && !oldUser.getCustomerCode().equals(emisCustomerUser.getCustomerCode())){ return AjaxResult.error("该客户电话号码已被占用,请使用新号码"); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java index e92b0c106..349379fdc 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java @@ -1,11 +1,11 @@ -/** +/** * @Project: emis * @Title: EmisMonthpayAccountController.java * @author linfso * @date 2024-04-24 05:05:22 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

月结账户表 控制器

*/ @@ -42,7 +42,7 @@ import com.xdadan.erp.emis.service.IEmisMonthpayAccountService; /** * 月结账户表Controller - * + * * @author linfso * @date 2024-04-24 05:05:22 */ @@ -93,7 +93,7 @@ public class EmisMonthpayAccountController extends EmisBaseController * @param emisCustomerUser * @return */ - @JacksonFilter(include= {"customerCode","custNo","custName","payee","salesmen","payeeName","salesmenName"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @JacksonFilter(include= {"customerCode","custNo","custName","payee","salesmen","payeeName","salesmenName","enterpriseName","enterpriseTaxId"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @GetMapping("/listSimple") public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser) { diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java index 2b876a79c..90d66281e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java @@ -185,5 +185,10 @@ public class EmisCustomerUser extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date lastOrderTime; + /* 企业名称 */ + private String enterpriseName; + /* 企业税号 */ + private String enterpriseTaxId; + } diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index 48c4ed901..aed3f6cbd 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -61,6 +61,8 @@ + + @@ -90,7 +92,7 @@ - select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user + select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, enterprise_name, enterprise_tax_id, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user @@ -144,6 +146,8 @@ and real_name like concat('%', #{realName}, '%') and id_no like concat('%', #{idNo}, '%') + and enterprise_name like concat('%', #{enterpriseName}, '%') + and enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%') and data_from like concat('%', #{dataFrom}, '%') and bl_open_oms=#{blOpenOms} and bl_sms=#{blSms} @@ -184,7 +188,7 @@ @@ -247,6 +251,8 @@ order_num, sales_support, sales_executive, + enterprise_name, + enterprise_tax_id, remark, del_flag, create_by, @@ -312,6 +318,8 @@ #{orderNum}, #{salesSupport}, #{salesExecutive}, + #{enterpriseName}, + #{enterpriseTaxId}, #{remark}, #{delFlag}, #{createBy}, @@ -381,6 +389,8 @@ order_num = #{orderNum}, sales_support = #{salesSupport}, sales_executive = #{salesExecutive}, + enterprise_name = #{enterpriseName}, + enterprise_tax_id = #{enterpriseTaxId}, remark = #{remark}, del_flag = #{delFlag}, create_by = #{createBy}, @@ -428,25 +438,25 @@ @@ -460,4 +470,4 @@ - \ No newline at end of file +