Commit 72a7f5a6 by guojuxing

业绩指标配置:默认数据设置

parent b78e2790
package com.gic.enterprise.dto.data;
import java.io.Serializable;
import java.util.Date;
public class DataPerformanceConfigDTO implements Serializable{
private static final long serialVersionUID = -4011724836821764949L;
/**
*
*/
private Integer performanceConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 订单数 指标 1:『『订单总数』2:『销售单数』 3:有效订单数』 4:『成交单数』
*/
private Integer orderNumber;
/**
* 订单人数 1:『消费人数』 2:『有效成交人数』 3:『『成交人数』
*/
private Integer orderPeopleNumber;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getPerformanceConfigId() {
return performanceConfigId;
}
public DataPerformanceConfigDTO setPerformanceConfigId(Integer performanceConfigId) {
this.performanceConfigId = performanceConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public DataPerformanceConfigDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getOrderNumber() {
return orderNumber;
}
public DataPerformanceConfigDTO setOrderNumber(Integer orderNumber) {
this.orderNumber = orderNumber;
return this;
}
public Integer getOrderPeopleNumber() {
return orderPeopleNumber;
}
public DataPerformanceConfigDTO setOrderPeopleNumber(Integer orderPeopleNumber) {
this.orderPeopleNumber = orderPeopleNumber;
return this;
}
public Integer getStatus() {
return status;
}
public DataPerformanceConfigDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public DataPerformanceConfigDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public DataPerformanceConfigDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
......@@ -3,6 +3,7 @@ package com.gic.enterprise.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import java.util.List;
......@@ -72,4 +73,34 @@ public interface DataConfigApiService {

*/
ServiceResponse<Void> initSingleEffectConfig(Integer enterpriseId);
/**
* 业绩指标配置
* @Title: configPerformance

* @Description:

* @author guojuxing
* @param dto

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


*/
ServiceResponse<Void> configPerformance(DataPerformanceConfigDTO dto);
/**
* 获取业绩指标配置
* @Title: getPerformanceConfig

* @Description:

* @author guojuxing
* @param enterpriseId

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


*/
ServiceResponse<DataPerformanceConfigDTO> getPerformanceConfig(Integer enterpriseId);
/**
* 新增商户的时候设置业绩指标配置默认数据
* @Title: initPerformanceConfig

* @Description:

* @author guojuxing
* @param enterpriseId

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


*/
ServiceResponse<Void> initPerformanceConfig(Integer enterpriseId);
}
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabDataPerformanceConfig;
public interface TabDataPerformanceConfigMapper {
/**
* 根据主键删除
*
* @param performanceConfigId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer performanceConfigId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabDataPerformanceConfig record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabDataPerformanceConfig record);
/**
* 根据主键查询
*
* @param performanceConfigId 主键
* @return 实体对象
*/
TabDataPerformanceConfig selectByPrimaryKey(Integer performanceConfigId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabDataPerformanceConfig record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabDataPerformanceConfig record);
TabDataPerformanceConfig getByEnterpriseId(Integer enterpriseId);
}
\ No newline at end of file
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_data_performance_config
*/
public class TabDataPerformanceConfig {
/**
*
*/
private Integer performanceConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 订单数 指标 1:『『订单总数』2:『销售单数』 3:有效订单数』 4:『成交单数』
*/
private Integer orderNumber;
/**
* 订单人数 1:『消费人数』 2:『有效成交人数』 3:『『成交人数』
*/
private Integer orderPeopleNumber;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getPerformanceConfigId() {
return performanceConfigId;
}
public TabDataPerformanceConfig setPerformanceConfigId(Integer performanceConfigId) {
this.performanceConfigId = performanceConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabDataPerformanceConfig setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getOrderNumber() {
return orderNumber;
}
public TabDataPerformanceConfig setOrderNumber(Integer orderNumber) {
this.orderNumber = orderNumber;
return this;
}
public Integer getOrderPeopleNumber() {
return orderPeopleNumber;
}
public TabDataPerformanceConfig setOrderPeopleNumber(Integer orderPeopleNumber) {
this.orderPeopleNumber = orderPeopleNumber;
return this;
}
public Integer getStatus() {
return status;
}
public TabDataPerformanceConfig setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TabDataPerformanceConfig setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TabDataPerformanceConfig setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
\ No newline at end of file
package com.gic.enterprise.service;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.entity.TabDataPerformanceConfig;
public interface DataPerformanceConfigService {
/**
* 新增单效取值配置
* @Title: savePerformanceConfig

* @Description:

* @author guojuxing
* @param dto

* @return void


*/
void savePerformanceConfig(DataPerformanceConfigDTO dto);
void editPerformanceConfig(DataPerformanceConfigDTO dto);
/**
* 根据商户ID查询配置
* @Title: getByEnterpriseId

* @Description:

* @author guojuxing
* @param enterpriseId

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


*/
TabDataPerformanceConfig getByEnterpriseId(Integer enterpriseId);
}
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabDataPerformanceConfigMapper;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.entity.TabDataPerformanceConfig;
import com.gic.enterprise.service.DataPerformanceConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service("dataPerformanceConfigService")
public class DataPerformanceConfigServiceImpl implements DataPerformanceConfigService{
@Autowired
private TabDataPerformanceConfigMapper tabDataPerformanceConfigMapper;
@Override
public void savePerformanceConfig(DataPerformanceConfigDTO dto) {
Date now = new Date();
dto.setCreateTime(now);
dto.setUpdateTime(now);
dto.setStatus(1);
TabDataPerformanceConfig record = EntityUtil.changeEntityNew(TabDataPerformanceConfig.class, dto);
tabDataPerformanceConfigMapper.insert(record);
}
@Override
public void editPerformanceConfig(DataPerformanceConfigDTO dto) {
dto.setUpdateTime(new Date());
TabDataPerformanceConfig record = EntityUtil.changeEntityNew(TabDataPerformanceConfig.class, dto);
tabDataPerformanceConfigMapper.updateByPrimaryKeySelective(record);
}
@Override
public TabDataPerformanceConfig getByEnterpriseId(Integer enterpriseId) {
return tabDataPerformanceConfigMapper.getByEnterpriseId(enterpriseId);
}
}
......@@ -4,9 +4,6 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.entity.TabDataSingleEffectConfig;
import com.gic.enterprise.service.*;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -15,9 +12,14 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
import com.gic.enterprise.entity.TabDataPerformanceConfig;
import com.gic.enterprise.entity.TabDataSingleEffectConfig;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.*;
@Service("dataConfigApiService")
public class DataConfigApiServiceImpl implements DataConfigApiService {
......@@ -29,6 +31,8 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
private DataActuallyPaidConfigService dataActuallyPaidConfigService;
@Autowired
private DataSingleEffectConfigService dataSingleEffectConfigService;
@Autowired
private DataPerformanceConfigService dataPerformanceConfigService;
@Override
public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
......@@ -123,4 +127,36 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
configSingleEffect(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> configPerformance(DataPerformanceConfigDTO dto) {
TabDataPerformanceConfig record = dataPerformanceConfigService.getByEnterpriseId(dto.getEnterpriseId());
if (record == null) {
dataPerformanceConfigService.savePerformanceConfig(dto);
return ServiceResponse.success();
}
dto.setPerformanceConfigId(record.getPerformanceConfigId());
dataPerformanceConfigService.editPerformanceConfig(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<DataPerformanceConfigDTO> getPerformanceConfig(Integer enterpriseId) {
TabDataPerformanceConfig record = dataPerformanceConfigService.getByEnterpriseId(enterpriseId);
if (record == null) {
return ServiceResponse.success(EntityUtil.changeEntityNew(DataPerformanceConfigDTO.class,
dataPerformanceConfigService.getByEnterpriseId(-1)));
}
return ServiceResponse.success(EntityUtil.changeEntityNew(DataPerformanceConfigDTO.class, record));
}
@Override
public ServiceResponse<Void> initPerformanceConfig(Integer enterpriseId) {
DataPerformanceConfigDTO dto = EntityUtil.changeEntityNew(DataPerformanceConfigDTO.class,
dataPerformanceConfigService.getByEnterpriseId(-1));
dto.setPerformanceConfigId(null);
dto.setEnterpriseId(enterpriseId);
configPerformance(dto);
return ServiceResponse.success();
}
}
......@@ -148,6 +148,8 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
dataConfigApiService.initActuallyPaidData(enterpriseId);
//数据配置:单效取值配置默认数据
dataConfigApiService.initSingleEffectConfig(enterpriseId);
//业绩指标配置默认数据
dataConfigApiService.initPerformanceConfig(enterpriseId);
UserDTO userDTO = EntityUtil.changeEntityNew(UserDTO.class, enterpriseDTO);
//新增超级管理员
......
<?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.enterprise.dao.mapper.TabDataPerformanceConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataPerformanceConfig">
<id column="performance_config_id" jdbcType="INTEGER" property="performanceConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="order_number" jdbcType="INTEGER" property="orderNumber" />
<result column="order_people_number" jdbcType="INTEGER" property="orderPeopleNumber" />
<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">
performance_config_id, enterprise_id, order_number, order_people_number, status,
create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_data_performance_config
where performance_config_id = #{performanceConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_data_performance_config
where performance_config_id = #{performanceConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataPerformanceConfig">
insert into tab_data_performance_config (performance_config_id, enterprise_id,
order_number, order_people_number, status,
create_time, update_time)
values (#{performanceConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{orderNumber,jdbcType=INTEGER}, #{orderPeopleNumber,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataPerformanceConfig">
insert into tab_data_performance_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="performanceConfigId != null">
performance_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="orderNumber != null">
order_number,
</if>
<if test="orderPeopleNumber != null">
order_people_number,
</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="performanceConfigId != null">
#{performanceConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="orderNumber != null">
#{orderNumber,jdbcType=INTEGER},
</if>
<if test="orderPeopleNumber != null">
#{orderPeopleNumber,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.enterprise.entity.TabDataPerformanceConfig">
update tab_data_performance_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="orderNumber != null">
order_number = #{orderNumber,jdbcType=INTEGER},
</if>
<if test="orderPeopleNumber != null">
order_people_number = #{orderPeopleNumber,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 performance_config_id = #{performanceConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataPerformanceConfig">
update tab_data_performance_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
order_number = #{orderNumber,jdbcType=INTEGER},
order_people_number = #{orderPeopleNumber,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where performance_config_id = #{performanceConfigId,jdbcType=INTEGER}
</update>
<select id="getByEnterpriseId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_data_performance_config
where enterprise_id = #{enterpriseId}
and status = 1
</select>
</mapper>
\ No newline at end of file
......@@ -3,7 +3,6 @@ package com.gic.enterprise.web.controller;
import java.util.List;
import java.util.stream.Collectors;
import com.gic.enterprise.web.vo.data.DataSingleEffectConfigVO;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -16,12 +15,15 @@ import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.DataConfigApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.enterprise.web.vo.data.ActuallyPaidConfigVO;
import com.gic.enterprise.web.vo.data.DataSingleEffectConfigVO;
import com.gic.enterprise.web.vo.data.PerformanceVO;
@RestController
@RequestMapping("/data-config")
......@@ -79,4 +81,19 @@ public class DataConfigController {
dataConfigApiService.getSingleEffectConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
DataSingleEffectConfigVO.class);
}
@RequestMapping("/config-performance")
public RestResponse configPerformance(DataPerformanceConfigDTO dto) {
dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
return OperationResultUtils.operationResult(dataConfigApiService.configPerformance(dto),
OperationResultUtils.LOG_EDIT + "数据统计配置-业绩指标配置",
UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
}
@RequestMapping("/get-performance-config")
public RestResponse getPerformanceConfig() {
return ResultControllerUtils.commonResult(
dataConfigApiService.getPerformanceConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
PerformanceVO.class);
}
}
package com.gic.enterprise.web.vo.data;
import java.io.Serializable;
public class PerformanceVO implements Serializable{
private static final long serialVersionUID = 2575992580211890282L;
/**
* 订单数 指标 1:『『订单总数』2:『销售单数』 3:有效订单数』 4:『成交单数』
*/
private Integer orderNumber;
/**
* 订单人数 1:『消费人数』 2:『有效成交人数』 3:『『成交人数』
*/
private Integer orderPeopleNumber;
public Integer getOrderNumber() {
return orderNumber;
}
public PerformanceVO setOrderNumber(Integer orderNumber) {
this.orderNumber = orderNumber;
return this;
}
public Integer getOrderPeopleNumber() {
return orderPeopleNumber;
}
public PerformanceVO setOrderPeopleNumber(Integer orderPeopleNumber) {
this.orderPeopleNumber = orderPeopleNumber;
return this;
}
}
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