Skip to content

GitLab

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

个人藏馆

parent 3ee4cb6e
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 79 deletions
ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/CollectionItemsRelationDao.java
View file @ d6d0987c
......@@ -28,6 +28,8 @@ public interface CollectionItemsRelationDao {
*/
List<CollectionItemsRelation> findByItemId(long itemId);
boolean isExisted(long bookId, long itemId);
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/SupplierItem.java
View file @ d6d0987c
......@@ -11,7 +11,7 @@ import lombok.Data;
/**
* @author shiyu
* @date 2024/03/20
* @date 2024/03/21
*/
@Data
public class SupplierItem implements Entity {
......@@ -90,7 +90,7 @@ public class SupplierItem implements Entity {
/**
* 用户id,非用户id的为系统账号
*/
private Long userId;
private Long creatorId;
/**
* 商品图片,分号分隔
......@@ -130,7 +130,7 @@ public class SupplierItem implements Entity {
sb.append(", buyLimitNum=").append(buyLimitNum);
sb.append(", type=").append(type);
sb.append(", rebate=").append(rebate);
sb.append(", userId=").append(userId);
sb.append(", creatorId=").append(creatorId);
sb.append(", images=").append(images);
sb.append(", videos=").append(videos);
sb.append(", description=").append(description);
......@@ -166,7 +166,7 @@ public class SupplierItem implements Entity {
&& (this.getBuyLimitNum() == null ? other.getBuyLimitNum() == null : this.getBuyLimitNum().equals(other.getBuyLimitNum()))
&& (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
&& (this.getRebate() == null ? other.getRebate() == null : this.getRebate().equals(other.getRebate()))
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))
&& (this.getImages() == null ? other.getImages() == null : this.getImages().equals(other.getImages()))
&& (this.getVideos() == null ? other.getVideos() == null : this.getVideos().equals(other.getVideos()))
&& (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()));
......@@ -191,7 +191,7 @@ public class SupplierItem implements Entity {
result = prime * result + ((getBuyLimitNum() == null) ? 0 : getBuyLimitNum().hashCode());
result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
result = prime * result + ((getRebate() == null) ? 0 : getRebate().hashCode());
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode());
result = prime * result + ((getImages() == null) ? 0 : getImages().hashCode());
result = prime * result + ((getVideos() == null) ? 0 : getVideos().hashCode());
result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode());
......@@ -221,7 +221,7 @@ public class SupplierItem implements Entity {
buyLimitNum("buy_limit_num", "buyLimitNum", "INTEGER", false),
type("type", "type", "INTEGER", true),
rebate("rebate", "rebate", "DECIMAL", false),
userId("user_id", "userId", "BIGINT", false),
creatorId("creator_id", "creatorId", "BIGINT", false),
images("images", "images", "LONGVARCHAR", false),
videos("videos", "videos", "LONGVARCHAR", false),
description("description", "description", "LONGVARCHAR", false);
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/SupplierItemExample.java
View file @ d6d0987c
......@@ -2149,18 +2149,18 @@ public class SupplierItemExample {
return (Criteria) this;
}
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
public Criteria andCreatorIdIsNull() {
addCriterion("creator_id is null");
return (Criteria) this;
}
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
public Criteria andCreatorIdIsNotNull() {
addCriterion("creator_id is not null");
return (Criteria) this;
}
public Criteria andUserIdEqualTo(Long value) {
addCriterion("user_id =", value, "userId");
public Criteria andCreatorIdEqualTo(Long value) {
addCriterion("creator_id =", value, "creatorId");
return (Criteria) this;
}
......@@ -2171,13 +2171,13 @@ public class SupplierItemExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUserIdEqualToColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("user_id = ").append(column.getEscapedColumnName()).toString());
public Criteria andCreatorIdEqualToColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("creator_id = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUserIdNotEqualTo(Long value) {
addCriterion("user_id <>", value, "userId");
public Criteria andCreatorIdNotEqualTo(Long value) {
addCriterion("creator_id <>", value, "creatorId");
return (Criteria) this;
}
......@@ -2188,13 +2188,13 @@ public class SupplierItemExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUserIdNotEqualToColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("user_id <> ").append(column.getEscapedColumnName()).toString());
public Criteria andCreatorIdNotEqualToColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("creator_id <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUserIdGreaterThan(Long value) {
addCriterion("user_id >", value, "userId");
public Criteria andCreatorIdGreaterThan(Long value) {
addCriterion("creator_id >", value, "creatorId");
return (Criteria) this;
}
......@@ -2205,13 +2205,13 @@ public class SupplierItemExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUserIdGreaterThanColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("user_id > ").append(column.getEscapedColumnName()).toString());
public Criteria andCreatorIdGreaterThanColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("creator_id > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("user_id >=", value, "userId");
public Criteria andCreatorIdGreaterThanOrEqualTo(Long value) {
addCriterion("creator_id >=", value, "creatorId");
return (Criteria) this;
}
......@@ -2222,13 +2222,13 @@ public class SupplierItemExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUserIdGreaterThanOrEqualToColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("user_id >= ").append(column.getEscapedColumnName()).toString());
public Criteria andCreatorIdGreaterThanOrEqualToColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("creator_id >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUserIdLessThan(Long value) {
addCriterion("user_id <", value, "userId");
public Criteria andCreatorIdLessThan(Long value) {
addCriterion("creator_id <", value, "creatorId");
return (Criteria) this;
}
......@@ -2239,13 +2239,13 @@ public class SupplierItemExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUserIdLessThanColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("user_id < ").append(column.getEscapedColumnName()).toString());
public Criteria andCreatorIdLessThanColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("creator_id < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUserIdLessThanOrEqualTo(Long value) {
addCriterion("user_id <=", value, "userId");
public Criteria andCreatorIdLessThanOrEqualTo(Long value) {
addCriterion("creator_id <=", value, "creatorId");
return (Criteria) this;
}
......@@ -2256,28 +2256,28 @@ public class SupplierItemExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUserIdLessThanOrEqualToColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("user_id <= ").append(column.getEscapedColumnName()).toString());
public Criteria andCreatorIdLessThanOrEqualToColumn(SupplierItem.Column column) {
addCriterion(new StringBuilder("creator_id <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUserIdIn(List<Long> values) {
addCriterion("user_id in", values, "userId");
public Criteria andCreatorIdIn(List<Long> values) {
addCriterion("creator_id in", values, "creatorId");
return (Criteria) this;
}
public Criteria andUserIdNotIn(List<Long> values) {
addCriterion("user_id not in", values, "userId");
public Criteria andCreatorIdNotIn(List<Long> values) {
addCriterion("creator_id not in", values, "creatorId");
return (Criteria) this;
}
public Criteria andUserIdBetween(Long value1, Long value2) {
addCriterion("user_id between", value1, value2, "userId");
public Criteria andCreatorIdBetween(Long value1, Long value2) {
addCriterion("creator_id between", value1, value2, "creatorId");
return (Criteria) this;
}
public Criteria andUserIdNotBetween(Long value1, Long value2) {
addCriterion("user_id not between", value1, value2, "userId");
public Criteria andCreatorIdNotBetween(Long value1, Long value2) {
addCriterion("creator_id not between", value1, value2, "creatorId");
return (Criteria) this;
}
}
......
ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/CollectionBookRequestDto.java
View file @ d6d0987c
......@@ -8,6 +8,9 @@ import java.util.Date;
@Data
public class CollectionBookRequestDto extends BaseRequestDto implements Entity {
/**
* 标签id
*/
private Long id;
/**
......@@ -20,11 +23,6 @@ public class CollectionBookRequestDto extends BaseRequestDto implements Entity
*/
private String title;
/**
* 描述
*/
private String description;
/**
* 排序
*/
......@@ -45,9 +43,5 @@ public class CollectionBookRequestDto extends BaseRequestDto implements Entity
*/
private Boolean isDeleted;
/**
* 收藏册图片，用;分隔
*/
private String images;
}
ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SupplierItemRequestDto.java
View file @ d6d0987c
......@@ -152,5 +152,9 @@ public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
*/
private String collectionBookId;
/**
* 上传人id
*/
private Long creatorId;
}
ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/CollectionItemsRelationDaoImpl.java
View file @ d6d0987c
package com.wwdz.ch.db.impl.distribution;
import com.github.pagehelper.PageHelper;
import com.wwdz.ch.db.dao.distribution.CollectionItemsRelationDao;
import com.wwdz.ch.db.domain.distribution.CollectionItemsRelation;
import com.wwdz.ch.db.domain.distribution.CollectionItemsRelationExample;
......@@ -28,6 +29,9 @@ public class CollectionItemsRelationDaoImpl implements CollectionItemsRelationDa
JdbcHelper.ifPresent(dto.getUserId(), criteria::andUserIdEqualTo);
JdbcHelper.ifPresent(dto.getCollectionBookId(), criteria::andCollectionBookIdEqualTo);
JdbcHelper.ifPresent(dto.getItemId(), criteria::andItemIdEqualTo);
criteria.andIsDeletedEqualTo(false);
example.setOrderByClause("update_time desc");
PageHelper.startPage(dto.getPage(), dto.getLimit());
return collectionItemsRelationMapper.selectByExample(example);
}
......@@ -39,6 +43,7 @@ public class CollectionItemsRelationDaoImpl implements CollectionItemsRelationDa
return collectionItemsRelationMapper.selectByExample(example);
}
@Override
public boolean isExisted(long bookId, long itemId) {
CollectionItemsRelationExample example = new CollectionItemsRelationExample();
......
ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/SupplierItemMapper.xml
View file @ d6d0987c
......@@ -17,7 +17,7 @@
<result column="buy_limit_num" jdbcType="INTEGER" property="buyLimitNum" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="rebate" jdbcType="DECIMAL" property="rebate" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="creator_id" jdbcType="BIGINT" property="creatorId" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.wwdz.ch.db.domain.distribution.SupplierItem">
<result column="images" jdbcType="LONGVARCHAR" property="images" />
......@@ -84,7 +84,7 @@
</sql>
<sql id="Base_Column_List">
id, `name`, supplier_id, is_on_sale, sort, top_image, distribution_price, supply_price,
stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, user_id
stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, creator_id
</sql>
<sql id="Blob_Column_List">
images, videos, description
......@@ -140,7 +140,7 @@
</when>
<otherwise>
id, `name`, supplier_id, is_on_sale, sort, top_image, distribution_price, supply_price,
stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, user_id,
stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, creator_id,
images, videos, description
</otherwise>
</choose>
......@@ -175,7 +175,7 @@
</when>
<otherwise>
id, `name`, supplier_id, is_on_sale, sort, top_image, distribution_price, supply_price,
stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, user_id,
stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, creator_id,
images, videos, description
</otherwise>
</choose>
......@@ -200,14 +200,14 @@
sort, top_image, distribution_price,
supply_price, stock, create_time,
update_time, is_deleted, buy_limit_num,
`type`, rebate, user_id,
`type`, rebate, creator_id,
images, videos, description
)
values (#{name,jdbcType=VARCHAR}, #{supplierId,jdbcType=BIGINT}, #{isOnSale,jdbcType=BIT},
#{sort,jdbcType=INTEGER}, #{topImage,jdbcType=VARCHAR}, #{distributionPrice,jdbcType=BIGINT},
#{supplyPrice,jdbcType=BIGINT}, #{stock,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{isDeleted,jdbcType=BIT}, #{buyLimitNum,jdbcType=INTEGER},
#{type,jdbcType=INTEGER}, #{rebate,jdbcType=DECIMAL}, #{userId,jdbcType=BIGINT},
#{type,jdbcType=INTEGER}, #{rebate,jdbcType=DECIMAL}, #{creatorId,jdbcType=BIGINT},
#{images,jdbcType=LONGVARCHAR}, #{videos,jdbcType=LONGVARCHAR}, #{description,jdbcType=LONGVARCHAR}
)
</insert>
......@@ -259,8 +259,8 @@
<if test="rebate != null">
rebate,
</if>
<if test="userId != null">
user_id,
<if test="creatorId != null">
creator_id,
</if>
<if test="images != null">
images,
......@@ -315,8 +315,8 @@
<if test="rebate != null">
#{rebate,jdbcType=DECIMAL},
</if>
<if test="userId != null">
#{userId,jdbcType=BIGINT},
<if test="creatorId != null">
#{creatorId,jdbcType=BIGINT},
</if>
<if test="images != null">
#{images,jdbcType=LONGVARCHAR},
......@@ -383,8 +383,8 @@
<if test="record.rebate != null">
rebate = #{record.rebate,jdbcType=DECIMAL},
</if>
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=BIGINT},
<if test="record.creatorId != null">
creator_id = #{record.creatorId,jdbcType=BIGINT},
</if>
<if test="record.images != null">
images = #{record.images,jdbcType=LONGVARCHAR},
......@@ -417,7 +417,7 @@
buy_limit_num = #{record.buyLimitNum,jdbcType=INTEGER},
`type` = #{record.type,jdbcType=INTEGER},
rebate = #{record.rebate,jdbcType=DECIMAL},
user_id = #{record.userId,jdbcType=BIGINT},
creator_id = #{record.creatorId,jdbcType=BIGINT},
images = #{record.images,jdbcType=LONGVARCHAR},
videos = #{record.videos,jdbcType=LONGVARCHAR},
description = #{record.description,jdbcType=LONGVARCHAR}
......@@ -442,7 +442,7 @@
buy_limit_num = #{record.buyLimitNum,jdbcType=INTEGER},
`type` = #{record.type,jdbcType=INTEGER},
rebate = #{record.rebate,jdbcType=DECIMAL},
user_id = #{record.userId,jdbcType=BIGINT}
creator_id = #{record.creatorId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -492,8 +492,8 @@
<if test="rebate != null">
rebate = #{rebate,jdbcType=DECIMAL},
</if>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
<if test="creatorId != null">
creator_id = #{creatorId,jdbcType=BIGINT},
</if>
<if test="images != null">
images = #{images,jdbcType=LONGVARCHAR},
......@@ -523,7 +523,7 @@
buy_limit_num = #{buyLimitNum,jdbcType=INTEGER},
`type` = #{type,jdbcType=INTEGER},
rebate = #{rebate,jdbcType=DECIMAL},
user_id = #{userId,jdbcType=BIGINT},
creator_id = #{creatorId,jdbcType=BIGINT},
images = #{images,jdbcType=LONGVARCHAR},
videos = #{videos,jdbcType=LONGVARCHAR},
description = #{description,jdbcType=LONGVARCHAR}
......@@ -545,7 +545,7 @@
buy_limit_num = #{buyLimitNum,jdbcType=INTEGER},
`type` = #{type,jdbcType=INTEGER},
rebate = #{rebate,jdbcType=DECIMAL},
user_id = #{userId,jdbcType=BIGINT}
creator_id = #{creatorId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.distribution.SupplierItemExample" resultMap="BaseResultMap">
......@@ -602,7 +602,7 @@
</when>
<otherwise>
id, `name`, supplier_id, is_on_sale, sort, top_image, distribution_price, supply_price,
stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, user_id,
stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, creator_id,
images, videos, description
</otherwise>
</choose>
......
ch-dao/src/main/resources/generatorConfig_new.xml
View file @ d6d0987c
......@@ -72,7 +72,7 @@
<javaClientGenerator type="XMLMAPPER" targetPackage="com.wwdz.ch.db.mapper.distribution"
targetProject="ch-dao/src/main/java"/>
<table tableName="collection_items_relation" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
<table tableName="supplier_item" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
<generatedKey column="id" sqlStatement="Mysql" identity="true" />
</table>
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java
View file @ d6d0987c
......@@ -45,7 +45,10 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
"/wx/returnOrder/**", "/wx/distributionOrder/confirmSigned", "/wx/distributionOrder/delivery", "/wx/distributionOrder/cancel",
"/wx/distributionOrder/refund",
"/wx/supplierItem/findItemsOfCurrentDistributor"
, "/wx/supplierItem/**", "/wx/shareRecord/**", "/wx/distributionOrder/**", "/wx/selfPage/**", "/wx/auctionRecord/**", "/wx/shareRecord"
//下列路径上线注释
, "/wx/supplierItem/**", "/wx/shareRecord/**", "/wx/distributionOrder/**", "/wx/selfPage/**", "/wx/auctionRecord/**",
"/wx/shareRecord/**","/wx/collectionBook/**"
/* "/wx/officialAccount/**",
"/wx/item/**",
"/wx/aiAssistant/**",
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/CollectionBookVo.java
View file @ d6d0987c
package com.wwdz.ch.wx.entity.vo.distribution;
import com.github.pagehelper.PageInfo;
import com.wwdz.ch.core.entity.SupplierItemVo;
import com.wwdz.ch.core.type.PageSearchResult;
import com.xxdxxs.entity.Entity;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class CollectionBookVo implements Entity {
/**
* 标签
*/
private List<Map<String, Object>> bookList;
/**
* 上传的所有藏品
*/
private PageSearchResult pageSearchResult;
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionBookServiceImpl.java
View file @ d6d0987c
......@@ -3,8 +3,10 @@ package com.wwdz.ch.wx.impl.distribution;
import com.github.pagehelper.PageInfo;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.db.dao.distribution.CollectionBookDao;
import com.wwdz.ch.db.dao.distribution.CollectionItemsRelationDao;
import com.wwdz.ch.db.domain.distribution.CollectionBook;
import com.wwdz.ch.db.dto.request.distribution.CollectionBookRequestDto;
import com.wwdz.ch.db.dto.request.distribution.CollectionItemsRelationRequestDto;
import com.wwdz.ch.wx.service.distribution.CollectionBookService;
import com.xxdxxs.utils.EntityMapper;
import org.slf4j.Logger;
......@@ -22,11 +24,15 @@ public class CollectionBookServiceImpl implements CollectionBookService {
@Autowired
CollectionBookDao collectionBookDao;
@Autowired
CollectionItemsRelationDao collectionItemsRelationDao;
@Override
public Result create(CollectionBookRequestDto dto) {
try {
CollectionBook collectionBook = new CollectionBook();
EntityMapper.copyAttribute(dto, collectionBook);
collectionBook.setSort(1);
collectionBook.setCreateTime(new Date());
collectionBook.setUpdateTime(new Date());
collectionBook.setIsDeleted(false);
......@@ -42,12 +48,14 @@ public class CollectionBookServiceImpl implements CollectionBookService {
public Result findList(CollectionBookRequestDto dto) {
try {
List<CollectionBook> collectionBookList = collectionBookDao.findByUserId(dto.getUserId());
Map<String, Object> map = new LinkedHashMap<>();
List<Map<String, Object>> list = new ArrayList<>();
collectionBookList.forEach(collectionBook -> {
Map<String, Object> map = new HashMap<>();
map.put("id", collectionBook.getId());
map.put("title", collectionBook.getTitle());
list.add(map);
});
return Result.success(map);
return Result.success(list);
} catch (Exception e) {
logger.error("查询收藏册 error: {}", e);
}
......@@ -59,6 +67,10 @@ public class CollectionBookServiceImpl implements CollectionBookService {
public Result delete(CollectionBookRequestDto dto) {
try {
collectionBookDao.delete(dto.getId());
//删除标签关联的记录
CollectionItemsRelationRequestDto collectionItemsRelationRequestDto = new CollectionItemsRelationRequestDto();
collectionItemsRelationRequestDto.setCollectionBookId(dto.getId());
collectionItemsRelationDao.delete(collectionItemsRelationRequestDto);
return Result.success();
} catch (Exception e) {
logger.error("删除收藏册 error: {}", e);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionItemsRelationServiceImpl.java
View file @ d6d0987c
package com.wwdz.ch.wx.impl.distribution;
import com.github.pagehelper.PageInfo;
import com.wwdz.ch.core.consts.DistributionEnum;
import com.wwdz.ch.core.entity.SupplierItemVo;
import com.wwdz.ch.core.type.PageSearchResult;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.util.MediaUtil;
import com.wwdz.ch.core.util.PriceUtil;
import com.wwdz.ch.db.dao.distribution.CollectionItemsRelationDao;
import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
import com.wwdz.ch.db.domain.distribution.CollectionBook;
import com.wwdz.ch.db.domain.distribution.CollectionItemsRelation;
import com.wwdz.ch.db.domain.distribution.SupplierItem;
import com.wwdz.ch.db.dto.request.distribution.CollectionBookRequestDto;
import com.wwdz.ch.db.dto.request.distribution.CollectionItemsRelationRequestDto;
import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
import com.wwdz.ch.wx.entity.vo.distribution.CollectionBookVo;
import com.wwdz.ch.wx.service.distribution.CollectionBookService;
import com.wwdz.ch.wx.service.distribution.CollectionItemsRelationService;
import com.xxdxxs.utils.EntityMapper;
import com.xxdxxs.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
......@@ -23,6 +40,12 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
@Autowired
CollectionItemsRelationDao collectionItemsRelationDao;
@Autowired
CollectionBookService collectionBookService;
@Autowired
SupplierItemDao supplierItemDao;
@Override
public Result create(CollectionItemsRelationRequestDto dto) {
try {
......@@ -41,10 +64,82 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
}
});
}catch (Exception e) {
logger.error("查询收藏册 error: {}", e);
logger.error("查询收藏册 error: {}", e);
}
return Result.failed();
}
@Override
public Result findInfos(CollectionItemsRelationRequestDto dto) {
try {
CollectionBookVo collectionBookVo = new CollectionBookVo();
//查询所有的标签
CollectionBookRequestDto collectionBookRequestDto = new CollectionBookRequestDto();
collectionBookRequestDto.setUserId(dto.getUserId());
Result bookResult = collectionBookService.findList(collectionBookRequestDto);
if (bookResult.getSuccess()) {
collectionBookVo.setBookList((List<Map<String, Object>>) bookResult.getData());
}
//查询所有的上传藏品
SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
supplierItemRequestDto.setCreatorId(dto.getUserId());
supplierItemRequestDto.setIsDeleted(false);
List<SupplierItem> supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
List<SupplierItemVo> list = new ArrayList<>();
PageInfo<SupplierItem> pageInfo = new PageInfo<>(supplierItemList);
supplierItemList.forEach(supplierItem -> {
SupplierItemVo supplierItemVo = new SupplierItemVo();
EntityMapper.copyAttribute(supplierItem, supplierItemVo);
supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
list.add(supplierItemVo);
});
collectionBookVo.setPageSearchResult(PageSearchResult.of(pageInfo, list));
return Result.success(collectionBookVo);
}catch (Exception e) {
logger.error("查询个人藏馆信息失败 error: {}", e);
}
return Result.failed();
}
@Override
public Result findList(CollectionItemsRelationRequestDto dto) {
try {
CollectionBookVo collectionBookVo = new CollectionBookVo();
SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
List<SupplierItem> supplierItemList = new ArrayList<>();
PageInfo pageInfo = null;
//标签id为空则查询所有的藏品
if (dto.getCollectionBookId() == null) {
//查询所有的上传藏品
supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
supplierItemRequestDto.setCreatorId(dto.getUserId());
supplierItemRequestDto.setIsDeleted(false);
supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
pageInfo = new PageInfo<>(supplierItemList);
} else {
//查询对应标签下的商品
List<CollectionItemsRelation> collectionItemsRelationList = collectionItemsRelationDao.find(dto);
pageInfo = new PageInfo<>(collectionItemsRelationList);
List<Long> itemIds = collectionItemsRelationList.stream().map(CollectionItemsRelation::getItemId).collect(Collectors.toList());
supplierItemRequestDto.setIds(itemIds);
supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
}
List<SupplierItemVo> list = new ArrayList<>();
supplierItemList.forEach(supplierItem -> {
SupplierItemVo supplierItemVo = new SupplierItemVo();
EntityMapper.copyAttribute(supplierItem, supplierItemVo);
supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
list.add(supplierItemVo);
});
collectionBookVo.setPageSearchResult(PageSearchResult.of(pageInfo, list));
return Result.success(collectionBookVo);
}catch (Exception e) {
logger.error("查询标签下的藏品失败 error: {}", e);
}
return Result.failed();
}
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java
View file @ d6d0987c
......@@ -473,7 +473,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
EntityMapper.copyAttribute(dto, supplierItem);
supplierItem.setDistributionPrice(PriceUtil.convertPriceFromStr(StringUtils.isEmpty(dto.getDistributionPrice())?"0":dto.getDistributionPrice()));
supplierItem.setSupplyPrice(0L);
supplierItem.setRebate(new BigDecimal(dto.getRebate()));
supplierItem.setRebate(new BigDecimal("0"));
supplierItem.setImages(dto.getImages());
supplierItem.setVideos(dto.getVideos());
supplierItem.setSort(1);
......@@ -484,7 +484,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
supplierItem.setUpdateTime(now);
supplierItem.setIsOnSale(true);
supplierItem.setIsDeleted(false);
supplierItem.setUserId(dto.getUserId());
supplierItem.setCreatorId(dto.getUserId());
supplierItem.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
long itemId = supplierItemDao.insert(supplierItem);
//商品对应收藏册关联
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/CollectionItemsRelationService.java
View file @ d6d0987c
......@@ -12,4 +12,20 @@ public interface CollectionItemsRelationService {
* @return
*/
Result create(CollectionItemsRelationRequestDto dto);
/**
* 查询个人藏馆页面信息
* @param dto
* @return
*/
Result findInfos(CollectionItemsRelationRequestDto dto);
/**
* 查询对应标签下的藏品
* @param dto
* @return
*/
Result findList(CollectionItemsRelationRequestDto dto);
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/CollectionBookController.java
View file @ d6d0987c
......@@ -3,7 +3,6 @@ package com.wwdz.ch.wx.web.distribution;
import com.alibaba.fastjson.JSON;
import com.wwdz.ch.core.consts.ResultCode;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.db.dto.request.distribution.AuctionRecordRequestDto;
import com.wwdz.ch.db.dto.request.distribution.CollectionBookRequestDto;
import com.wwdz.ch.wx.service.distribution.CollectionBookService;
import io.swagger.annotations.ApiOperation;
......@@ -50,7 +49,7 @@ public class CollectionBookController {
@PostMapping("/delete")
public Result delete(@RequestBody CollectionBookRequestDto dto) {
logger.info("删除藏品标签,请求参数:{}", JSON.toJSONString(dto));
if (dto.getUserId() == null) {
if (dto.getId() == null) {
return Result.failed(ResultCode.PARAM_ERROR);
}
return collectionBookService.delete(dto);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/CollectionItemsRelationController.java 0 → 100644
View file @ d6d0987c
package com.wwdz.ch.wx.web.distribution;
import com.alibaba.fastjson.JSON;
import com.wwdz.ch.core.consts.ResultCode;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.db.dto.request.distribution.CollectionBookRequestDto;
import com.wwdz.ch.db.dto.request.distribution.CollectionItemsRelationRequestDto;
import com.wwdz.ch.wx.service.distribution.CollectionBookService;
import com.wwdz.ch.wx.service.distribution.CollectionItemsRelationService;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/wx/collectionItemsRelation")
public class CollectionItemsRelationController {
private static final Logger logger = LoggerFactory.getLogger(CollectionItemsRelationController.class);
@Autowired
CollectionItemsRelationService collectionItemsRelationService;
@ApiOperation(value = "查询个人藏馆页面信息")
@PostMapping("/findInfos")
public Result findInfos(@RequestBody CollectionItemsRelationRequestDto dto) {
logger.info("查询标签下的藏品,请求参数:{}", JSON.toJSONString(dto));
if (dto.getUserId() == null) {
return Result.failed(ResultCode.PARAM_ERROR);
}
return collectionItemsRelationService.findInfos(dto);
}
@ApiOperation(value = "查询标签下的藏品")
@PostMapping("/findList")
public Result findList(@RequestBody CollectionItemsRelationRequestDto dto) {
logger.info("查询标签下的藏品,请求参数:{}", JSON.toJSONString(dto));
if (dto.getUserId() == null) {
return Result.failed(ResultCode.PARAM_ERROR);
}
return collectionItemsRelationService.findList(dto);
}
}
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