Skip to content

G
gic-platform-enterprise
Commit d92cb349 by 陶光胜
Options

Merge branch 'developer' of… 

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
parents 541d222b 59088cfe
Showing with 101 additions and 70 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AppletDataAssetAreaDTO.java
package com.gic.enterprise.dto;
import lombok.Data;
import java.io.Serializable;
/**
* 小程序装修配置 数据资产范围
......@@ -8,6 +10,7 @@ import java.io.Serializable;
* @author guojuxing

* @date 2019/12/31 9:26 AM

*/
@Data
public class AppletDataAssetAreaDTO implements Serializable{
private static final long serialVersionUID = -8555323283383515771L;
......@@ -17,6 +20,11 @@ public class AppletDataAssetAreaDTO implements Serializable{
private String integral;
/**
* 可用积分
*/
private String availableIntegral;
/**
* 卡券包 会员卡ID，英文逗号隔开
*/
private String coupon;
......@@ -49,68 +57,4 @@ public class AppletDataAssetAreaDTO implements Serializable{
* 会员任务 系统默认主卡，不可编辑
*/
private String memberTask;
public String getIntegral() {
return integral;
}
public void setIntegral(String integral) {
this.integral = integral;
}
public String getCoupon() {
return coupon;
}
public void setCoupon(String coupon) {
this.coupon = coupon;
}
public String getOrder() {
return order;
}
public void setOrder(String order) {
this.order = order;
}
public String getMallOrder() {
return mallOrder;
}
public void setMallOrder(String mallOrder) {
this.mallOrder = mallOrder;
}
public String getMallOrderName() {
return mallOrderName;
}
public void setMallOrderName(String mallOrderName) {
this.mallOrderName = mallOrderName;
}
public String getSignIn() {
return signIn;
}
public void setSignIn(String signIn) {
this.signIn = signIn;
}
public String getMemberAchievement() {
return memberAchievement;
}
public void setMemberAchievement(String memberAchievement) {
this.memberAchievement = memberAchievement;
}
public String getMemberTask() {
return memberTask;
}
public void setMemberTask(String memberTask) {
this.memberTask = memberTask;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/ConfigRuleApiService.java
......@@ -5,6 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.rule.*;
import java.util.List;
import java.util.Map;
/**
* 平台规则配置
......@@ -146,6 +147,15 @@ public interface ConfigRuleApiService {

*/
ServiceResponse<List<EnterpriseListDTO>> getEnterpriseList(String search);
/**
* 获取应用列表字典数据
* @Title: getAppListByDict

* @Description:

* @author guojuxing 

* @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.lang.String>>


*/
ServiceResponse<Map<String, String>> getAppListByDict();
/***************对接其他组*******************/
/**
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletDecorationConfigApiServiceImpl.java
......@@ -100,9 +100,17 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
//GPS智能判定卡 默认关闭
dto.setGpsDecisionCard(0);
}
AppletDataAssetAreaDTO old = JSON.parseObject(record.getDataAssetArea(), AppletDataAssetAreaDTO.class);
//默认选中和主卡关联的店铺，不可编辑 //实时调用
ServiceResponse<ShopDTO> shopResult = getMainCardStore(record.getAppId(), record.getEnterpriseId());
if (!shopResult.isSuccess()) {
return ServiceResponse.failure(shopResult.getCode(), shopResult.getMessage());
}
AppletDataAssetAreaDTO appletDataAssetArea = dto.getAppletDataAssetArea();
appletDataAssetArea.setMallOrder(old.getMallOrder());
ShopDTO shopDTO = shopResult.getResult();
appletDataAssetArea.setMallOrder(shopDTO.getId().toString());
appletDataAssetArea.setMallOrderName(shopDTO.getName());
//默认配置信息
ServiceResponse<Long> mainCardResult = getMainCard(dto.getAppId(), dto.getEnterpriseId());
if (!mainCardResult.isSuccess()) {
......@@ -202,6 +210,7 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
needValidMap.put("数据资产-积分", appletDataAssetArea.getIntegral());
needValidMap.put("数据资产-卡券包", appletDataAssetArea.getCoupon());
needValidMap.put("数据资产-零售订", appletDataAssetArea.getOrder());
//needValidMap.put("数据资产-可用积分", appletDataAssetArea.getAvailableIntegral());
ServiceResponse valueValid;
for (Map.Entry<String, String> entry : needValidMap.entrySet()) {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleApiServiceImpl.java
package com.gic.enterprise.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.bizdict.api.dto.BizdictDTO;
import com.gic.bizdict.api.service.BizdictService;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.dto.EnterpriseDTO;
......@@ -30,6 +32,8 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
private ConfigRuleEnterpriseService configRuleEnterpriseService;
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private BizdictService bizdictService;
@Override
public ServiceResponse<Integer> saveRule(RuleDTO dto) {
......@@ -42,6 +46,10 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
if (StringUtils.isBlank(dto.getAppCode())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "应用code不能为空");
}
//校验应用code是否存在
if (!getAppList().containsKey(dto.getAppCode())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "应用code不存在");
}
//名称唯一性校验
if (configRuleService.isRepeatName(null, 1, dto.getRuleName(), null)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "规则名称重复");
......@@ -51,6 +59,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "应用code重复");
}
//填充
dto.setRuleName(getAppList().get(dto.getAppCode()));
dto.setParentRuleId(0);
dto.setRuleLevel(1);
Integer ruleId = configRuleService.saveRule(dto);
......@@ -78,6 +87,10 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
if (StringUtils.isBlank(dto.getAppCode())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "应用code不能为空");
}
//校验应用code是否存在
if (!getAppList().containsKey(dto.getAppCode())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "应用code不存在");
}
//名称唯一性校验
if (configRuleService.isRepeatName(dto.getRuleId(), 1, dto.getRuleName(), null)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "规则名称重复");
......@@ -86,7 +99,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
if (configRuleService.isRepeatAppCode(dto.getRuleId(), dto.getAppCode())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "应用code重复");
}
record.setRuleName(dto.getRuleName());
record.setRuleName(getAppList().get(dto.getAppCode()));
record.setAppCode(dto.getAppCode());
record.setAppName(dto.getAppName());
configRuleService.update(record);
......@@ -334,12 +347,16 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
Map<String, List<RuleClassifySceneListDTO>> ruleClassifyMap = new HashMap<>(16);
for (TabConfigRule rule : list) {
Boolean select = false;
if (ruleRelMap.contains(rule.getRuleId())) {
if (ruleRelMap.contains(rule.getRuleId().toString())) {
select = true;
}
//必有值，如果为空，则说明数据错误，需要修正
int ruleLevel = rule.getRuleLevel();
if (ruleLevel == 1) {
if (StringUtils.isBlank(rule.getAppCode())) {
//复制的时候可能造成没有code
continue;
}
result.add(new RuleListDTO().setAppCode(rule.getAppCode()).setAppName(rule.getAppName())
.setRuleId(rule.getRuleId()).setRuleName(rule.getRuleName()).setSelect(select));
} else if (ruleLevel == 2) {
......@@ -412,7 +429,19 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
if (CollectionUtils.isNotEmpty(ruleList)) {
for (RuleListDTO ruleListDTO : ruleList) {
if (ruleListDTO.getAppCode().equals(appCode)) {
return ServiceResponse.success(ruleListDTO.getRuleClassifyList());
//勾选中的列表
List<RuleClassifyListDTO> temp = ruleListDTO.getRuleClassifyList();
List<RuleClassifyListDTO> select = new ArrayList<>();
if (CollectionUtils.isNotEmpty(temp)) {
for (RuleClassifyListDTO dto : temp) {
if (dto.getSelect()) {
//场景重置
dto.setRuleClassifySceneList(null);
select.add(dto);
}
}
}
return ServiceResponse.success(select);
}
}
}
......@@ -453,7 +482,20 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
if (CollectionUtils.isNotEmpty(classifyList)) {
for (RuleClassifyListDTO classifyListDTO : classifyList) {
if (classifyListDTO.getRuleId().intValue() == ruleClassifyId.intValue()) {
return ServiceResponse.success(classifyListDTO.getRuleClassifySceneList());
if (!classifyListDTO.getSelect()) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，商户规则未配置该分类");
}
//勾选中的，即配置可用的
List<RuleClassifySceneListDTO> temp = classifyListDTO.getRuleClassifySceneList();
List<RuleClassifySceneListDTO> select = new ArrayList<>();
if (CollectionUtils.isNotEmpty(temp)) {
for (RuleClassifySceneListDTO dto : temp) {
if (dto.getSelect()) {
select.add(dto);
}
}
}
return ServiceResponse.success(select);
}
}
}
......@@ -534,6 +576,11 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
return ServiceResponse.success(Collections.emptyList());
}
@Override
public ServiceResponse<Map<String, String>> getAppListByDict() {
return ServiceResponse.success(getAppList());
}
private ServiceResponse<Void> validRuleClassify(RuleClassifyDTO dto) {
TabConfigRule record = configRuleService.getByRuleId(dto.getParentRuleId());
if (record == null) {
......@@ -587,4 +634,20 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
}
return ServiceResponse.success();
}
/**
* 应用列表
* @return
*/
private Map<String, String> getAppList() {
Map<String, String> result = new HashMap<>(16);
List<BizdictDTO> list = bizdictService.listByTypeDict("applicaiton_module", "marketing");
if (CollectionUtils.isNotEmpty(list)) {
for (BizdictDTO bizdictDTO : list) {
result.put(bizdictDTO.getCode(), bizdictDTO.getName());
}
}
return result;
}
}
gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/ConfigRuleController.java
......@@ -42,6 +42,11 @@ public class ConfigRuleController {
return ResultControllerUtils.commonResult(configRuleApiService.saveRule(dto));
}
@RequestMapping("/get-app-list")
public RestResponse listApp() {
return ResultControllerUtils.commonResult(configRuleApiService.getAppListByDict());
}
@RequestMapping("/editRule")
public RestResponse editRule(RuleDTO dto) {
return ResultControllerUtils.commonResult(configRuleApiService.editRule(dto));
......
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