Skip to content

G
gic-platform-enterprise
Commit b506bcb9 by guojuxing
Options

实付配置调整

parent 9123b25c
Showing with 45 additions and 24 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataActuallyPaidConfig.java
...@@ -43,6 +43,11 @@ public class DataActuallyPaidConfig implements Serializable{ ...@@ -43,6 +43,11 @@ public class DataActuallyPaidConfig implements Serializable{
*/ */
private boolean hasConfigPerformanceCount; private boolean hasConfigPerformanceCount;
/**
* 是否已经配置过会员业务（积分折扣（商品）、等级折扣（商品）
*/
private boolean hasConfigMemberBusinessOfGoods;
public Integer getEnterpriseId() { public Integer getEnterpriseId() {
return enterpriseId; return enterpriseId;
} }
...@@ -96,4 +101,13 @@ public class DataActuallyPaidConfig implements Serializable{ ...@@ -96,4 +101,13 @@ public class DataActuallyPaidConfig implements Serializable{
this.memberBusinessOfGoods = memberBusinessOfGoods; this.memberBusinessOfGoods = memberBusinessOfGoods;
return this; return this;
} }
public boolean isHasConfigMemberBusinessOfGoods() {
return hasConfigMemberBusinessOfGoods;
}
public DataActuallyPaidConfig setHasConfigMemberBusinessOfGoods(boolean hasConfigMemberBusinessOfGoods) {
this.hasConfigMemberBusinessOfGoods = hasConfigMemberBusinessOfGoods;
return this;
}
} }
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java
...@@ -141,30 +141,36 @@ public class DataConfigApiServiceImpl implements DataConfigApiService { ...@@ -141,30 +141,36 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
if (!isRight) { if (!isRight) {
ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数不能为空"); ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数不能为空");
} }
list.add(new DataActuallyPaidConfigDTO() if (memberBusiness != null) {
.setEnterpriseId(enterpriseId) list.add(new DataActuallyPaidConfigDTO()
.setClassify(1) .setEnterpriseId(enterpriseId)
.setConfigStatus(memberBusiness)); .setClassify(1)
list.add(new DataActuallyPaidConfigDTO() .setConfigStatus(memberBusiness));
.setEnterpriseId(enterpriseId) list.add(new DataActuallyPaidConfigDTO()
.setClassify(2) .setEnterpriseId(enterpriseId)
.setConfigStatus(memberBusiness)); .setClassify(2)
list.add(new DataActuallyPaidConfigDTO() .setConfigStatus(memberBusiness));
.setEnterpriseId(enterpriseId) }
.setClassify(3) if (performanceCount != null) {
.setConfigStatus(performanceCount)); list.add(new DataActuallyPaidConfigDTO()
list.add(new DataActuallyPaidConfigDTO() .setEnterpriseId(enterpriseId)
.setEnterpriseId(enterpriseId) .setClassify(3)
.setClassify(4) .setConfigStatus(performanceCount));
.setConfigStatus(performanceCount)); list.add(new DataActuallyPaidConfigDTO()
list.add(new DataActuallyPaidConfigDTO() .setEnterpriseId(enterpriseId)
.setEnterpriseId(enterpriseId) .setClassify(4)
.setClassify(5) .setConfigStatus(performanceCount));
.setConfigStatus(performanceCount)); list.add(new DataActuallyPaidConfigDTO()
list.add(new DataActuallyPaidConfigDTO() .setEnterpriseId(enterpriseId)
.setEnterpriseId(enterpriseId) .setClassify(5)
.setClassify(6) .setConfigStatus(performanceCount));
.setConfigStatus(memberBusinessOfGoods)); }
if (memberBusinessOfGoods != null) {
list.add(new DataActuallyPaidConfigDTO()
.setEnterpriseId(enterpriseId)
.setClassify(6)
.setConfigStatus(memberBusinessOfGoods));
}
return configActuallyPaid(list); return configActuallyPaid(list);
} }
...@@ -205,6 +211,7 @@ public class DataConfigApiServiceImpl implements DataConfigApiService { ...@@ -205,6 +211,7 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
.setPerformanceCount(performanceCount) .setPerformanceCount(performanceCount)
.setHasConfigMemberBusiness(dataActuallyPaidConfigService.count(enterpriseId, 1) > 0) .setHasConfigMemberBusiness(dataActuallyPaidConfigService.count(enterpriseId, 1) > 0)
.setHasConfigPerformanceCount(dataActuallyPaidConfigService.count(enterpriseId, 3) > 0) .setHasConfigPerformanceCount(dataActuallyPaidConfigService.count(enterpriseId, 3) > 0)
.setHasConfigMemberBusinessOfGoods(dataActuallyPaidConfigService.count(enterpriseId, 6) > 0)
.setMemberBusinessOfGoods(memberBusinessOfGoods)); .setMemberBusinessOfGoods(memberBusinessOfGoods));
} }
return ServiceResponse.success(new DataActuallyPaidConfig().setEnterpriseId(enterpriseId).setMemberBusiness(0).setPerformanceCount(0).setMemberBusinessOfGoods(0)); return ServiceResponse.success(new DataActuallyPaidConfig().setEnterpriseId(enterpriseId).setMemberBusiness(0).setPerformanceCount(0).setMemberBusinessOfGoods(0));
......
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