Skip to content

G
gic-platform-enterprise
Commit e164e8d8 by guojuxing
Options

小程序-管理-配置新增会员码和会员特权

parent ca106ff1
Showing with 105 additions and 10 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AppletDecorationConfigDTO.java
......@@ -29,6 +29,16 @@ public class AppletDecorationConfigDTO implements Serializable{
private String memberCardArea;
/**
* 会员码，默认与卡显示一样，可多选，英文逗号隔开
*/
private String memberCode;
/**
* 会员特权，默认与卡显示一样，单选
*/
private String memberPrivilege;
/**
* 数据资产范围：积分、卡券包、零售订单、商城订单 json
*/
private String dataAssetArea;
......@@ -143,12 +153,41 @@ public class AppletDecorationConfigDTO implements Serializable{
this.appletDataAssetArea = appletDataAssetArea;
}
public String getMemberCode() {
if (memberCode == null) {
//如果是空的，则默认卡显示数据
return memberCardArea;
}
return memberCode;
}
public AppletDecorationConfigDTO setMemberCode(String memberCode) {
this.memberCode = memberCode;
return this;
}
public String getMemberPrivilege() {
if (memberPrivilege == null) {
if (memberCardArea != null) {
return memberCardArea.split(",")[0];
}
}
return memberPrivilege;
}
public AppletDecorationConfigDTO setMemberPrivilege(String memberPrivilege) {
this.memberPrivilege = memberPrivilege;
return this;
}
@Override
public String toString() {
return "AppletDecorationConfigDTO{" +
"configId=" + configId +
", enterpriseId=" + enterpriseId +
", memberCardArea='" + memberCardArea + '\'' +
", memberCode='" + memberCode + '\'' +
", memberPrivilege='" + memberPrivilege + '\'' +
", dataAssetArea='" + dataAssetArea + '\'' +
", appletDataAssetArea=" + appletDataAssetArea +
", openCardAuth='" + openCardAuth + '\'' +
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletDecorationConfig.java
......@@ -26,6 +26,16 @@ public class TabAppletDecorationConfig {
private String memberCardArea;
/**
* 会员码，默认与卡显示一样，可多选，英文逗号隔开
*/
private String memberCode;
/**
* 会员特权，默认与卡显示一样，单选
*/
private String memberPrivilege;
/**
* 数据资产范围：积分、卡券包、零售订单、商城订单 json
*/
private String dataAssetArea;
......@@ -126,4 +136,22 @@ public class TabAppletDecorationConfig {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getMemberCode() {
return memberCode;
}
public TabAppletDecorationConfig setMemberCode(String memberCode) {
this.memberCode = memberCode;
return this;
}
public String getMemberPrivilege() {
return memberPrivilege;
}
public TabAppletDecorationConfig setMemberPrivilege(String memberPrivilege) {
this.memberPrivilege = memberPrivilege;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletDecorationConfigApiServiceImpl.java
......@@ -109,6 +109,8 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
}
//会员中心页面卡范围
result.setMemberCardArea(mainCardId.toString());
result.setMemberCode(mainCardId.toString());
result.setMemberPrivilege(mainCardId.toString());
//数据资产对象
result.setAppletDataAssetArea(dataAssetArea);
//数据资产json字符串
......@@ -245,6 +247,8 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
//需要校验的数值集合
Map<String, String> needValidMap = new HashMap<>(16);
needValidMap.put("会员中心页面卡范围", dto.getMemberCardArea());
needValidMap.put("会员中心会员码范围", dto.getMemberCode());
needValidMap.put("会员中心会员特权范围", dto.getMemberPrivilege());
needValidMap.put("开卡认证关联", dto.getOpenCardAuth());
//数据资产
//总积分
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/InternationalSmsRecordApiServiceImpl.java
......@@ -15,7 +15,7 @@ import com.gic.enterprise.service.InternationalSmsRecordApiService;
import com.gic.member.api.dto.MemberUserDTO;
import com.gic.member.api.dto.UserOwnerDTO;
import com.gic.member.api.service.MemberUserApiService;
import com.gic.member.api.service.UserOwnerApiService;
import com.gic.member.api.service.UserAscriptionApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.store.dto.StoreDTO;
import com.gic.store.service.StoreApiService;
......@@ -49,7 +49,7 @@ public class InternationalSmsRecordApiServiceImpl implements InternationalSmsRec
@Autowired
private StoreApiService storeApiService;
@Autowired
private UserOwnerApiService userOwnerApiService;
private UserAscriptionApiService userAscriptionApiService;
@Autowired
private AccountStandardService accountStandardService;
......@@ -119,7 +119,7 @@ public class InternationalSmsRecordApiServiceImpl implements InternationalSmsRec
}
private void setStore(InternationalSmsRecordDTO smsRecordDTO) {
ServiceResponse<UserOwnerDTO> userOwnerResp = userOwnerApiService.getUserMaxOwner(smsRecordDTO.getEnterpriseId(), smsRecordDTO.getEcuId(), 1, smsRecordDTO.getMemberCardId(), null);
ServiceResponse<UserOwnerDTO> userOwnerResp = userAscriptionApiService.getUserMaxOwner(smsRecordDTO.getEnterpriseId(), smsRecordDTO.getEcuId(), 1, smsRecordDTO.getMemberCardId(), null);
if (userOwnerResp.isSuccess()) {
UserOwnerDTO userOwnerDTO = userOwnerResp.getResult();
if (userOwnerDTO != null) {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/SmsRecordApiServiceImpl.java
......@@ -20,7 +20,7 @@ import com.gic.enterprise.utils.SmsUtils;
import com.gic.member.api.dto.MemberUserDTO;
import com.gic.member.api.dto.UserOwnerDTO;
import com.gic.member.api.service.MemberUserApiService;
import com.gic.member.api.service.UserOwnerApiService;
import com.gic.member.api.service.UserAscriptionApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.store.dto.StoreDTO;
import com.gic.store.service.StoreApiService;
......@@ -60,7 +60,7 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
@Autowired
private StoreApiService storeApiService;
@Autowired
private UserOwnerApiService userOwnerApiService;
private UserAscriptionApiService userAscriptionApiService;
@Autowired
private InternationalSmsRecordApiService internationalSmsRecordApiService;
@Autowired
......@@ -202,7 +202,7 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
}
private void setStore(SmsRecordDTO smsRecordDTO) {
ServiceResponse<UserOwnerDTO> userOwnerResp = userOwnerApiService.getUserMaxOwner(smsRecordDTO.getEnterpriseId(), smsRecordDTO.getEcuId(), 1, smsRecordDTO.getMemberCardId(), null);
ServiceResponse<UserOwnerDTO> userOwnerResp = userAscriptionApiService.getUserMaxOwner(smsRecordDTO.getEnterpriseId(), smsRecordDTO.getEcuId(), 1, smsRecordDTO.getMemberCardId(), null);
if (userOwnerResp.isSuccess()) {
UserOwnerDTO userOwnerDTO = userOwnerResp.getResult();
if (userOwnerDTO != null) {
......
gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml
......@@ -139,7 +139,7 @@
<dubbo:reference interface="com.gic.marketing.process.api.service.tmpl.WxTemplateRouterApiService" id="wxTemplateRouterApiService" timeout="60000" />
<dubbo:reference interface="com.gic.member.api.service.MemberUserApiService" id="memberUserApiService" timeout="60000" />
<dubbo:reference interface="com.gic.store.service.StoreApiService" id="storeApiService" timeout="60000" />
<dubbo:reference interface="com.gic.member.api.service.UserOwnerApiService" id="userOwnerApiService" timeout="60000" />
<dubbo:reference interface="com.gic.member.api.service.UserAscriptionApiService" id="userAscriptionApiService" timeout="60000" />
<dubbo:reference interface="com.gic.marketing.process.api.service.sms.SmsSendApiService" id="smsSendApiService" timeout="60000" />
<dubbo:reference interface="com.gic.wechat.business.api.service.wxa.WeixinWxaFunService" id="weixinWxaFunService" timeout="60000" />
......
gic-platform-enterprise-service/src/main/resources/mapper/TabAppletDecorationConfigMapper.xml
......@@ -5,6 +5,8 @@
<id column="config_id" jdbcType="INTEGER" property="configId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="member_card_area" jdbcType="VARCHAR" property="memberCardArea" />
<result column="member_code" jdbcType="VARCHAR" property="memberCode" />
<result column="member_privilege" jdbcType="VARCHAR" property="memberPrivilege" />
<result column="data_asset_area" jdbcType="VARCHAR" property="dataAssetArea" />
<result column="open_card_auth" jdbcType="VARCHAR" property="openCardAuth" />
<result column="gps_decision_card" jdbcType="INTEGER" property="gpsDecisionCard" />
......@@ -13,7 +15,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
config_id, enterprise_id, member_card_area, data_asset_area, open_card_auth, gps_decision_card,
config_id, enterprise_id, member_card_area, member_code, member_privilege, data_asset_area, open_card_auth, gps_decision_card,
app_id, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -24,11 +26,12 @@
</select>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabAppletDecorationConfig" useGeneratedKeys="true" keyProperty="configId">
insert into tab_applet_decoration_config (config_id, enterprise_id, member_card_area,
insert into tab_applet_decoration_config (config_id, enterprise_id, member_card_area, member_code, member_privilege,
data_asset_area, open_card_auth, gps_decision_card,
app_id, create_time, update_time
)
values (#{configId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{memberCardArea,jdbcType=VARCHAR},
values (#{configId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{memberCardArea,jdbcType=VARCHAR},
#{memberCode,jdbcType=VARCHAR}, #{memberPrivilege,jdbcType=VARCHAR},
#{dataAssetArea,jdbcType=VARCHAR}, #{openCardAuth,jdbcType=VARCHAR}, #{gpsDecisionCard,jdbcType=INTEGER},
#{appId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
......@@ -45,6 +48,12 @@
<if test="memberCardArea != null">
member_card_area,
</if>
<if test="memberCode != null">
member_code,
</if>
<if test="memberPrivilege != null">
member_privilege,
</if>
<if test="dataAssetArea != null">
data_asset_area,
</if>
......@@ -74,6 +83,12 @@
<if test="memberCardArea != null">
#{memberCardArea,jdbcType=VARCHAR},
</if>
<if test="memberCode != null">
#{memberCode,jdbcType=VARCHAR},
</if>
<if test="memberPrivilege != null">
#{memberPrivilege,jdbcType=VARCHAR},
</if>
<if test="dataAssetArea != null">
#{dataAssetArea,jdbcType=VARCHAR},
</if>
......@@ -103,6 +118,12 @@
<if test="memberCardArea != null">
member_card_area = #{memberCardArea,jdbcType=VARCHAR},
</if>
<if test="memberCode != null">
member_code = #{memberCode,jdbcType=VARCHAR},
</if>
<if test="memberPrivilege != null">
member_privilege = #{memberPrivilege,jdbcType=VARCHAR},
</if>
<if test="dataAssetArea != null">
data_asset_area = #{dataAssetArea,jdbcType=VARCHAR},
</if>
......@@ -128,6 +149,8 @@
update tab_applet_decoration_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
member_card_area = #{memberCardArea,jdbcType=VARCHAR},
member_code = #{memberCode,jdbcType=VARCHAR},
member_privilege = #{memberPrivilege,jdbcType=VARCHAR},
data_asset_area = #{dataAssetArea,jdbcType=VARCHAR},
open_card_auth = #{openCardAuth,jdbcType=VARCHAR},
gps_decision_card = #{gpsDecisionCard,jdbcType=INTEGER},
......
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