Skip to content

G
gic-platform-auth
Commit c565cea8 by guojuxing
Options

资源组-商品配置调整

parent a6a12051
Showing with 181 additions and 5 deletions
gic-platform-auth-api/src/main/java/com/gic/auth/dto/GoodsResourceDTO.java
package com.gic.auth.dto;
import java.io.Serializable;
import java.util.Map;
/**
* 资源组-商品资源
* @ClassName:
......@@ -21,6 +23,21 @@ public class GoodsResourceDTO implements Serializable{
*/
private Integer type;
/**
* 商品资源授予状态 1:授予 0:不授予
*/
private Integer goodsResourceAuth;
/**
* 商品资源配置。json字符串。key:一个商户ID Value:商品选择器ID
*/
private String goodsResourceConfig;
/**
* goodsResourceConfig 解析。key:商户ID value：商品选择器ID
*/
private Map<Integer, Long> goodsResourceEntMapSelectId;
public Long getGoodsResourceId() {
return goodsResourceId;
}
......@@ -38,4 +55,31 @@ public class GoodsResourceDTO implements Serializable{
this.type = type;
return this;
}
public Integer getGoodsResourceAuth() {
return goodsResourceAuth;
}
public GoodsResourceDTO setGoodsResourceAuth(Integer goodsResourceAuth) {
this.goodsResourceAuth = goodsResourceAuth;
return this;
}
public String getGoodsResourceConfig() {
return goodsResourceConfig;
}
public GoodsResourceDTO setGoodsResourceConfig(String goodsResourceConfig) {
this.goodsResourceConfig = goodsResourceConfig;
return this;
}
public Map<Integer, Long> getGoodsResourceEntMapSelectId() {
return goodsResourceEntMapSelectId;
}
public GoodsResourceDTO setGoodsResourceEntMapSelectId(Map<Integer, Long> goodsResourceEntMapSelectId) {
this.goodsResourceEntMapSelectId = goodsResourceEntMapSelectId;
return this;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceGroupDTO.java
......@@ -50,6 +50,16 @@ public class ResourceGroupDTO implements Serializable{
private Long storeResource;
/**
* 商品资源授予状态 1:授予 0:不授予
*/
private Integer goodsResourceAuth;
/**
* 商品资源配置。json字符串。key:一个商户ID Value:商品选择器ID
*/
private String goodsResourceConfig;
/**
* 商品资源
*/
private Long goodsResourceId;
......@@ -302,6 +312,24 @@ public class ResourceGroupDTO implements Serializable{
return false;
}
public Integer getGoodsResourceAuth() {
return goodsResourceAuth;
}
public ResourceGroupDTO setGoodsResourceAuth(Integer goodsResourceAuth) {
this.goodsResourceAuth = goodsResourceAuth;
return this;
}
public String getGoodsResourceConfig() {
return goodsResourceConfig;
}
public ResourceGroupDTO setGoodsResourceConfig(String goodsResourceConfig) {
this.goodsResourceConfig = goodsResourceConfig;
return this;
}
@Override
public String toString() {
return "ResourceGroupDTO{" +
......@@ -325,6 +353,8 @@ public class ResourceGroupDTO implements Serializable{
", userResourceCount=" + userResourceCount +
", authCode='" + authCode + '\'' +
", authCodeId=" + authCodeId +
", goodsResourceAuth=" + goodsResourceAuth +
", goodsResourceConfig=" + goodsResourceConfig +
'}';
}
}
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysResourceGroup.java
......@@ -41,6 +41,16 @@ public class TabSysResourceGroup {
private Long storeResource;
/**
* 商品资源授予状态 1:授予 0:不授予
*/
private Integer goodsResourceAuth;
/**
* 商品资源配置。json数组字符串。key:一个商户ID Value:商品选择器ID
*/
private String goodsResourceConfig;
/**
* 商品资源
*/
private Long goodsResourceId;
......@@ -233,4 +243,22 @@ public class TabSysResourceGroup {
this.weimobStoreIdShare = weimobStoreIdShare;
return this;
}
public Integer getGoodsResourceAuth() {
return goodsResourceAuth;
}
public TabSysResourceGroup setGoodsResourceAuth(Integer goodsResourceAuth) {
this.goodsResourceAuth = goodsResourceAuth;
return this;
}
public String getGoodsResourceConfig() {
return goodsResourceConfig;
}
public TabSysResourceGroup setGoodsResourceConfig(String goodsResourceConfig) {
this.goodsResourceConfig = goodsResourceConfig;
return this;
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/utils/resourcegroup/GoodsResourceData.java
package com.gic.auth.utils.resourcegroup;
import com.alibaba.fastjson.JSONObject;
import com.gic.auth.constant.ResourceHoldEnum;
import com.gic.auth.dto.GoodsResourceDTO;
import com.gic.auth.entity.TabSysResourceGroup;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Map;
/**
* 资源组-商品资源
* @ClassName:
......@@ -11,11 +18,24 @@ import com.gic.auth.entity.TabSysResourceGroup;
* @date 2021/1/12 2:29 PM

*/
public class GoodsResourceData implements IResourceGroupData{
private static Logger LOGGER = LogManager.getLogger(GoodsResourceData.class);
@Override
public <T> T getResourceData(TabSysResourceGroup resourceGroup) {
String goodsResourceConfig = resourceGroup.getGoodsResourceConfig();
Map<Integer, Long> goodsResourceEntMapSelectId = null;
if (StringUtils.isNotBlank(goodsResourceConfig)) {
try {
goodsResourceEntMapSelectId = (Map<Integer, Long>) JSONObject.parse(goodsResourceConfig);
} catch (Exception e) {
LOGGER.info("资源组ID：{}.商品配置信息:{}", resourceGroup.getResourceGroupId(), goodsResourceConfig);
}
}
return (T) new GoodsResourceDTO()
.setType(ResourceHoldEnum.DART.getCode())
.setGoodsResourceId(resourceGroup.getGoodsResourceId());
.setGoodsResourceId(resourceGroup.getGoodsResourceId())
.setGoodsResourceAuth(resourceGroup.getGoodsResourceAuth())
.setGoodsResourceConfig(resourceGroup.getGoodsResourceConfig())
.setGoodsResourceEntMapSelectId(goodsResourceEntMapSelectId);
}
@Override
......
gic-platform-auth-service/src/main/resources/mapper/TabSysResourceGroupMapper.xml
......@@ -18,11 +18,13 @@
<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="goods_resource_auth" jdbcType="INTEGER" property="goodsResourceAuth" />
<result column="goods_resource_config" jdbcType="VARCHAR" property="goodsResourceConfig" />
</resultMap>
<sql id="Base_Column_List">
resource_group_id, resource_group_name, enterprise_id, custom_user, custom_user_data,
store_resource, goods_resource_id, store_order_area, weimob_order_area, weimob_store_id, weimob_store_id_own, weimob_store_id_share,
sms_id, create_time, update_time, delete_flag
sms_id, create_time, update_time, delete_flag, goods_resource_auth, goods_resource_config
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -35,14 +37,15 @@
enterprise_id, custom_user, custom_user_data,
store_resource, goods_resource_id, store_order_area,
weimob_order_area, weimob_store_id, weimob_store_id_own, weimob_store_id_share, sms_id,
create_time, update_time, delete_flag
create_time, update_time, delete_flag, goods_resource_auth, goods_resource_config
)
values (#{resourceGroupId,jdbcType=INTEGER}, #{resourceGroupName,jdbcType=VARCHAR},
#{enterpriseId,jdbcType=INTEGER}, #{customUser,jdbcType=INTEGER}, #{customUserData,jdbcType=VARCHAR},
#{storeResource,jdbcType=BIGINT}, #{goodsResourceId,jdbcType=BIGINT}, #{storeOrderArea,jdbcType=INTEGER},
#{weimobOrderArea,jdbcType=INTEGER}, #{weimobStoreId,jdbcType=VARCHAR}, #{weimobStoreIdOwn,jdbcType=VARCHAR}, #{weimobStoreIdShare,jdbcType=VARCHAR},
#{smsId,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER},
#{goodsResourceAuth,jdbcType=INTEGER}, #{goodsResourceConfig,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.auth.entity.TabSysResourceGroup">
......@@ -96,6 +99,12 @@
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="goodsResourceAuth != null">
goods_resource_auth,
</if>
<if test="goodsResourceConfig != null">
goods_resource_config,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="resourceGroupId != null">
......@@ -146,6 +155,12 @@
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
<if test="goodsResourceAuth != null">
#{goodsResourceAuth,jdbcType=INTEGER},
</if>
<if test="goodsResourceConfig != null">
#{goodsResourceConfig,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.auth.entity.TabSysResourceGroup">
......@@ -196,6 +211,12 @@
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
<if test="goodsResourceAuth != null">
goods_resource_auth = #{goodsResourceAuth,jdbcType=INTEGER},
</if>
<if test="goodsResourceConfig != null">
goods_resource_config = #{goodsResourceConfig,jdbcType=VARCHAR},
</if>
</set>
where resource_group_id = #{resourceGroupId,jdbcType=INTEGER}
</update>
......@@ -215,7 +236,9 @@
sms_id = #{smsId,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
delete_flag = #{deleteFlag,jdbcType=INTEGER}
delete_flag = #{deleteFlag,jdbcType=INTEGER},
goods_resource_auth = #{goodsResourceAuth,jdbcType=INTEGER},
goods_resource_config = #{goodsResourceConfig,jdbcType=VARCHAR}
where resource_group_id = #{resourceGroupId,jdbcType=INTEGER}
</update>
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceGroupDetailVO.java
......@@ -37,6 +37,16 @@ public class ResourceGroupDetailVO implements Serializable{
private Long storeResource;
/**
* 商品资源授予状态 1:授予 0:不授予
*/
private Integer goodsResourceAuth;
/**
* 商品资源配置。json字符串。key:一个商户ID Value:商品选择器ID
*/
private String goodsResourceConfig;
/**
* 商品资源
*/
private Long goodsResourceId;
......@@ -151,6 +161,24 @@ public class ResourceGroupDetailVO implements Serializable{
return this;
}
public Integer getGoodsResourceAuth() {
return goodsResourceAuth;
}
public ResourceGroupDetailVO setGoodsResourceAuth(Integer goodsResourceAuth) {
this.goodsResourceAuth = goodsResourceAuth;
return this;
}
public String getGoodsResourceConfig() {
return goodsResourceConfig;
}
public ResourceGroupDetailVO setGoodsResourceConfig(String goodsResourceConfig) {
this.goodsResourceConfig = goodsResourceConfig;
return this;
}
@Override
public String toString() {
return "ResourceGroupDetailVO{" +
......@@ -164,6 +192,8 @@ public class ResourceGroupDetailVO implements Serializable{
", weimobOrderArea=" + weimobOrderArea +
", weimobStoreId='" + weimobStoreId + '\'' +
", smsId='" + smsId + '\'' +
", goodsResourceAuth='" + goodsResourceAuth + '\'' +
", goodsResourceConfig='" + goodsResourceConfig + '\'' +
'}';
}
}
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