Commit c305c82c by 陶光胜

Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
parents 73cc76a3 af0aca58
package com.gic.enterprise.dto.data;
import java.io.Serializable;
import java.util.Date;
/**
* 会员消费配置
* @ClassName: DataMemberConsumeConfigDTO

* @Description: 

* @author guojuxing

* @date 2020/4/16 3:26 PM

*/
public class DataMemberConsumeConfigDTO implements Serializable{
private static final long serialVersionUID = -8285427103409771318L;
/**
*
*/
private Integer memberConsumeConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 会员消费统计粒度 1:会员 + 渠道 + 线上店铺/线下门店品牌 (按订单统计) 2:会员 + 渠道 + 线上店铺/线下门店品牌 + 商品品牌 (按订单项统计)
*/
private Integer memberConsumeCount;
/**
* 最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
*/
private Integer memberConsumeMax;
/**
* 消费次数 1:消费单次数』2:『有效消费次数』
*/
private Integer memberConsumeTimes;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getMemberConsumeConfigId() {
return memberConsumeConfigId;
}
public DataMemberConsumeConfigDTO setMemberConsumeConfigId(Integer memberConsumeConfigId) {
this.memberConsumeConfigId = memberConsumeConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public DataMemberConsumeConfigDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getMemberConsumeCount() {
return memberConsumeCount;
}
public DataMemberConsumeConfigDTO setMemberConsumeCount(Integer memberConsumeCount) {
this.memberConsumeCount = memberConsumeCount;
return this;
}
public Integer getMemberConsumeMax() {
return memberConsumeMax;
}
public DataMemberConsumeConfigDTO setMemberConsumeMax(Integer memberConsumeMax) {
this.memberConsumeMax = memberConsumeMax;
return this;
}
public Integer getMemberConsumeTimes() {
return memberConsumeTimes;
}
public DataMemberConsumeConfigDTO setMemberConsumeTimes(Integer memberConsumeTimes) {
this.memberConsumeTimes = memberConsumeTimes;
return this;
}
public Integer getStatus() {
return status;
}
public DataMemberConsumeConfigDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public DataMemberConsumeConfigDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public DataMemberConsumeConfigDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
package com.gic.enterprise.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
public interface DataConfigApiService {
/**
* 会员消费配置
* @Title: configMemberConsumeConfig

* @Description:

* @author guojuxing
* @param dto

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


*/
ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto);
ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId);
}
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
public interface TabDataMemberConsumeConfigMapper {
/**
* 根据主键删除
*
* @param memberConsumeConfigId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer memberConsumeConfigId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabDataMemberConsumeConfig record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabDataMemberConsumeConfig record);
/**
* 根据主键查询
*
* @param memberConsumeConfigId 主键
* @return 实体对象
*/
TabDataMemberConsumeConfig selectByPrimaryKey(Integer memberConsumeConfigId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabDataMemberConsumeConfig record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabDataMemberConsumeConfig record);
TabDataMemberConsumeConfig getByEnterpriseId(Integer enterpriseId);
}
\ No newline at end of file
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_data_member_consume_config
*/
public class TabDataMemberConsumeConfig {
/**
*
*/
private Integer memberConsumeConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 会员消费统计粒度 1:会员 + 渠道 + 线上店铺/线下门店品牌 (按订单统计) 2:会员 + 渠道 + 线上店铺/线下门店品牌 + 商品品牌 (按订单项统计)
*/
private Integer memberConsumeCount;
/**
* 最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
*/
private Integer memberConsumeMax;
/**
* 消费次数 1:消费单次数』2:『有效消费次数』
*/
private Integer memberConsumeTimes;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getMemberConsumeConfigId() {
return memberConsumeConfigId;
}
public TabDataMemberConsumeConfig setMemberConsumeConfigId(Integer memberConsumeConfigId) {
this.memberConsumeConfigId = memberConsumeConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabDataMemberConsumeConfig setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getMemberConsumeCount() {
return memberConsumeCount;
}
public TabDataMemberConsumeConfig setMemberConsumeCount(Integer memberConsumeCount) {
this.memberConsumeCount = memberConsumeCount;
return this;
}
public Integer getMemberConsumeMax() {
return memberConsumeMax;
}
public TabDataMemberConsumeConfig setMemberConsumeMax(Integer memberConsumeMax) {
this.memberConsumeMax = memberConsumeMax;
return this;
}
public Integer getMemberConsumeTimes() {
return memberConsumeTimes;
}
public TabDataMemberConsumeConfig setMemberConsumeTimes(Integer memberConsumeTimes) {
this.memberConsumeTimes = memberConsumeTimes;
return this;
}
public Integer getStatus() {
return status;
}
public TabDataMemberConsumeConfig setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TabDataMemberConsumeConfig setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TabDataMemberConsumeConfig 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.DataMemberConsumeConfigDTO;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
public interface DataMemberConsumeConfigService {
/**
* 新增会员消费配置
* @param dto
* @return
*/
Integer saveMemberConsumeConfig(DataMemberConsumeConfigDTO dto);
/**
* 更新配置信息
* @Title: editMemberConsumeConfig

* @Description:

* @author guojuxing
* @param dto

* @return void


*/
void editMemberConsumeConfig(DataMemberConsumeConfigDTO dto);
TabDataMemberConsumeConfig getByEnterpriseId(Integer enterpriseId);
}
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabDataMemberConsumeConfigMapper;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
import com.gic.enterprise.service.DataMemberConsumeConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service("dataMemberConsumeConfigService")
public class DataMemberConsumeConfigServiceImpl implements DataMemberConsumeConfigService{
@Autowired
private TabDataMemberConsumeConfigMapper tabDataMemberConsumeConfigMapper;
@Override
public Integer saveMemberConsumeConfig(DataMemberConsumeConfigDTO dto) {
Date now = new Date();
dto.setCreateTime(now);
dto.setUpdateTime(now);
dto.setStatus(1);
TabDataMemberConsumeConfig record = EntityUtil.changeEntityNew(TabDataMemberConsumeConfig.class, dto);
tabDataMemberConsumeConfigMapper.insertSelective(record);
return record.getMemberConsumeConfigId();
}
@Override
public void editMemberConsumeConfig(DataMemberConsumeConfigDTO dto) {
dto.setUpdateTime(new Date());
TabDataMemberConsumeConfig record = EntityUtil.changeEntityNew(TabDataMemberConsumeConfig.class, dto);
tabDataMemberConsumeConfigMapper.updateByPrimaryKeySelective(record);
}
@Override
public TabDataMemberConsumeConfig getByEnterpriseId(Integer enterpriseId) {
return tabDataMemberConsumeConfigMapper.getByEnterpriseId(enterpriseId);
}
}
package com.gic.enterprise.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.DataConfigApiService;
import com.gic.enterprise.service.DataMemberConsumeConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service("dataConfigApiService")
public class DataConfigApiServiceImpl implements DataConfigApiService {
@Autowired
private DataMemberConsumeConfigService dataMemberConsumeConfigService;
@Override
public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
if (dto.getEnterpriseId() == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID不能为空");
}
TabDataMemberConsumeConfig record = dataMemberConsumeConfigService.getByEnterpriseId(dto.getEnterpriseId());
if (record == null) {
//还未配置,新增
return ServiceResponse.success(dataMemberConsumeConfigService.saveMemberConsumeConfig(dto));
}
dto.setMemberConsumeConfigId(record.getMemberConsumeConfigId());
dataMemberConsumeConfigService.editMemberConsumeConfig(dto);
return ServiceResponse.success(record.getMemberConsumeConfigId());
}
@Override
public ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId) {
TabDataMemberConsumeConfig record = dataMemberConsumeConfigService.getByEnterpriseId(enterpriseId);
if (record == null) {
//还未配置,新增
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "还未配置会员消费规则");
}
return ServiceResponse.success(EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, record));
}
}
......@@ -126,6 +126,8 @@
<dubbo:service interface="com.gic.enterprise.service.WmStoreApiService" ref="wmStoreApiService" timeout="6000" />
<dubbo:service interface="com.gic.enterprise.service.DataConfigApiService" ref="dataConfigApiService" timeout="6000" />
<dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000" />
......
<?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.TabDataMemberConsumeConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
<id column="member_consume_config_id" jdbcType="INTEGER" property="memberConsumeConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="member_consume_count" jdbcType="INTEGER" property="memberConsumeCount" />
<result column="member_consume_max" jdbcType="INTEGER" property="memberConsumeMax" />
<result column="member_consume_times" jdbcType="INTEGER" property="memberConsumeTimes" />
<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">
member_consume_config_id, enterprise_id, member_consume_count, member_consume_max,
member_consume_times, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_data_member_consume_config
where member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_data_member_consume_config
where member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
insert into tab_data_member_consume_config (member_consume_config_id, enterprise_id,
member_consume_count, member_consume_max, member_consume_times,
status, create_time, update_time
)
values (#{memberConsumeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMax,jdbcType=INTEGER}, #{memberConsumeTimes,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig" useGeneratedKeys="true" keyProperty="memberConsumeConfigId">
insert into tab_data_member_consume_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="memberConsumeConfigId != null">
member_consume_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="memberConsumeCount != null">
member_consume_count,
</if>
<if test="memberConsumeMax != null">
member_consume_max,
</if>
<if test="memberConsumeTimes != null">
member_consume_times,
</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="memberConsumeConfigId != null">
#{memberConsumeConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="memberConsumeCount != null">
#{memberConsumeCount,jdbcType=INTEGER},
</if>
<if test="memberConsumeMax != null">
#{memberConsumeMax,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimes != null">
#{memberConsumeTimes,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.TabDataMemberConsumeConfig">
update tab_data_member_consume_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="memberConsumeCount != null">
member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
</if>
<if test="memberConsumeMax != null">
member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimes != null">
member_consume_times = #{memberConsumeTimes,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 member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
update tab_data_member_consume_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
member_consume_times = #{memberConsumeTimes,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
</update>
<select id="getByEnterpriseId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_data_member_consume_config
where status = 1
and enterprise_id = #{enterpriseId}
</select>
</mapper>
\ No newline at end of file
package com.gic.enterprise.web.controller;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.service.DataConfigApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
@RestController
@RequestMapping("/data-config")
public class DataConfigController {
private final static Logger LOGGER = LogManager.getLogger(DataConfigController.class);
@Autowired
private DataConfigApiService dataConfigApiService;
@RequestMapping("/config-member-consume")
public RestResponse configMemberConsume(DataMemberConsumeConfigDTO dto) {
dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
return OperationResultUtils.operationResult(dataConfigApiService.configMemberConsume(dto),
OperationResultUtils.LOG_EDIT + "数据统计配置-会员消费配置",
UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
}
@RequestMapping("/get-member-consume-config")
public RestResponse getMemberConsumeConfig() {
return ResultControllerUtils.commonResult(dataConfigApiService
.getMemberConsumeConfigByEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId()));
}
}
......@@ -112,6 +112,7 @@
<dubbo:reference interface="com.gic.enterprise.service.ProjectItemApiService" id="projectItemApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.enterprise.service.WmStoreApiService" id="wmStoreApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.enterprise.service.DataConfigApiService" id="dataConfigApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.marketing.api.service.coupon.CouponShelfApiService" id="couponShelfApiService" timeout="6000"/>
......
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