feat(tenant): 添加商户管理功能并重构邮件实体包结构

- 新增商户管理控制器(MerchantController)实现增删改查接口
- 将邮件相关实体从business包重构成tenant包结构
- 更新ActiveMQ连接地址配置从localhost到生产服务器
- 环境配置从test切换到dev环境
- 在用户信息表和角色表中添加商户ID字段
- 用户角色搜索支持按商户ID过滤
- 角色实体中新增是否为商户角色标识字段
- 完善用户信息DTO中的管理员标识逻辑判断

uacrd-manager-server/src/main/java/com/crm/manager/controller/BusinessEmailController.java

@@ -8,9 +8,9 @@ import com.crm.rely.backend.core.dto.base.BaseResultDto;
 import com.crm.rely.backend.core.dto.business.email.receive.BusinessEmailReceiveRecordDto;
 import com.crm.rely.backend.core.dto.business.email.sent.BusinessEmailSentRecordDto;
 import com.crm.rely.backend.core.entity.base.SingleLongEntity;
-import com.crm.rely.backend.core.entity.business.email.receive.BusinessEmailReceiveRecordSearchEntity;
-import com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordAddEntity;
-import com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordSearchEntity;
+import com.crm.rely.backend.core.entity.tenant.email.receive.BusinessEmailReceiveRecordSearchEntity;
+import com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordAddEntity;
+import com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordSearchEntity;
 import com.crm.rely.backend.core.entity.custom.info.InfoEntity;
 import com.crm.rely.backend.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;

uacrd-manager-server/src/main/java/com/crm/manager/controller/MerchantController.java

@@ -0,0 +1,73 @@
+package com.crm.manager.controller;
+
+import com.crm.login.rely.backend.controller.BaseLoginController;
+import com.crm.manager.service.TenantService;
+import com.crm.rely.backend.core.dto.base.BaseResultDto;
+import com.crm.rely.backend.core.dto.base.BaseResultWithPagerDto;
+import com.crm.rely.backend.core.entity.tenant.info.TenantAddEntity;
+import com.crm.rely.backend.core.entity.tenant.info.TenantEditEntity;
+import com.crm.rely.backend.core.entity.tenant.info.TenantSearchEntity;
+import com.crm.rely.backend.exception.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 商家管理
+ */
+@RestController
+@RequestMapping("/merchant")
+public class MerchantController extends BaseLoginController {
+
+    @Autowired
+    private TenantService tenantService;
+
+    /**
+     * 商户列表
+     * @return
+     */
+    @PostMapping("/search/list")
+    public BaseResultDto searchPage(@RequestBody TenantSearchEntity entity) throws ServiceException {
+        BaseResultWithPagerDto resultWithPagerDto = tenantService.searchPage(entity);
+        return resultWithPagerDto;
+    }
+
+    /**
+     * 添加商户
+     * @param entity
+     * @return
+     */
+    @PostMapping("/add")
+    public BaseResultDto add(@RequestBody TenantAddEntity entity) {
+        return BaseResultDto.success(tenantService.add(entity));
+    }
+
+    /**
+     * 根据 id 查询指定商户
+     * @param id
+     * @return
+     */
+    @GetMapping("/findSingle")
+    public BaseResultDto findSingle(@RequestParam Long id) {
+        return BaseResultDto.success(tenantService.findSingle(id));
+    }
+
+    /**
+     * 修改商户
+     * @param entity
+     * @return
+     */
+    @PostMapping("/edit")
+    public BaseResultDto edit(@RequestBody TenantEditEntity entity) {
+        return BaseResultDto.success(tenantService.edit(entity));
+    }
+
+    /**
+     * 删除商户
+     * @param id
+     * @return
+     */
+    @GetMapping("/delete")
+    public BaseResultDto delete(@RequestParam Long id) {
+        return BaseResultDto.success(tenantService.delete(id));
+    }
+}

uacrd-manager-server/src/main/java/com/crm/manager/controller/UserController.java

@@ -251,7 +251,9 @@ public class UserController extends BaseLoginController {
     public BaseResultDto info(InfoEntity entity) throws Exception {
 
         UserInfoDto userInfoDto = new UserInfoDto();
-
+        if(entity.getIbInfo().getRoleId() == null){
+            userInfoDto.setIsAdmin(1);
+        }
         BeanUtils.copyProperties(entity.getIbInfo(), userInfoDto);
         userInfoDto.setVerified(entity.getVerified());
         Long roleId;

uacrd-manager-server/src/main/java/com/crm/manager/controller/UserRoleController.java

@@ -1,5 +1,6 @@
 package com.crm.manager.controller;
 
+import com.crm.login.rely.backend.controller.BaseLoginController;
 import com.crm.manager.service.UserRoleService;
 import com.crm.rely.backend.core.constant.Constants;
 import com.crm.rely.backend.core.constant.ManagerConstant;
@@ -30,7 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/user/role")
-public class UserRoleController {
+public class UserRoleController extends BaseLoginController {
 
     @Autowired
     private UserRoleService roleInfoService;
@@ -147,13 +148,16 @@ public class UserRoleController {
      * @return
      */
     @PostMapping("/search/page")
-    public ResultWithPagerDto<UserRoleDto> searchListPage(@RequestBody @Valid UserRoleSearchEntity entity) throws Exception {
+    public ResultWithPagerDto<UserRoleDto> searchListPage(@RequestBody @Valid UserRoleSearchEntity entity,InfoEntity infoEntity) throws Exception {
         if (entity.getEndDate() != null) {
             entity.setEndDate(DateUtil.operationDay(entity.getEndDate(), 1));
         }
         if (entity.getStartDate() != null) {
             entity.setStartDate(DateUtil.parseDate(entity.getStartDate()));
         }
+        if(infoEntity.getIbInfo().getMerchantId() != null){
+            entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
+        }
         ResultWithPagerDto<UserRoleDto> result = roleInfoService.getListInfo(entity);
 
         return result;

uacrd-manager-server/src/main/java/com/crm/manager/dao/mapper/BusinessEmailReceiveRecordMapper.java

@@ -1,6 +1,6 @@
 package com.crm.manager.dao.mapper;
 
-import com.crm.rely.backend.core.entity.business.email.receive.BusinessEmailReceiveRecordSearchEntity;
+import com.crm.rely.backend.core.entity.tenant.email.receive.BusinessEmailReceiveRecordSearchEntity;
 import com.crm.rely.backend.core.pojo.table.BusinessEmailReceiveRecordTable;
 import org.springframework.stereotype.Repository;
 

uacrd-manager-server/src/main/java/com/crm/manager/dao/mapper/BusinessEmailSentRecordMapper.java

@@ -1,6 +1,6 @@
 package com.crm.manager.dao.mapper;
 
-import com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordSearchEntity;
+import com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordSearchEntity;
 import com.crm.rely.backend.core.pojo.table.BusinessEmailSentRecordTable;
 import org.springframework.stereotype.Repository;
 

uacrd-manager-server/src/main/java/com/crm/manager/dao/mapper/TenantMapper.java

@@ -0,0 +1,14 @@
+package com.crm.manager.dao.mapper;
+
+import com.crm.rely.backend.core.entity.tenant.info.TenantSearchEntity;
+import com.crm.rely.backend.core.pojo.table.MerchantTable;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TenantMapper {
+    Integer searchByPageCount(TenantSearchEntity entity);
+
+    List<MerchantTable> searchByPageList(TenantSearchEntity entity);
+}

uacrd-manager-server/src/main/java/com/crm/manager/dao/repository/TenantRepository.java

@@ -0,0 +1,9 @@
+package com.crm.manager.dao.repository;
+
+import com.crm.rely.backend.core.pojo.table.MerchantTable;
+import com.crm.rely.backend.dao.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TenantRepository extends BaseRepository<MerchantTable> {
+}

uacrd-manager-server/src/main/java/com/crm/manager/service/BusinessEmailReceiveRecordService.java

@@ -2,8 +2,8 @@ package com.crm.manager.service;
 
 import com.crm.rely.backend.core.dto.base.BaseResultDto;
 import com.crm.rely.backend.core.dto.business.email.receive.BusinessEmailReceiveRecordDto;
-import com.crm.rely.backend.core.entity.business.email.receive.BusinessEmailReceiveRecordAddEntity;
-import com.crm.rely.backend.core.entity.business.email.receive.BusinessEmailReceiveRecordSearchEntity;
+import com.crm.rely.backend.core.entity.tenant.email.receive.BusinessEmailReceiveRecordAddEntity;
+import com.crm.rely.backend.core.entity.tenant.email.receive.BusinessEmailReceiveRecordSearchEntity;
 import com.crm.rely.backend.exception.ServiceException;
 
 public interface BusinessEmailReceiveRecordService {

uacrd-manager-server/src/main/java/com/crm/manager/service/BusinessEmailSentRecordService.java

@@ -2,8 +2,8 @@ package com.crm.manager.service;
 
 import com.crm.rely.backend.core.dto.base.BaseResultDto;
 import com.crm.rely.backend.core.dto.business.email.sent.BusinessEmailSentRecordDto;
-import com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordAddEntity;
-import com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordSearchEntity;
+import com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordAddEntity;
+import com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordSearchEntity;
 import com.crm.rely.backend.exception.ServiceException;
 
 public interface BusinessEmailSentRecordService {

uacrd-manager-server/src/main/java/com/crm/manager/service/TenantService.java

@@ -0,0 +1,20 @@
+package com.crm.manager.service;
+
+import com.crm.rely.backend.core.dto.base.BaseResultWithPagerDto;
+import com.crm.rely.backend.core.entity.tenant.info.TenantAddEntity;
+import com.crm.rely.backend.core.entity.tenant.info.TenantEditEntity;
+import com.crm.rely.backend.core.entity.tenant.info.TenantRespEntity;
+import com.crm.rely.backend.core.entity.tenant.info.TenantSearchEntity;
+import com.crm.rely.backend.exception.ServiceException;
+
+public interface TenantService {
+    String add(TenantAddEntity entity);
+
+    TenantRespEntity findSingle(Long id);
+
+    String edit(TenantEditEntity entity);
+
+    String delete(Long id);
+
+    BaseResultWithPagerDto searchPage(TenantSearchEntity entity) throws ServiceException;
+}

uacrd-manager-server/src/main/java/com/crm/manager/service/impl/BusinessEmailReceiveRecordServiceImpl.java

@@ -10,8 +10,8 @@ import com.crm.rely.backend.core.constant.Constants;
 import com.crm.rely.backend.core.dto.base.PageDto;
 import com.crm.rely.backend.core.dto.base.ResultWithPagerDto;
 import com.crm.rely.backend.core.dto.business.email.receive.BusinessEmailReceiveRecordDto;
-import com.crm.rely.backend.core.entity.business.email.receive.BusinessEmailReceiveRecordAddEntity;
-import com.crm.rely.backend.core.entity.business.email.receive.BusinessEmailReceiveRecordSearchEntity;
+import com.crm.rely.backend.core.entity.tenant.email.receive.BusinessEmailReceiveRecordAddEntity;
+import com.crm.rely.backend.core.entity.tenant.email.receive.BusinessEmailReceiveRecordSearchEntity;
 import com.crm.rely.backend.core.pojo.table.BusinessEmailReceiveRecordTable;
 import com.crm.rely.backend.core.pojo.table.UserInfoTable;
 import com.crm.rely.backend.exception.ServiceException;

uacrd-manager-server/src/main/java/com/crm/manager/service/impl/BusinessEmailSentRecordServiceImpl.java

@@ -11,8 +11,8 @@ import com.crm.rely.backend.core.dto.base.PageDto;
 import com.crm.rely.backend.core.dto.base.ResultWithPagerDto;
 import com.crm.rely.backend.core.dto.business.email.sent.BusinessEmailSentRecordDto;
 import com.crm.rely.backend.core.dto.user.info.UserInfoSearchDto;
-import com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordAddEntity;
-import com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordSearchEntity;
+import com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordAddEntity;
+import com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordSearchEntity;
 import com.crm.rely.backend.core.entity.system.email.SysEmailSendEntity;
 import com.crm.rely.backend.core.pojo.table.BusinessEmailSentRecordTable;
 import com.crm.rely.backend.exception.ServiceException;

uacrd-manager-server/src/main/java/com/crm/manager/service/impl/TenantServiceImpl.java

@@ -0,0 +1,91 @@
+package com.crm.manager.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.crm.manager.dao.mapper.TenantMapper;
+import com.crm.manager.dao.repository.TenantRepository;
+import com.crm.manager.service.TenantService;
+import com.crm.rely.backend.core.constant.Constants;
+import com.crm.rely.backend.core.dto.base.BaseResultWithPagerDto;
+import com.crm.rely.backend.core.dto.base.PageDto;
+import com.crm.rely.backend.core.dto.base.ResultWithPagerDto;
+import com.crm.rely.backend.core.dto.tenant.TenantSearchDto;
+import com.crm.rely.backend.core.entity.tenant.info.TenantAddEntity;
+import com.crm.rely.backend.core.entity.tenant.info.TenantEditEntity;
+import com.crm.rely.backend.core.entity.tenant.info.TenantRespEntity;
+import com.crm.rely.backend.core.entity.tenant.info.TenantSearchEntity;
+import com.crm.rely.backend.core.pojo.table.MerchantTable;
+import com.crm.rely.backend.exception.ServiceException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class TenantServiceImpl implements TenantService {
+
+    @Autowired
+    private TenantRepository tenantRepository;
+
+    @Autowired
+    private TenantMapper tenantMapper;
+
+    @Override
+    public String add(TenantAddEntity entity) {
+        log.info("添加商户：{}", JSON.toJSONString(entity));
+        MerchantTable merchantTable = new MerchantTable();
+        BeanUtils.copyProperties(entity, merchantTable);
+        tenantRepository.save(merchantTable);
+        return "添加成功";
+    }
+
+    @Override
+    public TenantRespEntity findSingle(Long id) {
+        log.info("查询商户：{}", id);
+        MerchantTable merchantTable = tenantRepository.findOne(id);
+        TenantRespEntity respEntity = new TenantRespEntity();
+        BeanUtils.copyProperties(merchantTable, respEntity);
+        return respEntity;
+    }
+
+    @Override
+    public String edit(TenantEditEntity entity) {
+        log.info("修改商户：{}", JSON.toJSONString(entity));
+        MerchantTable merchantTable = new MerchantTable();
+        BeanUtils.copyProperties(entity, merchantTable);
+        tenantRepository.save(merchantTable);
+        return "修改成功";
+    }
+
+    @Override
+    public String delete(Long id) {
+        log.info("删除商户：{}", id);
+        tenantRepository.delete(id);
+        return "删除成功";
+    }
+
+    @Override
+    public BaseResultWithPagerDto<List<TenantSearchDto>> searchPage(TenantSearchEntity entity) throws ServiceException {
+        PageDto pageDto = new PageDto();
+        Integer count = tenantMapper.searchByPageCount(entity);
+        if (count == null || count <= 0) {
+            return ResultWithPagerDto.success(pageDto);
+        }
+        pageDto = PageDto.format(entity, count);
+        List<MerchantTable> merchantTables = tenantMapper.searchByPageList(entity);
+        if (merchantTables == null || merchantTables.size() <= 0) {
+            throw new ServiceException(Constants.SYSTEM_ERROR);
+        }
+        List<TenantSearchDto> userInfoSearchDtos = merchantTables.stream().map(table -> {
+            TenantSearchDto dto = new TenantSearchDto();
+            BeanUtils.copyProperties(table, dto);
+            return dto;
+        }).collect(Collectors.toList());
+
+
+        return new BaseResultWithPagerDto(pageDto, userInfoSearchDtos);
+    }
+}

uacrd-manager-server/src/main/java/com/crm/manager/service/impl/UserRoleServiceImpl.java

@@ -149,6 +149,7 @@ public class UserRoleServiceImpl implements UserRoleService {
         sellerRoleOperateListEntity.setModifyIp(userRoleAddEntity.getAddIp());
         sellerRoleOperateListEntity.setDepartmentId(userRoleAddEntity.getDepartmentId());
         sellerRoleOperateListEntity.setRoleId(userRoleTable.getId());
+        sellerRoleOperateListEntity.setIsMerchantRole(userRoleAddEntity.getIsMerchantRole());
         sellerRoleOperateListEntity.setData(userRoleAddEntity.getData());
         updateRoleInfo(sellerRoleOperateListEntity);
     }
@@ -359,6 +360,9 @@ public class UserRoleServiceImpl implements UserRoleService {
             if (ValidateUtil.vStringNull(userRoleSearchEntity.getName())) {
                 predicates.add(cb.like(root.get("name").as(String.class), "%" + userRoleSearchEntity.getName() + "%"));
             }
+            if (userRoleSearchEntity.getMerchantId() != null) {
+                predicates.add(cb.equal(root.get("merchantId"), userRoleSearchEntity.getMerchantId()));
+            }
             //创建一个条件的集合，长度为上面满足条件的个数
             Predicate[] pre = new Predicate[predicates.size()];
             //这句大概意思就是将上面拼接好的条件返回去

uacrd-manager-server/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
       naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
     show-sql: true
   activemq:
-    broker-url: tcp://localhost:61616
+    broker-url: tcp://103.214.175.29:61616
 logging:
   level:
     com.crm.manager.dao.mapper: trace

uacrd-manager-server/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8888
 spring:
   profiles:
-    active: test
+    active: dev
   application:
     name: ucard-manager-service
 mybatis:

uacrd-manager-server/src/main/resources/mapper/BusinessEmailReceiveRecordMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.crm.manager.dao.mapper.BusinessEmailReceiveRecordMapper">
     <select id="selectCount" resultType="integer"
-            parameterType="com.crm.rely.backend.core.entity.business.email.receive.BusinessEmailReceiveRecordSearchEntity">
+            parameterType="com.crm.rely.backend.core.entity.tenant.email.receive.BusinessEmailReceiveRecordSearchEntity">
         select count(*)
         <include refid="fromTable">
         </include>
@@ -13,7 +13,7 @@
     </select>
 
     <select id="selectList" resultType="com.crm.rely.backend.core.pojo.table.BusinessEmailReceiveRecordTable"
-            parameterType="com.crm.rely.backend.core.entity.business.email.receive.BusinessEmailReceiveRecordSearchEntity">
+            parameterType="com.crm.rely.backend.core.entity.tenant.email.receive.BusinessEmailReceiveRecordSearchEntity">
         select business_email_receive_record.*
         <include refid="fromTable">
         </include>

uacrd-manager-server/src/main/resources/mapper/BusinessEmailSentRecordMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.crm.manager.dao.mapper.BusinessEmailSentRecordMapper">
     <select id="selectCount" resultType="integer"
-            parameterType="com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordSearchEntity">
+            parameterType="com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordSearchEntity">
         select count(*)
         <include refid="fromTable">
         </include>
@@ -13,7 +13,7 @@
     </select>
 
     <select id="selectList" resultType="com.crm.rely.backend.core.pojo.table.BusinessEmailSentRecordTable"
-            parameterType="com.crm.rely.backend.core.entity.business.email.sent.BusinessEmailSentRecordSearchEntity">
+            parameterType="com.crm.rely.backend.core.entity.tenant.email.sent.BusinessEmailSentRecordSearchEntity">
         select business_email_sent_record.*
         <include refid="fromTable">
         </include>

uacrd-manager-server/src/main/resources/mapper/TenantMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.crm.manager.dao.mapper.TenantMapper">
+    <select id="searchByPageCount" resultType="java.lang.Integer">
+        select count(merchant.id) from merchant
+        <include refid="selectCondition">
+        </include>
+    </select>
+
+    <select id="searchByPageList" resultType="com.crm.rely.backend.core.pojo.table.MerchantTable">
+        select id, merchant_code, merchant_name, admin_user_id, status, expire_time, max_users, add_time, add_user, add_ip, modify_time, modify_user, modify_ip, note from merchant
+        <include refid="selectCondition">
+        </include>
+        <if test="page != null">
+            limit #{page.offset},#{page.row}
+        </if>
+    </select>
+
+    <sql id="selectCondition">
+        where 1=1
+        <if test="merchantName!=null and merchantName!=''">
+            and merchant.merchant_name like concat('%',#{name},'%')
+        </if>
+    </sql>
+</mapper>

ucard-core/src/main/java/com/crm/rely/backend/core/dto/tenant/TenantSearchDto.java

@@ -0,0 +1,9 @@
+package com.crm.rely.backend.core.dto.tenant;
+
+import com.crm.rely.backend.core.dto.base.BaseInfoDto;
+import lombok.Data;
+
+@Data
+public class TenantSearchDto extends BaseInfoDto {
+    private String merchantName;
+}

ucard-core/src/main/java/com/crm/rely/backend/core/dto/user/info/UserInfoDto.java

@@ -117,6 +117,7 @@ public class UserInfoDto {
 
     private Integer valid;
     private Integer verified;
+    private Integer isAdmin;
 
     private List<UserNodeDisplayDto> display;
 

ucard-core/src/main/java/com/crm/rely/backend/core/entity/custom/info/IbInfoEntity.java

@@ -167,4 +167,6 @@ public class IbInfoEntity {
     private Integer levelNum;
 
     private Long attachId;
+
+    private Long merchantId;
 }

ucard-core/src/main/java/com/crm/rely/backend/core/entity/business/email/receive/BusinessEmailReceiveRecordAddEntity.java → ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/email/receive/BusinessEmailReceiveRecordAddEntity.java

@@ -1,4 +1,4 @@
-package com.crm.rely.backend.core.entity.business.email.receive;
+package com.crm.rely.backend.core.entity.tenant.email.receive;
 
 import com.crm.rely.backend.core.entity.base.BaseAddEntity;
 import lombok.Data;

ucard-core/src/main/java/com/crm/rely/backend/core/entity/business/email/receive/BusinessEmailReceiveRecordSearchEntity.java → ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/email/receive/BusinessEmailReceiveRecordSearchEntity.java

@@ -1,4 +1,4 @@
-package com.crm.rely.backend.core.entity.business.email.receive;
+package com.crm.rely.backend.core.entity.tenant.email.receive;
 
 import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
 import lombok.Data;

ucard-core/src/main/java/com/crm/rely/backend/core/entity/business/email/sent/BusinessEmailSentRecordAddEntity.java → ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/email/sent/BusinessEmailSentRecordAddEntity.java

@@ -1,4 +1,4 @@
-package com.crm.rely.backend.core.entity.business.email.sent;
+package com.crm.rely.backend.core.entity.tenant.email.sent;
 
 import com.crm.rely.backend.core.entity.base.BaseAddEntity;
 import lombok.Data;

ucard-core/src/main/java/com/crm/rely/backend/core/entity/business/email/sent/BusinessEmailSentRecordSearchEntity.java → ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/email/sent/BusinessEmailSentRecordSearchEntity.java

@@ -1,4 +1,4 @@
-package com.crm.rely.backend.core.entity.business.email.sent;
+package com.crm.rely.backend.core.entity.tenant.email.sent;
 
 import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
 import lombok.Data;

ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/info/TenantAddEntity.java

@@ -0,0 +1,16 @@
+package com.crm.rely.backend.core.entity.tenant.info;
+
+import com.crm.rely.backend.core.entity.base.BaseAddEntity;
+import lombok.Data;
+
+@Data
+public class TenantAddEntity extends BaseAddEntity {
+    /**
+     * 商户ID
+     */
+    private Long id;
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+}

ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/info/TenantEditEntity.java

@@ -0,0 +1,15 @@
+package com.crm.rely.backend.core.entity.tenant.info;
+
+import lombok.Data;
+
+@Data
+public class TenantEditEntity {
+    /**
+     * 商户ID
+     */
+    private Long id;
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+}

ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/info/TenantRespEntity.java

@@ -0,0 +1,15 @@
+package com.crm.rely.backend.core.entity.tenant.info;
+
+import lombok.Data;
+
+@Data
+public class TenantRespEntity {
+    /**
+     * 商户ID
+     */
+    private Long id;
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+}

ucard-core/src/main/java/com/crm/rely/backend/core/entity/tenant/info/TenantSearchEntity.java

@@ -0,0 +1,12 @@
+package com.crm.rely.backend.core.entity.tenant.info;
+
+import com.crm.rely.backend.core.entity.base.BaseSearchPageEntity;
+import lombok.Data;
+
+@Data
+public class TenantSearchEntity extends BaseSearchPageEntity {
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+}

ucard-core/src/main/java/com/crm/rely/backend/core/entity/user/role/UserRoleAddEntity.java

@@ -17,6 +17,8 @@ public class UserRoleAddEntity extends BaseAddEntity {
     @Size(min = 2, max = 20, message = ManagerConstant.ROLE_NAME_FORMAT_2_20_ERROR)
     private String name;
 
+    private Integer isMerchantRole;
+
     private String code;
 
     private Long departmentId;

ucard-core/src/main/java/com/crm/rely/backend/core/entity/user/role/UserRoleOperateListEntity.java

@@ -14,5 +14,7 @@ public class UserRoleOperateListEntity extends BaseUpdateEntity {
 
     private Long departmentId;
 
+    private Integer isMerchantRole;
+
     private List<UserRoleOperateEntity> data;
 }

ucard-core/src/main/java/com/crm/rely/backend/core/entity/user/role/UserRoleSearchEntity.java

@@ -9,6 +9,8 @@ import java.util.Date;
 public class UserRoleSearchEntity extends BaseSearchPageEntity {
     private String name;
 
+    private Long merchantId;
+
     private Date startDate;
 
     private Date endDate;

ucard-core/src/main/java/com/crm/rely/backend/core/pojo/table/MerchantTable.java

@@ -0,0 +1,17 @@
+package com.crm.rely.backend.core.pojo.table;
+
+import com.crm.rely.backend.core.pojo.BaseTable;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name = "merchant")
+public class MerchantTable extends BaseTable {
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+}

ucard-core/src/main/java/com/crm/rely/backend/core/pojo/table/UserInfoTable.java

@@ -232,4 +232,6 @@ public class UserInfoTable extends BaseTable {
      */
     private Date resignDate;
 
+    private Long merchantId;
+
 }

ucard-core/src/main/java/com/crm/rely/backend/core/pojo/table/UserRoleTable.java

@@ -29,4 +29,6 @@ public class UserRoleTable extends BaseTable {
      * 员工数量
      */
     private Integer number;
+
+    private Integer merchantId;
 }

ucard-eureka/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 spring:
   activemq:
-    broker-url: tcp://localhost:61616
+    broker-url: tcp://103.214.175.29:61616
 notice:
   down: 645571361@qq.com
 #