Skip to content

G
gic-platform-enterprise
Commit 314b354e by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !44
parents 54aa1537 ebee9f2d
Showing with 119 additions and 36 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/EnterpriseInitCodeEnum.java
......@@ -21,6 +21,8 @@ public enum EnterpriseInitCodeEnum {
CREATE_BELONG_STRATEGY("createBelongStrategy", "至少新建一个归属策略", 3),
CREATE_INTEGRAL_STRATEGY("createIntegralStrategy", "至少新建一个积分策略", 3),
CONFIG_USER_MERGE_STRATEGY("configUserMergeStrategy", "配置并保存用户合并策略", 3),
CONFIG_DEFAULT_RELEGATION("configDefaultRelegation", "完成默认归属配置", 3),
CONFIG_WECHAT_MEMBER("configWechatMember", "数字会员配置", 3),
COMPLETE_WECHAT_CONFIG("completeWeChatConfig", "完成小程序配置", 4),
BIND_WECHAT("bindWeChat", "至少绑定一个小程序", 4),
COMPLETE_MANAGER_CARD_CONFIG("completeManagerCardConfig", "完善小程序进入管理卡的配置", 4),
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataActuallyPaidConfig.java
......@@ -30,6 +30,11 @@ public class DataActuallyPaidConfig implements Serializable{
private Integer performanceCount;
/**
* 会员业务（积分折扣（商品）、等级折扣（商品）
*/
private Integer memberBusinessOfGoods;
/**
* 是否已经配置过会员业务
*/
private boolean hasConfigMemberBusiness;
......@@ -82,4 +87,13 @@ public class DataActuallyPaidConfig implements Serializable{
this.hasConfigPerformanceCount = hasConfigPerformanceCount;
return this;
}
public Integer getMemberBusinessOfGoods() {
return memberBusinessOfGoods;
}
public DataActuallyPaidConfig setMemberBusinessOfGoods(Integer memberBusinessOfGoods) {
this.memberBusinessOfGoods = memberBusinessOfGoods;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataActuallyPaidConfigDTO.java
......@@ -24,7 +24,7 @@ public class DataActuallyPaidConfigDTO implements Serializable{
private Integer enterpriseId;
/**
* 1:会员业务（积分计算）2:会员业务（等级升降条件（如单笔消费满XX元、当天消费满XX元）3:基础业绩 4:会员消费 5:单效
* 1:会员业务（积分计算）2:会员业务（等级升降条件（如单笔消费满XX元、当天消费满XX元）3:基础业绩 4:会员消费 5:单效 6:会员业务（积分折扣（商品）、等级折扣（商品））
*/
private Integer classify;
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/DataConfigApiService.java
......@@ -56,11 +56,12 @@ public interface DataConfigApiService {
* @Description:

* @author guojuxing
* @param enterpriseId
* @param memberBusiness 会员业务 1：开启 0:关闭 null则不变化会员业务
* @param performanceCount
业绩统计 1：开启 0：关闭 null则不变化业绩统计配置
* @param memberBusiness 会员业务 1：开启 0:关闭
* @param performanceCount
业绩统计 1：开启 0：关闭
* @param memberBusinessOfGoods 会员业务 （积分折扣（商品）、等级折扣（商品））1：开启 0：关闭
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> configActuallyPaid(Integer enterpriseId, Integer memberBusiness, Integer performanceCount);
ServiceResponse<Void> configActuallyPaid(Integer enterpriseId, Integer memberBusiness, Integer performanceCount, Integer memberBusinessOfGoods);
/**
* 是否已经配置过会员业务（实付）
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/EnterpriseInitApiService.java
......@@ -41,6 +41,26 @@ public interface EnterpriseInitApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> completeGoodsIndex(Integer enterpriseId);
/**
* 完成默认归属配置——会员设置-默认归属配置
* @Title: configDefaultRelegation

* @Description:

* @author guojuxing
* @param enterpriseId

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


*/
ServiceResponse<Void> configDefaultRelegation(Integer enterpriseId);
/**
* 数字会员配置，所有会员卡都关联了服务号或小程序——配置-数字会员
* @Title: configWechatMember

* @Description:

* @author guojuxing
* @param enterpriseId

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


*/
ServiceResponse<Void> configWechatMember(Integer enterpriseId);
/**
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java
......@@ -123,32 +123,36 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
}
@Override
public ServiceResponse<Void> configActuallyPaid(Integer enterpriseId, Integer memberBusiness, Integer performanceCount) {
public ServiceResponse<Void> configActuallyPaid(Integer enterpriseId, Integer memberBusiness, Integer performanceCount, Integer memberBusinessOfGoods) {
List<DataActuallyPaidConfigDTO> list = new ArrayList<>(5);
if (memberBusiness != null) {
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(1)
.setConfigStatus(memberBusiness));
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(2)
.setConfigStatus(memberBusiness));
}
if (performanceCount != null) {
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(3)
.setConfigStatus(performanceCount));
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(4)
.setConfigStatus(performanceCount));
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(5)
.setConfigStatus(performanceCount));
boolean isRight = enterpriseId != null && memberBusiness != null && performanceCount != null && memberBusinessOfGoods != null;
if (!isRight) {
ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数不能为空");
}
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(1)
.setConfigStatus(memberBusiness));
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(2)
.setConfigStatus(memberBusiness));
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(3)
.setConfigStatus(performanceCount));
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(4)
.setConfigStatus(performanceCount));
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(5)
.setConfigStatus(performanceCount));
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(6)
.setConfigStatus(memberBusinessOfGoods));
return configActuallyPaid(list);
}
......@@ -182,14 +186,16 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
//如果没有配置，默认数据
Integer memberBusiness = map.get("1");
Integer performanceCount = map.get("3");
Integer memberBusinessOfGoods = map.get("6");
return ServiceResponse.success(new DataActuallyPaidConfig()
.setEnterpriseId(enterpriseId)
.setMemberBusiness(memberBusiness)
.setPerformanceCount(performanceCount)
.setHasConfigMemberBusiness(dataActuallyPaidConfigService.count(enterpriseId, 1) > 0)
.setHasConfigPerformanceCount(dataActuallyPaidConfigService.count(enterpriseId, 3) > 0));
.setHasConfigPerformanceCount(dataActuallyPaidConfigService.count(enterpriseId, 3) > 0)
.setMemberBusinessOfGoods(memberBusinessOfGoods));
}
return ServiceResponse.success(new DataActuallyPaidConfig().setEnterpriseId(enterpriseId).setMemberBusiness(0).setPerformanceCount(0));
return ServiceResponse.success(new DataActuallyPaidConfig().setEnterpriseId(enterpriseId).setMemberBusiness(0).setPerformanceCount(0).setMemberBusinessOfGoods(0));
}
@Override
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseInitApiServiceImpl.java
......@@ -19,7 +19,10 @@ import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* @author guojx
......@@ -109,6 +112,16 @@ public class EnterpriseInitApiServiceImpl implements EnterpriseInitApiService{
}
@Override
public ServiceResponse<Void> configDefaultRelegation(Integer enterpriseId) {
return initByConfigCode(EnterpriseInitCodeEnum.CONFIG_DEFAULT_RELEGATION.getCode(), enterpriseId);
}
@Override
public ServiceResponse<Void> configWechatMember(Integer enterpriseId) {
return initByConfigCode(EnterpriseInitCodeEnum.CONFIG_WECHAT_MEMBER.getCode(), enterpriseId);
}
@Override
public ServiceResponse<Void> addMemberGradeInitConfig(Integer enterpriseId) {
return initByConfigCode(EnterpriseInitCodeEnum.CREATE_MEMBER_GRADE.getCode(), enterpriseId);
}
......@@ -249,7 +262,19 @@ public class EnterpriseInitApiServiceImpl implements EnterpriseInitApiService{
@Override
public ServiceResponse<Void> initEnterpriseData(List<Integer> enterpriseIdList) {
if (CollectionUtils.isNotEmpty(enterpriseIdList)) {
enterpriseIdList.forEach(e -> enterpriseInitService.initEnterpriseConfigInfo(e));
enterpriseIdList.forEach(e -> {
List<TabEnterpriseInit> list = enterpriseInitService.listByParentId(null, e);
Set<String> hasConfig = new HashSet<>();
if (CollectionUtils.isNotEmpty(list)) {
hasConfig = list.stream().filter(con -> con.getIsInitConfig() == 1).map(con -> con.getConfigCode()).collect(Collectors.toSet());
}
enterpriseInitService.initEnterpriseConfigInfo(e);
//已经配置过的数据需要还原
if (CollectionUtils.isNotEmpty(hasConfig)) {
hasConfig.stream().forEach( temp -> enterpriseInitService.initByCode(temp, e));
}
});
}
return ServiceResponse.success();
}
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/DataConfigController.java
package com.gic.enterprise.web.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import com.gic.enterprise.service.EnterpriseInitApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
......@@ -50,6 +49,8 @@ public class DataConfigController {
private EnterpriseConfigApiService enterpriseConfigApiService;
@Autowired
private MemberCardApiService memberCardApiService;
@Autowired
private EnterpriseInitApiService enterpriseInitApiService;
@RequestMapping("list-all-applet")
......@@ -117,6 +118,18 @@ public class DataConfigController {
.setRelateWechat(listToString(e.getAppletsIds()))
.setValidRefresh(1));
});
ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(UserDetailUtils.getUserDetail().getEnterpriseId());
if (result.isSuccess()) {
List<OwnerMemberCardDTO> memberCardList = result.getResult();
if (CollectionUtils.isNotEmpty(memberCardList)) {
final Set<String> memberCardSet = memberCardList.stream().map(e -> e.getCardConfigId().toString()).collect(Collectors.toSet());
if (list.stream().allMatch(e -> memberCardSet.contains(e.getCardConfigId().toString()))) {
//所有的卡都配置，则初始化
enterpriseInitApiService.configWechatMember(enterpriseId);
}
}
}
}
}
return RestResponse.success();
......@@ -174,6 +187,7 @@ public class DataConfigController {
.getMemberConsumeConfigByEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId()), MemberConsumeConfigVO.class);
}
@Deprecated
@RequestMapping("/config-actually-paid")
public RestResponse configActuallyPaid(String jsonArr) {
if (StringUtil.isBlank(jsonArr)) {
......@@ -187,10 +201,11 @@ public class DataConfigController {
UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
}
@Deprecated
@RequestMapping("/config-actually-paid-new")
public RestResponse configActuallyPaidNew(Integer memberBusiness, Integer performanceCount) {
public RestResponse configActuallyPaidNew(Integer memberBusiness, Integer performanceCount, Integer memberBusinessOfGoods) {
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
return OperationResultUtils.operationResult(dataConfigApiService.configActuallyPaid(enterpriseId, memberBusiness, performanceCount),
return OperationResultUtils.operationResult(dataConfigApiService.configActuallyPaid(enterpriseId, memberBusiness, performanceCount, memberBusinessOfGoods),
OperationResultUtils.LOG_EDIT + "数据统计配置-实付配置",
UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
}
......
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