Skip to content

G
gic-platform-enterprise
Commit d1d75eac by zhiwj
Options

Merge branch 'developer' of… 

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
parents 3e193bb6 3a2ed374
Showing with 190 additions and 98 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/EnterpriseApiService.java
......@@ -4,69 +4,93 @@ import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.dto.EnterpriseInitDTO;
import com.gic.enterprise.dto.EnterpriseListDTO;
import java.util.List;
/**
* @author guojx
* @date 2019/7/16 4:12 PM
* 商户相关操作
* @ClassName: EnterpriseApiService

* @Description: 

* @author guojuxing

* @date 2019/8/8 4:39 PM

*/
public interface EnterpriseApiService {
/**
* 新建商户
* @param enterpriseDTO
* @return 主键ID
*/
ServiceResponse<Integer> saveEnterprise(EnterpriseDTO enterpriseDTO);
/**
* 新建商户
* 新增商户和超级管理员
* @Title: saveEnterprise

* @Description:

 * @author guojuxing
* @param enterpriseDTO
* @param userDTO
* @return 主键ID
*/
* @param userDTO

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>


 */
ServiceResponse<Integer> saveEnterprise(EnterpriseDTO enterpriseDTO, UserDTO userDTO);
/**
* 编辑保存
* @param enterpriseDTO
* @return
*/
* @Title: editEnterprise

* @Description:

 * @author guojuxing
* @param enterpriseDTO

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>


 */
ServiceResponse<Integer> editEnterprise(EnterpriseDTO enterpriseDTO);
/**
* 根据主键获取数据
* @param enterpriseId
* @return
*/
* 查询单条数据
* @Title: getEnterpriseById

* @Description:

 * @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.EnterpriseDTO>


 */
ServiceResponse<EnterpriseDTO> getEnterpriseById(Integer enterpriseId);
/**
* 停用
* @param enterpriseId
* @return
*/
* 商户停用
* @Title: disableEnterprise

* @Description:

 * @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse


 */
ServiceResponse disableEnterprise(Integer enterpriseId);
/**
* 启用
* @param enterpriseId
* @return
*/
* 商户启用
* @Title: enableEnterprise

* @Description:

 * @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse


 */
ServiceResponse enableEnterprise(Integer enterpriseId);
/**
* 分页查询商户信息
* @Title: listEnterprise

* @Description:

 * @author guojuxing
* @param search
* @param serviceVersion
* @param status
* @param orderBy
* @param pageNum
* @param pageSize

* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.EnterpriseListDTO>>


 */
ServiceResponse<Page<EnterpriseListDTO>> listEnterprise(String search, Integer serviceVersion,
Integer status, String orderBy,
Integer pageNum, Integer pageSize);
/**
* 初始化商户
* @param enterpriseId
* @return
*/
* 商户初始化标志改成已初始化状态
* @Title: initEnterprise

* @Description:

 * @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse


 */
ServiceResponse initEnterprise(Integer enterpriseId);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabEnterpriseMapper.java
......@@ -56,15 +56,30 @@ public interface TabEnterpriseMapper {
int updateByPrimaryKey(TabEnterprise record);
/**
* 根据企业名称相同的个数
* 根据商户名称相同的个数
* @Title: countByName

* @Description:

 * @author guojuxing
* @param enterpriseName
* @param enterpriseId
* @return
*/
* @param enterpriseId

* @return int


 */
int countByEnterpriseName(@Param("enterpriseName") String enterpriseName,
@Param("enterpriseId") Integer enterpriseId);
/**
* 根据公司名称相同的个数
* @Title: countByName

* @Description:

 * @author guojuxing
* @param companyName
* @param enterpriseId

* @return int


 */
int countByCompanyName(@Param("companyName") String companyName,
@Param("enterpriseId") Integer enterpriseId);
/**
* 查询列表
* @param search 商户名称或者公司名称
* @param serviceVersion
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/EnterpriseService.java
......@@ -6,53 +6,101 @@ import com.gic.enterprise.entity.TabEnterprise;
import com.github.pagehelper.Page;
/**
* @author guojx
* @date 2019/7/16 4:13 PM
* 商户
* @ClassName: EnterpriseService

* @Description: 

* @author guojuxing

* @date 2019/8/8 4:43 PM

*/
public interface EnterpriseService {
/**
* 新增商户
* @param enterpriseDTO
* @return
*/
* 新建商户
* @Title: saveEnterprise

* @Description:

 * @author guojuxing
* @param enterpriseDTO

* @return int


 */
int saveEnterprise(EnterpriseDTO enterpriseDTO);
/**
* 编辑保存
* @param enterpriseDTO
*/
* @Title: editEnterprise

* @Description:

 * @author guojuxing
* @param enterpriseDTO

* @return void


 */
void editEnterprise(EnterpriseDTO enterpriseDTO);
/**
* 根据主键获取数据
* @param enterpriseId
* @return
*/
* 根据主键获取
* @Title: getEnterpriseById

* @Description:

 * @author guojuxing
* @param enterpriseId

* @return com.gic.enterprise.entity.TabEnterprise


 */
TabEnterprise getEnterpriseById(Integer enterpriseId);
/**
* 企业名称是否重复
* 商户名称是否重复
* @Title: isRepeatEnterpriseName

* @Description:

 * @author guojuxing
* @param enterpriseName
* @param enterpriseId
* @return
*/
* @param enterpriseId

* @return boolean


 */
boolean isRepeatEnterpriseName(String enterpriseName, Integer enterpriseId);
/**
* 停用、启用
* 公司名称是否重复
* @Title: isRepeatEnterpriseName

* @Description:

 * @author guojuxing
* @param companyName
* @param enterpriseId

* @return boolean


 */
boolean isRepeatCompanyName(String companyName, Integer enterpriseId);
/**
* 商户启用、停用
* @Title: changeEnterpriseStatus

* @Description:

 * @author guojuxing
* @param enterpriseId
* @param status
*/
* @param status

* @return void


 */
void changeEnterpriseStatus(Integer enterpriseId, Integer status);
/**
* 分页查询商户
* @Title: listEnterprise

* @Description:

 * @author guojuxing
* @param search
* @param serviceVersion
* @param status
* @param orderBy
* @param pageNum
* @param pageSize

* @return com.github.pagehelper.Page<com.gic.enterprise.dto.EnterpriseListDTO>


 */
Page<EnterpriseListDTO> listEnterprise(String search, Integer serviceVersion,
Integer status, String orderBy,
Integer pageNum, Integer pageSize);
/**
* 初始化商户
* @param enterpriseId
*/
* 商户初始化字段改为已初始化状态
* @Title: initEnterprise

* @Description:

 * @author guojuxing
* @param enterpriseId

* @return void


 */
void initEnterprise(Integer enterpriseId);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/EnterpriseServiceImpl.java
package com.gic.enterprise.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabEnterpriseMapper;
import com.gic.enterprise.dto.EnterpriseDTO;
......@@ -8,11 +14,6 @@ import com.gic.enterprise.entity.TabEnterprise;
import com.gic.enterprise.service.EnterpriseService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @author guojx
......@@ -52,6 +53,15 @@ public class EnterpriseServiceImpl implements EnterpriseService{
}
@Override
public boolean isRepeatCompanyName(String companyName, Integer enterpriseId) {
int count = tabEnterpriseMapper.countByCompanyName(companyName, enterpriseId);
if (count > 0) {
return true;
}
return false;
}
@Override
public void changeEnterpriseStatus(Integer enterpriseId, Integer status) {
TabEnterprise tabEnterprise = new TabEnterprise();
tabEnterprise.setEnterpriseId(enterpriseId);
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/EnterpriseApiServiceImpl.java
package com.gic.enterprise.service.outer;
import java.util.Date;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
......@@ -8,7 +14,6 @@ import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.constant.EnterpriseStatusTypeEnum;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.dto.EnterpriseInitDTO;
import com.gic.enterprise.dto.EnterpriseListDTO;
import com.gic.enterprise.entity.TabEnterprise;
import com.gic.enterprise.error.ErrorCode;
......@@ -17,12 +22,6 @@ import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.service.EnterpriseInitService;
import com.gic.enterprise.service.EnterpriseService;
import com.gic.store.utils.valid.ValidUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
* @author guojx
......@@ -38,27 +37,6 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
private EnterpriseInitService enterpriseInitService;
@Override
public ServiceResponse<Integer> saveEnterprise(EnterpriseDTO enterpriseDTO) {
//valid param
ServiceResponse paramResult = ValidUtil.allCheckValidate(enterpriseDTO, EnterpriseDTO.SaveEnterpriseValid.class);
if (!paramResult.isSuccess()) {
return paramResult;
}
if (enterpriseService.isRepeatEnterpriseName(enterpriseDTO.getEnterpriseName(), null)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户名称不能重复");
}
enterpriseDTO.setCreateTime(new Date());
enterpriseDTO.setUpdateTime(new Date());
enterpriseDTO.setIsInitComplete(0);
enterpriseDTO.setStatus(EnterpriseStatusTypeEnum.EFFECTIVE.getCode());
int enterpriseId = enterpriseService.saveEnterprise(enterpriseDTO);
//todo 新增商户初始化配置信息
return ServiceResponse.success(enterpriseId);
}
@Override
@Transactional(rollbackFor = Exception.class)
public ServiceResponse<Integer> saveEnterprise(EnterpriseDTO enterpriseDTO, UserDTO userDTO) {
//valid param
......@@ -69,6 +47,9 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
if (enterpriseService.isRepeatEnterpriseName(enterpriseDTO.getEnterpriseName(), null)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户名称不能重复");
}
if (enterpriseService.isRepeatCompanyName(enterpriseDTO.getCompanyName(), null)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "公司名称不能重复");
}
enterpriseDTO.setCreateTime(new Date());
enterpriseDTO.setUpdateTime(new Date());
......@@ -84,7 +65,7 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
userDTO.setSuperAdmin(1);
ServiceResponse userResult = userApiService.saveUser(userDTO);
if (userResult.isSuccess()) {
return ServiceResponse.success();
return ServiceResponse.success(enterpriseId);
} else {
throw new EnterpriseException(userResult.getCode(), userResult.getMessage());
}
......@@ -98,13 +79,18 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
if (!paramResult.isSuccess()) {
return paramResult;
}
TabEnterprise tabEnterprise = enterpriseService.getEnterpriseById(enterpriseDTO.getEnterpriseId());
//商户ID
int enterpriseId = enterpriseDTO.getEnterpriseId();
TabEnterprise tabEnterprise = enterpriseService.getEnterpriseById(enterpriseId);
if (tabEnterprise == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "企业ID错误，查询不到数据");
}
if (enterpriseService.isRepeatEnterpriseName(enterpriseDTO.getEnterpriseName(), enterpriseDTO.getEnterpriseId())) {
if (enterpriseService.isRepeatEnterpriseName(enterpriseDTO.getEnterpriseName(), enterpriseId)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户名称不能重复");
}
if (enterpriseService.isRepeatCompanyName(enterpriseDTO.getCompanyName(), enterpriseId)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "公司名称不能重复");
}
enterpriseDTO.setUpdateTime(new Date());
enterpriseService.editEnterprise(enterpriseDTO);
......
gic-platform-enterprise-service/src/main/resources/mapper/TabEnterpriseMapper.xml
......@@ -160,6 +160,15 @@
</if>
</select>
<select id="countByCompanyName" resultType="int">
select count(1) from tab_enterprise
where status <![CDATA[ <> ]]> 0
and company_name = #{companyName}
<if test="enterpriseId != null">
enterprise_id <![CDATA[ <> ]]> #{enterpriseId}
</if>
</select>
<select id="listEnterpriseId" resultType="com.gic.enterprise.dto.EnterpriseListDTO">
SELECT
a.enterprise_id enterpriseId,
......
gic-platform-operation-web/pom.xml
......@@ -152,7 +152,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.1.5.RELEASE</version>
<configuration>
<mainClass>com.gic.enterprise.web.Main</mainClass>
<mainClass>com.gic.operation.web.Main</mainClass>
</configuration>
<executions>
<execution>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment