Commit 25872a45 by guojuxing

初始化会员卡短信模板

parent df753f12
......@@ -29,7 +29,8 @@ public enum EnterpriseInitCodeEnum {
COMPLETE_WECHAT_CONFIG("completeWeChatConfig", "完成小程序配置", 4),
COMPLETE_DATA_COUNT_CONFIG("completeDataCountConfig", "完成数据统计配置", 6),
CONFIG_EFFECTIVE_ORDER("configEffectiveOrder", "完成有效订单的配置", 6),
CONFIG_PAY("configPay", "完成实付的配置", 6);
CONFIG_PAY("configPay", "完成实付的配置", 6),
INTI_MEMBER_CARD_SMS("initMemberCardSmsTemplate", "初始化会员卡的短信模板", 7);
private String code;
private String message;
......
......@@ -169,6 +169,13 @@ public interface EnterpriseInitApiService {
ServiceResponse<Void> shortMessageServiceConfig(Integer enterpriseId);
/**
* 初始化会员卡的短信模板
* @param enterpriseId
* @return
*/
ServiceResponse<Void> initMemberCardSmsTemplate(Integer enterpriseId);
/**
* 状态改为未初始化状态
* @Title: unInitByConfigCode

* @Description:
......
......@@ -169,6 +169,11 @@ public class EnterpriseInitApiServiceImpl implements EnterpriseInitApiService{
}
@Override
public ServiceResponse<Void> initMemberCardSmsTemplate(Integer enterpriseId) {
return initByConfigCode(EnterpriseInitCodeEnum.INTI_MEMBER_CARD_SMS.getCode(), enterpriseId);
}
@Override
public ServiceResponse<Void> unInitByConfigCode(String configCode, Integer enterpriseId) {
if (!EnterpriseInitCodeEnum.isRightCode(configCode)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "初始化配置代码参数有误");
......
......@@ -193,6 +193,11 @@
<artifactId>gic-authcenter-api</artifactId>
<version>${gic-authcenter-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-member-config-api</artifactId>
<version>${gic-member-config-api}</version>
</dependency>
</dependencies>
<dependencyManagement>
......
......@@ -6,6 +6,8 @@ import java.util.*;
import com.gic.authcenter.security.core.constant.DataResourceEnum;
import com.gic.authcenter.security.core.dto.AuthcenterUserDetails;
import com.gic.enterprise.constants.Constants;
import com.gic.member.config.api.service.MemberCardApiService;
import com.gic.operation.web.vo.MemberCardVO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
......@@ -103,6 +105,8 @@ public class EnterpriseController {
private MarketUserApiService marketUserApiService;
@Autowired
private MarketAppCategoryApiService marketAppCategoryApiService;
@Autowired
private MemberCardApiService memberCardApiService;
@RequestMapping("/save-enterprise")
public RestResponse saveEnterprise(
......@@ -237,6 +241,29 @@ public class EnterpriseController {
return RestResponse.success(changeListToTree(0, dtoList));
}
@RequestMapping("/list-all-member-card")
public RestResponse listAllMemberCard(Integer enterpriseId) {
return ResultControllerUtils.commonResult(memberCardApiService.getAll(enterpriseId), MemberCardVO.class);
}
/**
* 初始化会员卡的短信模板
* @Title: initMemberCardSmsTemplate

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.commons.webapi.reponse.RestResponse


*/
@RequestMapping("/init-member-card-sms-template")
public RestResponse initMemberCardSmsTemplate(Integer enterpriseId) {
//todo
return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "初始化会员模板还未开发完毕");
// ServiceResponse<Void> initMemberCardSmsTemplateResult = enterpriseInitApiService
// .initMemberCardSmsTemplate(enterpriseId);
// return ResultControllerUtils.commonResult(initMemberCardSmsTemplateResult);
}
@RequestMapping("/edit-enterprise")
public RestResponse editEnterprise(EnterpriseDTO enterpriseDTO) {
return ResultControllerUtils.commonResult(enterpriseApiService.editEnterprise(enterpriseDTO));
......
package com.gic.operation.web.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
public class MemberCardVO implements Serializable{
private static final long serialVersionUID = 1276175656828771005L;
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long id;
/**
* 会员卡基本信息表主键
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long cardConfigId;
private Integer ownerId;
private String cardCode;
private String cardName;
/**
* 1-自有,2-共享
*/
private Byte type;
private int gradeCount;
public Long getId() {
return id;
}
public MemberCardVO setId(Long id) {
this.id = id;
return this;
}
public Long getCardConfigId() {
return cardConfigId;
}
public MemberCardVO setCardConfigId(Long cardConfigId) {
this.cardConfigId = cardConfigId;
return this;
}
public Integer getOwnerId() {
return ownerId;
}
public MemberCardVO setOwnerId(Integer ownerId) {
this.ownerId = ownerId;
return this;
}
public String getCardCode() {
return cardCode;
}
public MemberCardVO setCardCode(String cardCode) {
this.cardCode = cardCode;
return this;
}
public String getCardName() {
return cardName;
}
public MemberCardVO setCardName(String cardName) {
this.cardName = cardName;
return this;
}
public Byte getType() {
return type;
}
public MemberCardVO setType(Byte type) {
this.type = type;
return this;
}
public int getGradeCount() {
return gradeCount;
}
public MemberCardVO setGradeCount(int gradeCount) {
this.gradeCount = gradeCount;
return this;
}
}
......@@ -91,4 +91,5 @@
<dubbo:reference interface="com.gic.mall.share.api.service.PayConfigApiService" id="payConfigApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.authcenter.api.service.GicDepartmentService" id="gicDepartmentService" timeout="6000" />
<dubbo:reference interface="com.gic.member.config.api.service.MemberCardApiService" id="memberCardApiService" timeout="6000" />
</beans>
\ No newline at end of file
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