Skip to content

G
gic-platform-enterprise
Commit ba0742d1 by guojuxing
Options

积分服务调整：增加序号和人群

parent 94614e3a
Showing with 279 additions and 40 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/applet/AppletPageTypeEnum.java
......@@ -22,7 +22,7 @@ public enum AppletPageTypeEnum {
/**
* 积分服务
*/
INTEGRAL_SERVICE(4, "积分服务", 2, 0),
INTEGRAL_SERVICE(4, "积分服务", 1, 0),
/**
* 积分成就
*/
......@@ -124,6 +124,21 @@ public enum AppletPageTypeEnum {
return false;
}
/**
* 是否是有人群筛选的页面
* @param pageType
* @return
*/
public static boolean needCrowdWidget(Integer pageType) {
if (pageType == null) {
return false;
}
if (AppletPageTypeEnum.INTEGRAL_SERVICE.getType() == pageType) {
return true;
}
return false;
}
private AppletPageTypeEnum(int code, String message, int type, int hasDefault) {
this.code = code;
this.message = message;
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AppletCustomPageDTO.java
......@@ -82,6 +82,23 @@ public class AppletCustomPageDTO implements Serializable{
*/
private String componentStr;
/**
* 人群筛选器ID（积分服务页面专用
*/
private Long crowdWidgetId;
/**
* 页面序号，如果开启页面有多个，根据序号取优先级（积分服务页面专用）。序号越大，优先级越大，如果相同，则编辑时间越晚，优先级越大
*/
private Integer serialNumber;
/**
* 选择了人群筛选器，区分全部人群还是部分人群 1:全部 2:部分。冗余字段，为了页面列表展示
*/
private Integer crowdWidgetType;
public Integer getPageId() {
return pageId;
}
......@@ -196,6 +213,33 @@ public class AppletCustomPageDTO implements Serializable{
return this;
}
public Long getCrowdWidgetId() {
return crowdWidgetId;
}
public AppletCustomPageDTO setCrowdWidgetId(Long crowdWidgetId) {
this.crowdWidgetId = crowdWidgetId;
return this;
}
public Integer getSerialNumber() {
return serialNumber;
}
public AppletCustomPageDTO setSerialNumber(Integer serialNumber) {
this.serialNumber = serialNumber;
return this;
}
public Integer getCrowdWidgetType() {
return crowdWidgetType;
}
public AppletCustomPageDTO setCrowdWidgetType(Integer crowdWidgetType) {
this.crowdWidgetType = crowdWidgetType;
return this;
}
@Override
public String toString() {
return "AppletCustomPageDTO{" +
......@@ -213,6 +257,9 @@ public class AppletCustomPageDTO implements Serializable{
", updateTime=" + updateTime +
", setting='" + setting + '\'' +
", componentStr='" + componentStr + '\'' +
", crowdWidgetId=" + crowdWidgetId +
", serialNumber=" + serialNumber +
", crowdWidgetType=" + crowdWidgetType +
'}';
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/AppletCustomPageApiService.java
......@@ -76,6 +76,25 @@ public interface AppletCustomPageApiService {
ServiceResponse<AppletCustomPageDTO> getCommonMemberInfo(Integer enterpriseId, String appId);
/**
* 查询积分服务页面。积分服务本来是一条开启，现在可以开启多个
* @param enterpriseId
* @param appType 1：小程序 2：服务号 如果为空，默认查询1：小程序
* @param appId 小程序/服务号的ID
* @return
*/
ServiceResponse<List<AppletCustomPageDTO>> listIntegralServiceByAppId(Integer enterpriseId, Integer appType,
String appId);
/**
* 积分服务页面设置页面序号
* 页面序号，如果开启页面有多个，根据序号取优先级（积分服务页面专用）。序号越大，优先级越大，如果相同，则编辑时间越晚，优先级越大
* @param pageId
* @param serialNumber
* @return
*/
ServiceResponse<Void> setSerialNumber(Integer pageId, Integer serialNumber);
/**
* 开启
* @Title: enable

* @Description:
......
gic-platform-enterprise-service/pom.xml
......@@ -221,6 +221,11 @@
<artifactId>gic-ds-mongo-api</artifactId>
<version>${gic-ds-mongo-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-member-filter-api</artifactId>
<version>${gic-member-filter-api}</version>
</dependency>
</dependencies>
<build>
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletCustomPage.java
......@@ -77,6 +77,21 @@ public class TabAppletCustomPage {
private Integer deleteFlag;
/**
* 人群筛选器ID（积分服务页面专用
*/
private Long crowdWidgetId;
/**
* 页面序号，如果开启页面有多个，根据序号取优先级（积分服务页面专用）。序号越大，优先级越大，如果相同，则编辑时间越晚，优先级越大
*/
private Integer serialNumber;
/**
* 选择了人群筛选器，区分全部人群还是部分人群 1:全部 2:部分。冗余字段，为了页面列表展示
*/
private Integer crowdWidgetType;
public Integer getPageId() {
return pageId;
}
......@@ -190,4 +205,31 @@ public class TabAppletCustomPage {
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Long getCrowdWidgetId() {
return crowdWidgetId;
}
public TabAppletCustomPage setCrowdWidgetId(Long crowdWidgetId) {
this.crowdWidgetId = crowdWidgetId;
return this;
}
public Integer getSerialNumber() {
return serialNumber;
}
public TabAppletCustomPage setSerialNumber(Integer serialNumber) {
this.serialNumber = serialNumber;
return this;
}
public Integer getCrowdWidgetType() {
return crowdWidgetType;
}
public TabAppletCustomPage setCrowdWidgetType(Integer crowdWidgetType) {
this.crowdWidgetType = crowdWidgetType;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml
......@@ -165,4 +165,6 @@
<dubbo:reference interface="com.gic.member.config.api.service.UserGroupPermissionApiService" id="userGroupPermissionApiService" timeout="6000" />
<dubbo:reference interface="com.gic.dsmongo.api.service.MongoOperApiService" id="mongoOperApiService" timeout="6000" />
<dubbo:reference interface="com.gic.member.filter.api.service.CrowdWidgetApiService" id="crowdWidgetApiService" timeout="6000" />
</beans>
gic-platform-enterprise-service/src/main/resources/mapper/TabAppletCustomPageMapper.xml
......@@ -15,13 +15,16 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
<result column="crowd_widget_id" jdbcType="BIGINT" property="crowdWidgetId" />
<result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
<result column="crowd_widget_type" jdbcType="INTEGER" property="crowdWidgetType" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.gic.enterprise.entity.TabAppletCustomPage">
<result column="setting" jdbcType="LONGVARCHAR" property="setting" />
</resultMap>
<sql id="Base_Column_List">
page_id, enterprise_id, title, entry_condition, quick_guide_switch, background_color, page_type, status,
app_type, app_id, create_time, update_time, delete_flag
app_type, app_id, create_time, update_time, delete_flag, crowd_widget_id, serial_number, crowd_widget_type
</sql>
<sql id="Blob_Column_List">
setting
......@@ -39,12 +42,12 @@
insert into tab_applet_custom_page (page_id, enterprise_id, title,
entry_condition, quick_guide_switch, background_color, page_type, status, app_type,
app_id, create_time, update_time,
setting, delete_flag)
setting, delete_flag, crowd_widget_id, serial_number, crowd_widget_type)
values (#{pageId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR},
#{entryCondition,jdbcType=INTEGER}, #{quickGuideSwitch,jdbcType=INTEGER}, #{backgroundColor,jdbcType=VARCHAR}, #{pageType,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{appType,jdbcType=INTEGER},
#{appId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{setting,jdbcType=LONGVARCHAR}, #{deleteFlag, jdbcType=INTEGER})
#{setting,jdbcType=LONGVARCHAR}, #{deleteFlag, jdbcType=INTEGER}, #{crowdWidgetId, jdbcType=BIGINT}, #{serialNumber, jdbcType=INTEGER}, #{crowdWidgetType, jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabAppletCustomPage">
insert into tab_applet_custom_page
......@@ -91,6 +94,15 @@
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="crowdWidgetId != null">
crowd_widget_id,
</if>
<if test="serialNumber != null">
serial_number,
</if>
<if test="crowdWidgetType != null">
crowd_widget_type,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="pageId != null">
......@@ -135,6 +147,15 @@
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
<if test="crowdWidgetId != null">
#{crowdWidgetId,jdbcType=BIGINT},
</if>
<if test="serialNumber != null">
#{serialNumber,jdbcType=INTEGER},
</if>
<if test="crowdWidgetType != null">
#{crowdWidgetType,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabAppletCustomPage">
......@@ -179,6 +200,15 @@
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
<if test="crowdWidgetId != null">
crowd_widget_id = #{crowdWidgetId,jdbcType=BIGINT},
</if>
<if test="serialNumber != null">
serial_number = #{serialNumber,jdbcType=INTEGER},
</if>
<if test="crowdWidgetType != null">
crowd_widget_type = #{crowdWidgetType,jdbcType=INTEGER},
</if>
</set>
where page_id = #{pageId,jdbcType=INTEGER}
</update>
......@@ -196,7 +226,10 @@
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
setting = #{setting,jdbcType=LONGVARCHAR},
delete_flag = #{deleteFlag,jdbcType=INTEGER}
delete_flag = #{deleteFlag,jdbcType=INTEGER},
crowd_widget_id = #{crowdWidgetId,jdbcType=BIGINT},
serial_number = #{serialNumber,jdbcType=INTEGER},
crowd_widget_type = #{crowdWidgetType,jdbcType=INTEGER}
where page_id = #{pageId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabAppletCustomPage">
......@@ -212,7 +245,10 @@
app_id = #{appId,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
delete_flag = #{deleteFlag,jdbcType=INTEGER}
delete_flag = #{deleteFlag,jdbcType=INTEGER},
crowd_widget_id = #{crowdWidgetId,jdbcType=BIGINT},
serial_number = #{serialNumber,jdbcType=INTEGER},
crowd_widget_type = #{crowdWidgetType,jdbcType=INTEGER}
where page_id = #{pageId,jdbcType=INTEGER}
</update>
......
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