Commit c72d8505 by zhiwj

Merge remote-tracking branch 'origin/developer' into developer

parents 1dce13ed b64c9878
package com.gic.cloud.dto;
import java.io.Serializable;
import java.util.Date;
/**
* 暂存区
* @ClassName: TempStoreConditionDTO

* @Description: 

* @author guojuxing

* @date 2020/7/9 11:40 AM

*/
public class TempStoreConditionDTO implements Serializable{
private static final long serialVersionUID = -946079849874069372L;
/**
* ID
*/
private Integer tempStoreConditionId;
/**
* storeWidgetId
*/
private Integer storeWidgetId;
/**
*
*/
private Integer enterpriseId;
/**
* 1:有效 0:无效
*/
private Integer status;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
public Integer getTempStoreConditionId() {
return tempStoreConditionId;
}
public TempStoreConditionDTO setTempStoreConditionId(Integer tempStoreConditionId) {
this.tempStoreConditionId = tempStoreConditionId;
return this;
}
public Integer getStoreWidgetId() {
return storeWidgetId;
}
public TempStoreConditionDTO setStoreWidgetId(Integer storeWidgetId) {
this.storeWidgetId = storeWidgetId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TempStoreConditionDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getStatus() {
return status;
}
public TempStoreConditionDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TempStoreConditionDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TempStoreConditionDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
package com.gic.cloud.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.cloud.dto.TempStoreConditionDTO;
public interface TempStoreConditionApiService {
ServiceResponse<Integer> saveOrUpdateTempStoreCondition(TempStoreConditionDTO dto);
ServiceResponse<TempStoreConditionDTO> getTempStoreCondition(Integer enterpriseId);
}
package com.gic.cloud.dao.mapper;
import com.gic.cloud.entity.TabSysTempStoreCondition;
import org.apache.ibatis.annotations.Param;
public interface TabSysTempStoreConditionMapper {
/**
* 根据主键删除
*
* @param tempStoreConditionId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer tempStoreConditionId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabSysTempStoreCondition record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabSysTempStoreCondition record);
/**
* 根据主键查询
*
* @param tempStoreConditionId 主键
* @return 实体对象
*/
TabSysTempStoreCondition selectByPrimaryKey(Integer tempStoreConditionId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabSysTempStoreCondition record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabSysTempStoreCondition record);
TabSysTempStoreCondition getTempStoreCondition(@Param("enterpriseId") Integer enterpriseId);
}
\ No newline at end of file
package com.gic.cloud.entity;
import java.util.Date;
/**
* tab_sys_temp_store_condition
*/
public class TabSysTempStoreCondition {
/**
* ID
*/
private Integer tempStoreConditionId;
/**
* storeWidgetId
*/
private Integer storeWidgetId;
/**
*
*/
private Integer enterpriseId;
/**
* 1:有效 0:无效
*/
private Integer status;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
public Integer getTempStoreConditionId() {
return tempStoreConditionId;
}
public TabSysTempStoreCondition setTempStoreConditionId(Integer tempStoreConditionId) {
this.tempStoreConditionId = tempStoreConditionId;
return this;
}
public Integer getStoreWidgetId() {
return storeWidgetId;
}
public TabSysTempStoreCondition setStoreWidgetId(Integer storeWidgetId) {
this.storeWidgetId = storeWidgetId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabSysTempStoreCondition setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getStatus() {
return status;
}
public TabSysTempStoreCondition setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TabSysTempStoreCondition setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TabSysTempStoreCondition setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
\ No newline at end of file
package com.gic.cloud.service;
import com.gic.cloud.dto.TempStoreConditionDTO;
import com.gic.cloud.entity.TabSysTempStoreCondition;
public interface TempStoreConditionService {
Integer saveTempStoreCondition(TempStoreConditionDTO dto);
void editTempStoreCondition(TempStoreConditionDTO dto);
TabSysTempStoreCondition getTempStoreCondition(Integer enterpriseId);
}
package com.gic.cloud.service.impl;
import com.gic.cloud.dao.mapper.TabSysTempStoreConditionMapper;
import com.gic.cloud.dto.TempStoreConditionDTO;
import com.gic.cloud.entity.TabSysTempStoreCondition;
import com.gic.cloud.service.TempStoreConditionService;
import com.gic.commons.util.EntityUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service("tempStoreConditionService")
public class TempStoreConditionServiceImpl implements TempStoreConditionService{
@Autowired
private TabSysTempStoreConditionMapper tabSysTempStoreConditionMapper;
@Override
public Integer saveTempStoreCondition(TempStoreConditionDTO dto) {
TabSysTempStoreCondition record = EntityUtil.changeEntityNew(TabSysTempStoreCondition.class, dto);
Date now = new Date();
record.setCreateTime(now);
record.setUpdateTime(now);
record.setStatus(1);
tabSysTempStoreConditionMapper.insert(record);
return record.getTempStoreConditionId();
}
@Override
public void editTempStoreCondition(TempStoreConditionDTO dto) {
TabSysTempStoreCondition record = EntityUtil.changeEntityNew(TabSysTempStoreCondition.class, dto);
record.setUpdateTime(new Date());
tabSysTempStoreConditionMapper.updateByPrimaryKeySelective(record);
}
@Override
public TabSysTempStoreCondition getTempStoreCondition(Integer enterpriseId) {
return tabSysTempStoreConditionMapper.getTempStoreCondition(enterpriseId);
}
}
package com.gic.cloud.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.cloud.dto.TempStoreConditionDTO;
import com.gic.cloud.entity.TabSysTempStoreCondition;
import com.gic.cloud.service.TempStoreConditionApiService;
import com.gic.cloud.service.TempStoreConditionService;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.error.ErrorCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service("tempStoreConditionApiService")
public class TempStoreConditionApiServiceImpl implements TempStoreConditionApiService{
@Autowired
private TempStoreConditionService tempStoreConditionService;
@Override
public ServiceResponse<Integer> saveOrUpdateTempStoreCondition(TempStoreConditionDTO dto) {
if (dto.getStoreWidgetId() == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店设置不能为空");
}
TabSysTempStoreCondition record = tempStoreConditionService.getTempStoreCondition(dto.getEnterpriseId());
Integer id;
if (record == null) {
if (dto.getEnterpriseId() == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID不能为空");
}
id = tempStoreConditionService.saveTempStoreCondition(dto);
} else {
dto.setEnterpriseId(record.getEnterpriseId());
dto.setTempStoreConditionId(record.getTempStoreConditionId());
tempStoreConditionService.editTempStoreCondition(dto);
id = record.getTempStoreConditionId();
}
return ServiceResponse.success(id);
}
@Override
public ServiceResponse<TempStoreConditionDTO> getTempStoreCondition(Integer enterpriseId) {
return ServiceResponse.success(EntityUtil.changeEntityNew(TempStoreConditionDTO.class,
tempStoreConditionService.getTempStoreCondition(enterpriseId)));
}
}
......@@ -20,6 +20,5 @@
<dubbo:service interface="com.gic.cloud.service.FunctionApiService" ref="functionApiService" timeout="6000" />
<dubbo:service interface="com.gic.cloud.service.FunctionModuleApiService" ref="functionModuleApiService" timeout="6000" />
<dubbo:service interface="com.gic.cloud.service.DataAuthApiService" ref="dataAuthApiService" timeout="6000" />
<dubbo:service interface="com.gic.cloud.service.DataExplainApiService" ref="functionApiService" timeout="6000" />
<dubbo:service interface="com.gic.cloud.service.IndexApiService" ref="functionApiService" timeout="6000" />
<dubbo:service interface="com.gic.cloud.service.TempStoreConditionApiService" ref="tempStoreConditionApiService" timeout="6000" />
</beans>
<?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.gic.cloud.dao.mapper.TabSysTempStoreConditionMapper">
<resultMap id="BaseResultMap" type="com.gic.cloud.entity.TabSysTempStoreCondition">
<id column="temp_store_condition_id" jdbcType="INTEGER" property="tempStoreConditionId" />
<result column="store_widget_id" jdbcType="INTEGER" property="storeWidgetId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
temp_store_condition_id, store_widget_id, enterprise_id, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_sys_temp_store_condition
where temp_store_condition_id = #{tempStoreConditionId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_sys_temp_store_condition
where temp_store_condition_id = #{tempStoreConditionId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.cloud.entity.TabSysTempStoreCondition" useGeneratedKeys="true" keyProperty="tempStoreConditionId">
insert into tab_sys_temp_store_condition (temp_store_condition_id, store_widget_id,
enterprise_id, status, create_time,
update_time)
values (#{tempStoreConditionId,jdbcType=INTEGER}, #{storeWidgetId,jdbcType=INTEGER},
#{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.cloud.entity.TabSysTempStoreCondition">
insert into tab_sys_temp_store_condition
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tempStoreConditionId != null">
temp_store_condition_id,
</if>
<if test="storeWidgetId != null">
store_widget_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tempStoreConditionId != null">
#{tempStoreConditionId,jdbcType=INTEGER},
</if>
<if test="storeWidgetId != null">
#{storeWidgetId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.cloud.entity.TabSysTempStoreCondition">
update tab_sys_temp_store_condition
<set>
<if test="storeWidgetId != null">
store_widget_id = #{storeWidgetId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where temp_store_condition_id = #{tempStoreConditionId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.cloud.entity.TabSysTempStoreCondition">
update tab_sys_temp_store_condition
set store_widget_id = #{storeWidgetId,jdbcType=INTEGER},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where temp_store_condition_id = #{tempStoreConditionId,jdbcType=INTEGER}
</update>
<select id="getTempStoreCondition" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"></include>
from tab_sys_temp_store_condition
where enterprise_id = #{enterpriseId}
and status = 1
</select>
</mapper>
\ No newline at end of file
package com.gic.cloud.web.controller;
import com.gic.store.service.StoreDictApiService;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.cloud.dto.TempStoreConditionDTO;
import com.gic.cloud.service.TempStoreConditionApiService;
import com.gic.cloud.web.vo.TempStoreConditionDetailVO;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.store.dto.StoreSearchDTO;
import com.gic.store.dto.StoreWidgetDTO;
import com.gic.store.service.StoreApiService;
import com.gic.store.service.StoreWidgetApiService;
@RestController
@RequestMapping("temp-store")
public class TempStoreConditionController {
private static Logger LOGGER = LogManager.getLogger(TempStoreConditionController.class);
@Autowired
private TempStoreConditionApiService tempStoreConditionApiService;
@Autowired
private StoreWidgetApiService storeWidgetApiService;
@Autowired
private StoreApiService storeApiService;
@Autowired
private StoreDictApiService storeDictApiService;
@RequestMapping("/save-or-update-temp-store-condition")
public RestResponse saveTempStoreCondition(TempStoreConditionDTO dto) {
dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
return ResultControllerUtils.commonResult(tempStoreConditionApiService.saveOrUpdateTempStoreCondition(dto));
}
@RequestMapping("/get-temp-store-condition")
public RestResponse getTempStoreCondition() {
return ResultControllerUtils.commonResultOne(tempStoreConditionApiService
.getTempStoreCondition(UserDetailUtils.getUserDetail().getEnterpriseId()), TempStoreConditionDetailVO.class);
}
@RequestMapping("/list-store-status")
public RestResponse listStoreStatus() {
return ResultControllerUtils.commonResult(storeDictApiService
.listAllStoreStatus(UserDetailUtils.getUserDetail().getEnterpriseId()));
}
@RequestMapping("/query-temp-store")
public RestResponse queryTempStore(@RequestBody StoreSearchDTO storeSearchDTO) {
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
storeSearchDTO.setEnterpriseId(enterpriseId);
ServiceResponse<TempStoreConditionDTO> result = tempStoreConditionApiService.getTempStoreCondition(enterpriseId);
if (result.isSuccess()) {
TempStoreConditionDTO tempStoreConditionDTO = result.getResult();
if (tempStoreConditionDTO != null) {
StoreWidgetDTO storeWidgetDTO = this.storeWidgetApiService.getStoreWidget(tempStoreConditionDTO.getStoreWidgetId()).getResult();
if (storeWidgetDTO != null) {
String authSearchParam = storeWidgetDTO.getAuthSearchParam();
String searchParam = storeWidgetDTO.getSearchParam();
if (StringUtils.isNotBlank(authSearchParam) && !"{}".equals(authSearchParam)) {
storeSearchDTO.setAuthSearchJson(authSearchParam);
}
storeSearchDTO.setSearchJson(searchParam);
}
}
}
return ResultControllerUtils.commonResult(storeApiService.listStore(storeSearchDTO, storeSearchDTO.getCurrentPage(), storeSearchDTO.getPageSize()));
}
}
......@@ -4,7 +4,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.cloud.service.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......@@ -108,12 +110,24 @@ public class UserController {
}
@RequestMapping("/bulk-transfer-user-to-new-account-group")
public RestResponse bulkTransferAccountGroup(String userIds, Integer targetAccountGroupId) {
List<Integer> userIdList = Arrays.stream(userIds.split(","))
.filter(e -> StringUtils.isNumeric(e))
.mapToInt(e -> Integer.parseInt(e))
.boxed()
.collect(Collectors.toList());
public RestResponse bulkTransferAccountGroup(String userIds, Integer targetAccountGroupId, boolean isAll) {
List<Integer> userIdList = null;
if (isAll) {
ServiceResponse<List<UserDTO>> result = userApiService.listUser(new UserQO()
.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId()));
if (result.isSuccess()) {
List<UserDTO> userList = result.getResult();
if (CollectionUtils.isNotEmpty(userList)) {
userIdList = userList.stream().map(e -> e.getUserId()).collect(Collectors.toList());
}
}
} else {
userIdList = Arrays.stream(userIds.split(","))
.filter(e -> StringUtils.isNumeric(e))
.mapToInt(e -> Integer.parseInt(e))
.boxed()
.collect(Collectors.toList());
}
return ResultControllerUtils.commonResult(userApiService.bulkTransferAccountGroup(userIdList, targetAccountGroupId));
}
}
package com.gic.cloud.web.vo;
import java.io.Serializable;
public class TempStoreConditionDetailVO implements Serializable{
private static final long serialVersionUID = -7805642144310444982L;
/**
* ID
*/
private Integer tempStoreConditionId;
/**
* storeWidgetId
*/
private Integer storeWidgetId;
public Integer getTempStoreConditionId() {
return tempStoreConditionId;
}
public TempStoreConditionDetailVO setTempStoreConditionId(Integer tempStoreConditionId) {
this.tempStoreConditionId = tempStoreConditionId;
return this;
}
public Integer getStoreWidgetId() {
return storeWidgetId;
}
public TempStoreConditionDetailVO setStoreWidgetId(Integer storeWidgetId) {
this.storeWidgetId = storeWidgetId;
return this;
}
}
......@@ -143,4 +143,5 @@
<dubbo:reference interface="com.gic.cloud.service.FunctionApiService" id="functionApiService" timeout="6000" retries="0"/>
<dubbo:reference interface="com.gic.cloud.service.FunctionModuleApiService" id="functionModuleApiService" timeout="6000" retries="0"/>
<dubbo:reference interface="com.gic.cloud.service.DataAuthApiService" id="dataAuthApiService" timeout="6000" retries="0"/>
<dubbo:reference interface="com.gic.cloud.service.TempStoreConditionApiService" id="tempStoreConditionApiService" timeout="6000" retries="0"/>
</beans>
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