Skip to content

GitLab

Q
qk_backend
Commit d46568b8 authored by shiyu's avatar shiyu
Browse files
Options

白名单管理新增是否限制上传藏品数

parent 3b25bde2
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 21 deletions
ch-dao/src/main/java/com/wwdz/ch/db/domain/CollectorWhiteList.java
View file @ d46568b8
package com.wwdz.ch.db.domain;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import com.xxdxxs.entity.Entity;
import lombok.Data;
/**
* @author shiyu
* @date 2024/08/08
* @date 2024/09/20
*/
@Data
public class CollectorWhiteList implements Entity {
......@@ -43,10 +41,15 @@ public class CollectorWhiteList implements Entity {
private Integer deliveryAuth;
/**
* 是有展示在首页
* 是否展示在首页
*/
private Boolean isShow;
/**
* 是否限制上传藏品数
*/
private Boolean isUploadLimit;
private static final long serialVersionUID = 1L;
@Override
......@@ -62,6 +65,7 @@ public class CollectorWhiteList implements Entity {
sb.append(", isValid=").append(isValid);
sb.append(", deliveryAuth=").append(deliveryAuth);
sb.append(", isShow=").append(isShow);
sb.append(", isUploadLimit=").append(isUploadLimit);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
......@@ -85,7 +89,8 @@ public class CollectorWhiteList implements Entity {
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getIsValid() == null ? other.getIsValid() == null : this.getIsValid().equals(other.getIsValid()))
&& (this.getDeliveryAuth() == null ? other.getDeliveryAuth() == null : this.getDeliveryAuth().equals(other.getDeliveryAuth()))
&& (this.getIsShow() == null ? other.getIsShow() == null : this.getIsShow().equals(other.getIsShow()));
&& (this.getIsShow() == null ? other.getIsShow() == null : this.getIsShow().equals(other.getIsShow()))
&& (this.getIsUploadLimit() == null ? other.getIsUploadLimit() == null : this.getIsUploadLimit().equals(other.getIsUploadLimit()));
}
@Override
......@@ -99,6 +104,7 @@ public class CollectorWhiteList implements Entity {
result = prime * result + ((getIsValid() == null) ? 0 : getIsValid().hashCode());
result = prime * result + ((getDeliveryAuth() == null) ? 0 : getDeliveryAuth().hashCode());
result = prime * result + ((getIsShow() == null) ? 0 : getIsShow().hashCode());
result = prime * result + ((getIsUploadLimit() == null) ? 0 : getIsUploadLimit().hashCode());
return result;
}
......@@ -116,7 +122,8 @@ public class CollectorWhiteList implements Entity {
createTime("create_time", "createTime", "TIMESTAMP", false),
isValid("is_valid", "isValid", "BIT", false),
deliveryAuth("delivery_auth", "deliveryAuth", "INTEGER", false),
isShow("is_show", "isShow", "BIT", false);
isShow("is_show", "isShow", "BIT", false),
isUploadLimit("is_upload_limit", "isUploadLimit", "BIT", false);
/**
* This field was generated by MyBatis Generator.
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/CollectorWhiteListExample.java
View file @ d46568b8
......@@ -1072,6 +1072,138 @@ public class CollectorWhiteListExample {
addCriterion("is_show not between", value1, value2, "isShow");
return (Criteria) this;
}
public Criteria andIsUploadLimitIsNull() {
addCriterion("is_upload_limit is null");
return (Criteria) this;
}
public Criteria andIsUploadLimitIsNotNull() {
addCriterion("is_upload_limit is not null");
return (Criteria) this;
}
public Criteria andIsUploadLimitEqualTo(Boolean value) {
addCriterion("is_upload_limit =", value, "isUploadLimit");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table collector_white_list
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsUploadLimitEqualToColumn(CollectorWhiteList.Column column) {
addCriterion(new StringBuilder("is_upload_limit = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsUploadLimitNotEqualTo(Boolean value) {
addCriterion("is_upload_limit <>", value, "isUploadLimit");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table collector_white_list
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsUploadLimitNotEqualToColumn(CollectorWhiteList.Column column) {
addCriterion(new StringBuilder("is_upload_limit <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsUploadLimitGreaterThan(Boolean value) {
addCriterion("is_upload_limit >", value, "isUploadLimit");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table collector_white_list
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsUploadLimitGreaterThanColumn(CollectorWhiteList.Column column) {
addCriterion(new StringBuilder("is_upload_limit > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsUploadLimitGreaterThanOrEqualTo(Boolean value) {
addCriterion("is_upload_limit >=", value, "isUploadLimit");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table collector_white_list
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsUploadLimitGreaterThanOrEqualToColumn(CollectorWhiteList.Column column) {
addCriterion(new StringBuilder("is_upload_limit >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsUploadLimitLessThan(Boolean value) {
addCriterion("is_upload_limit <", value, "isUploadLimit");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table collector_white_list
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsUploadLimitLessThanColumn(CollectorWhiteList.Column column) {
addCriterion(new StringBuilder("is_upload_limit < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsUploadLimitLessThanOrEqualTo(Boolean value) {
addCriterion("is_upload_limit <=", value, "isUploadLimit");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table collector_white_list
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsUploadLimitLessThanOrEqualToColumn(CollectorWhiteList.Column column) {
addCriterion(new StringBuilder("is_upload_limit <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsUploadLimitIn(List<Boolean> values) {
addCriterion("is_upload_limit in", values, "isUploadLimit");
return (Criteria) this;
}
public Criteria andIsUploadLimitNotIn(List<Boolean> values) {
addCriterion("is_upload_limit not in", values, "isUploadLimit");
return (Criteria) this;
}
public Criteria andIsUploadLimitBetween(Boolean value1, Boolean value2) {
addCriterion("is_upload_limit between", value1, value2, "isUploadLimit");
return (Criteria) this;
}
public Criteria andIsUploadLimitNotBetween(Boolean value1, Boolean value2) {
addCriterion("is_upload_limit not between", value1, value2, "isUploadLimit");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
......
ch-dao/src/main/resources/com/wwdz/ch/db/mapper/CollectorWhiteListMapper.xml
View file @ d46568b8
......@@ -9,6 +9,7 @@
<result column="is_valid" jdbcType="BIT" property="isValid" />
<result column="delivery_auth" jdbcType="INTEGER" property="deliveryAuth" />
<result column="is_show" jdbcType="BIT" property="isShow" />
<result column="is_upload_limit" jdbcType="BIT" property="isUploadLimit" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
......@@ -69,7 +70,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, collector_id, channel_cost_rebate, create_time, is_valid, delivery_auth, is_show
id, collector_id, channel_cost_rebate, create_time, is_valid, delivery_auth, is_show,
is_upload_limit
</sql>
<select id="selectByExample" parameterType="com.wwdz.ch.db.domain.CollectorWhiteListExample" resultMap="BaseResultMap">
select
......@@ -104,8 +106,8 @@
</foreach>
</when>
<otherwise>
id, collector_id, channel_cost_rebate, create_time, is_valid, delivery_auth, is_show
id, collector_id, channel_cost_rebate, create_time, is_valid, delivery_auth, is_show,
is_upload_limit
</otherwise>
</choose>
from collector_white_list
......@@ -136,8 +138,8 @@
</foreach>
</when>
<otherwise>
id, collector_id, channel_cost_rebate, create_time, is_valid, delivery_auth, is_show
id, collector_id, channel_cost_rebate, create_time, is_valid, delivery_auth, is_show,
is_upload_limit
</otherwise>
</choose>
from collector_white_list
......@@ -158,11 +160,11 @@
SELECT LAST_INSERT_ID()
</selectKey>
insert into collector_white_list (collector_id, channel_cost_rebate, create_time,
is_valid, delivery_auth, is_show
)
is_valid, delivery_auth, is_show,
is_upload_limit)
values (#{collectorId,jdbcType=BIGINT}, #{channelCostRebate,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP},
#{isValid,jdbcType=BIT}, #{deliveryAuth,jdbcType=INTEGER}, #{isShow,jdbcType=BIT}
)
#{isValid,jdbcType=BIT}, #{deliveryAuth,jdbcType=INTEGER}, #{isShow,jdbcType=BIT},
#{isUploadLimit,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.CollectorWhiteList">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
......@@ -188,6 +190,9 @@
<if test="isShow != null">
is_show,
</if>
<if test="isUploadLimit != null">
is_upload_limit,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="collectorId != null">
......@@ -208,6 +213,9 @@
<if test="isShow != null">
#{isShow,jdbcType=BIT},
</if>
<if test="isUploadLimit != null">
#{isUploadLimit,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.wwdz.ch.db.domain.CollectorWhiteListExample" resultType="java.lang.Long">
......@@ -240,6 +248,9 @@
<if test="record.isShow != null">
is_show = #{record.isShow,jdbcType=BIT},
</if>
<if test="record.isUploadLimit != null">
is_upload_limit = #{record.isUploadLimit,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -253,7 +264,8 @@
create_time = #{record.createTime,jdbcType=TIMESTAMP},
is_valid = #{record.isValid,jdbcType=BIT},
delivery_auth = #{record.deliveryAuth,jdbcType=INTEGER},
is_show = #{record.isShow,jdbcType=BIT}
is_show = #{record.isShow,jdbcType=BIT},
is_upload_limit = #{record.isUploadLimit,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -279,6 +291,9 @@
<if test="isShow != null">
is_show = #{isShow,jdbcType=BIT},
</if>
<if test="isUploadLimit != null">
is_upload_limit = #{isUploadLimit,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -289,7 +304,8 @@
create_time = #{createTime,jdbcType=TIMESTAMP},
is_valid = #{isValid,jdbcType=BIT},
delivery_auth = #{deliveryAuth,jdbcType=INTEGER},
is_show = #{isShow,jdbcType=BIT}
is_show = #{isShow,jdbcType=BIT},
is_upload_limit = #{isUploadLimit,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.CollectorWhiteListExample" resultMap="BaseResultMap">
......@@ -325,8 +341,8 @@
</foreach>
</when>
<otherwise>
id, collector_id, channel_cost_rebate, create_time, is_valid, delivery_auth, is_show
id, collector_id, channel_cost_rebate, create_time, is_valid, delivery_auth, is_show,
is_upload_limit
</otherwise>
</choose>
from collector_white_list
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java
View file @ d46568b8
......@@ -788,7 +788,8 @@ public class SupplierItemServiceImpl implements SupplierItemService {
return Result.failed("操作过快，稍后再试");
}
//不在白名单中的用户，上传商品数量有限制
if (!collectorWhiteListDao.isExisted(dto.getUserId())) {
CollectorWhiteList collectorWhiteList = collectorWhiteListDao.findById(dto.getUserId());
if (collectorWhiteList == null || collectorWhiteList.getIsUploadLimit()) {
//检查用户历史上传的
if (supplierItemDao.countAllItemByCreatorId(dto.getUserId(), null) >= 100) {
return Result.failed("普通用户最多上传100件商品");
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/LogisticsController.java
View file @ d46568b8
......@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/wx/logistics")
public class LogisticsController {
private static final Logger logger = LoggerFactory.getLogger(SelfPageController.class);
private static final Logger logger = LoggerFactory.getLogger(LogisticsController.class);
@Autowired
LogisticsService logisticsService;
......
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