Skip to content

GitLab

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

拍品新增预估价

parent 1912f87f
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 13 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSpecialPerformanceServiceImpl.java
View file @ 29e1eeb5
......@@ -139,6 +139,7 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
supplierItemVo.setAuctionState(auctionConfig.getState());
supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.getNameByCode(auctionConfig.getState()));
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
}
supplierItemVos.add(supplierItemVo);
}
......
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java
View file @ 29e1eeb5
......@@ -135,6 +135,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
auctionConfig.setRealEndTime(DateUtils.parseString(dto.getAuctionEndTime()));
auctionConfig.setStartPrice(PriceUtil.convertPriceFromStr(dto.getStartPrice()));
auctionConfig.setAddExtent(PriceUtil.convertPriceFromStr(dto.getAddExtent()));
auctionConfig.setEstimatedPrice(PriceUtil.convertPriceFromStr(dto.getEstimatedPrice()));
auctionConfig.setCreateTime(now);
auctionConfig.setUpdateTime(now);
auctionConfig.setState(AuctionEnum.StateEnum.WAIT_ON_SALE.getCode());
......@@ -237,6 +238,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
supplierItemVo.setAuctionState(auctionConfig.getState());
supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.getNameByCode(auctionConfig.getState()));
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
}
DistributionOrder distributionOrder = distributionOrderDao.findByItemId(supplierItem.getId());
if (distributionOrder != null) {
......@@ -289,6 +291,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
supplierItemVo.setStartPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
supplierItemVo.setAuctionState(auctionConfig.getState());
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.getNameByCode(auctionConfig.getState()));
}
DistributionOrder distributionOrder = distributionOrderDao.findByItemId(supplierItem.getId());
......@@ -334,6 +337,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
supplierItemVo.setAuctionEndTime(auctionConfig.getEndTime());
supplierItemVo.setStartPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
}
return Result.success(supplierItemVo);
} catch (Exception e) {
......@@ -363,6 +367,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
auctionConfig.setRealEndTime(StringUtils.isEmpty(dto.getAuctionEndTime()) ? new Date(): DateUtils.parseString(dto.getAuctionEndTime()));
auctionConfig.setStartPrice(StringUtils.isEmpty(dto.getStartPrice()) ? 0 : PriceUtil.convertPriceFromStr(dto.getStartPrice()));
auctionConfig.setAddExtent(StringUtils.isEmpty(dto.getAddExtent()) ? 5000 : PriceUtil.convertPriceFromStr(dto.getAddExtent()));
auctionConfig.setEstimatedPrice(StringUtils.isEmpty(dto.getEstimatedPrice()) ? 999999999 : PriceUtil.convertPriceFromStr(dto.getEstimatedPrice()));
//修改的截拍时间在当前时间之后，则重新上架，设置拍卖信息为有效
if (DateUtils.parseString(dto.getAuctionEndTime()).after(new Date())) {
auctionConfig.setIsValid(true);
......@@ -512,6 +517,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
auctionConfig.setRealEndTime(StringUtils.isEmpty(dto.getAuctionEndTime()) ? new Date(): DateUtils.parseString(dto.getAuctionEndTime()));
auctionConfig.setStartPrice(StringUtils.isEmpty(dto.getStartPrice()) ? 0 : PriceUtil.convertPriceFromStr(dto.getStartPrice()));
auctionConfig.setAddExtent(StringUtils.isEmpty(dto.getAddExtent()) ? 50 : PriceUtil.convertPriceFromStr(dto.getAddExtent()));
auctionConfig.setEstimatedPrice(StringUtils.isEmpty(dto.getEstimatedPrice()) ? 999999999 : PriceUtil.convertPriceFromStr(dto.getEstimatedPrice()));
auctionConfig.setCreateTime(now);
auctionConfig.setUpdateTime(now);
auctionConfigDao.insert(auctionConfig);
......
ch-core/src/main/java/com/wwdz/ch/core/entity/SupplierItemVo.java
View file @ 29e1eeb5
......@@ -169,6 +169,11 @@ public class SupplierItemVo implements Entity {
*/
private String addExtent;
/**
* 预估价
*/
private String estimatedPrice;
/**
* 竞拍商品的状态
*/
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/AuctionConfig.java
View file @ 29e1eeb5
......@@ -10,7 +10,7 @@ import lombok.Data;
/**
* @author shiyu
* @date 2024/06/20
* @date 2024/06/21
*/
@Data
public class AuctionConfig implements Entity {
......@@ -46,6 +46,11 @@ public class AuctionConfig implements Entity {
*/
private Long addExtent;
/**
* 预估价
*/
private Long estimatedPrice;
/**
* 实际竞拍结束时间
*/
......@@ -91,6 +96,7 @@ public class AuctionConfig implements Entity {
sb.append(", endTime=").append(endTime);
sb.append(", startPrice=").append(startPrice);
sb.append(", addExtent=").append(addExtent);
sb.append(", estimatedPrice=").append(estimatedPrice);
sb.append(", realEndTime=").append(realEndTime);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
......@@ -121,6 +127,7 @@ public class AuctionConfig implements Entity {
&& (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
&& (this.getStartPrice() == null ? other.getStartPrice() == null : this.getStartPrice().equals(other.getStartPrice()))
&& (this.getAddExtent() == null ? other.getAddExtent() == null : this.getAddExtent().equals(other.getAddExtent()))
&& (this.getEstimatedPrice() == null ? other.getEstimatedPrice() == null : this.getEstimatedPrice().equals(other.getEstimatedPrice()))
&& (this.getRealEndTime() == null ? other.getRealEndTime() == null : this.getRealEndTime().equals(other.getRealEndTime()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
......@@ -140,6 +147,7 @@ public class AuctionConfig implements Entity {
result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
result = prime * result + ((getStartPrice() == null) ? 0 : getStartPrice().hashCode());
result = prime * result + ((getAddExtent() == null) ? 0 : getAddExtent().hashCode());
result = prime * result + ((getEstimatedPrice() == null) ? 0 : getEstimatedPrice().hashCode());
result = prime * result + ((getRealEndTime() == null) ? 0 : getRealEndTime().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
......@@ -164,6 +172,7 @@ public class AuctionConfig implements Entity {
endTime("end_time", "endTime", "TIMESTAMP", false),
startPrice("start_price", "startPrice", "BIGINT", false),
addExtent("add_extent", "addExtent", "BIGINT", false),
estimatedPrice("estimated_price", "estimatedPrice", "BIGINT", false),
realEndTime("real_end_time", "realEndTime", "TIMESTAMP", false),
createTime("create_time", "createTime", "TIMESTAMP", false),
updateTime("update_time", "updateTime", "TIMESTAMP", false),
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/AuctionConfigExample.java
View file @ 29e1eeb5
......@@ -1072,6 +1072,138 @@ public class AuctionConfigExample {
return (Criteria) this;
}
public Criteria andEstimatedPriceIsNull() {
addCriterion("estimated_price is null");
return (Criteria) this;
}
public Criteria andEstimatedPriceIsNotNull() {
addCriterion("estimated_price is not null");
return (Criteria) this;
}
public Criteria andEstimatedPriceEqualTo(Long value) {
addCriterion("estimated_price =", value, "estimatedPrice");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table auction_config
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andEstimatedPriceEqualToColumn(AuctionConfig.Column column) {
addCriterion(new StringBuilder("estimated_price = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andEstimatedPriceNotEqualTo(Long value) {
addCriterion("estimated_price <>", value, "estimatedPrice");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table auction_config
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andEstimatedPriceNotEqualToColumn(AuctionConfig.Column column) {
addCriterion(new StringBuilder("estimated_price <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andEstimatedPriceGreaterThan(Long value) {
addCriterion("estimated_price >", value, "estimatedPrice");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table auction_config
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andEstimatedPriceGreaterThanColumn(AuctionConfig.Column column) {
addCriterion(new StringBuilder("estimated_price > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andEstimatedPriceGreaterThanOrEqualTo(Long value) {
addCriterion("estimated_price >=", value, "estimatedPrice");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table auction_config
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andEstimatedPriceGreaterThanOrEqualToColumn(AuctionConfig.Column column) {
addCriterion(new StringBuilder("estimated_price >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andEstimatedPriceLessThan(Long value) {
addCriterion("estimated_price <", value, "estimatedPrice");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table auction_config
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andEstimatedPriceLessThanColumn(AuctionConfig.Column column) {
addCriterion(new StringBuilder("estimated_price < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andEstimatedPriceLessThanOrEqualTo(Long value) {
addCriterion("estimated_price <=", value, "estimatedPrice");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table auction_config
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andEstimatedPriceLessThanOrEqualToColumn(AuctionConfig.Column column) {
addCriterion(new StringBuilder("estimated_price <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andEstimatedPriceIn(List<Long> values) {
addCriterion("estimated_price in", values, "estimatedPrice");
return (Criteria) this;
}
public Criteria andEstimatedPriceNotIn(List<Long> values) {
addCriterion("estimated_price not in", values, "estimatedPrice");
return (Criteria) this;
}
public Criteria andEstimatedPriceBetween(Long value1, Long value2) {
addCriterion("estimated_price between", value1, value2, "estimatedPrice");
return (Criteria) this;
}
public Criteria andEstimatedPriceNotBetween(Long value1, Long value2) {
addCriterion("estimated_price not between", value1, value2, "estimatedPrice");
return (Criteria) this;
}
public Criteria andRealEndTimeIsNull() {
addCriterion("real_end_time is null");
return (Criteria) this;
......
ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/AuctionConfigRequestDto.java
View file @ 29e1eeb5
......@@ -44,6 +44,11 @@ public class AuctionConfigRequestDto extends BaseRequestDto implements Entity {
*/
private Long addExtent;
/**
* 预估价
*/
private Long estimatedPrice;
/**
* 实际竞拍结束时间
*/
......
ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SupplierItemRequestDto.java
View file @ 29e1eeb5
......@@ -170,6 +170,12 @@ public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
*/
private Date realEndTime;
/**
* 预估价
*/
private String estimatedPrice;
/**
* 收藏标签id
* 分号分割，可以是多个
......
ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/AuctionConfigMapper.xml
View file @ 29e1eeb5
......@@ -9,6 +9,7 @@
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="start_price" jdbcType="BIGINT" property="startPrice" />
<result column="add_extent" jdbcType="BIGINT" property="addExtent" />
<result column="estimated_price" jdbcType="BIGINT" property="estimatedPrice" />
<result column="real_end_time" jdbcType="TIMESTAMP" property="realEndTime" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
......@@ -75,8 +76,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, item_id, creator_id, start_time, end_time, start_price, add_extent, real_end_time,
create_time, update_time, is_valid, is_deal, `state`
id, item_id, creator_id, start_time, end_time, start_price, add_extent, estimated_price,
real_end_time, create_time, update_time, is_valid, is_deal, `state`
</sql>
<select id="selectByExample" parameterType="com.wwdz.ch.db.domain.distribution.AuctionConfigExample" resultMap="BaseResultMap">
select
......@@ -111,8 +112,8 @@
</foreach>
</when>
<otherwise>
id, item_id, creator_id, start_time, end_time, start_price, add_extent, real_end_time,
create_time, update_time, is_valid, is_deal, `state`
id, item_id, creator_id, start_time, end_time, start_price, add_extent, estimated_price,
real_end_time, create_time, update_time, is_valid, is_deal, `state`
</otherwise>
</choose>
from auction_config
......@@ -143,8 +144,8 @@
</foreach>
</when>
<otherwise>
id, item_id, creator_id, start_time, end_time, start_price, add_extent, real_end_time,
create_time, update_time, is_valid, is_deal, `state`
id, item_id, creator_id, start_time, end_time, start_price, add_extent, estimated_price,
real_end_time, create_time, update_time, is_valid, is_deal, `state`
</otherwise>
</choose>
from auction_config
......@@ -166,12 +167,14 @@
</selectKey>
insert into auction_config (item_id, creator_id, start_time,
end_time, start_price, add_extent,
real_end_time, create_time, update_time,
is_valid, is_deal, `state`)
estimated_price, real_end_time, create_time,
update_time, is_valid, is_deal,
`state`)
values (#{itemId,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP},
#{endTime,jdbcType=TIMESTAMP}, #{startPrice,jdbcType=BIGINT}, #{addExtent,jdbcType=BIGINT},
#{realEndTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{isValid,jdbcType=BIT}, #{isDeal,jdbcType=BIT}, #{state,jdbcType=INTEGER})
#{estimatedPrice,jdbcType=BIGINT}, #{realEndTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{isValid,jdbcType=BIT}, #{isDeal,jdbcType=BIT},
#{state,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.distribution.AuctionConfig">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
......@@ -197,6 +200,9 @@
<if test="addExtent != null">
add_extent,
</if>
<if test="estimatedPrice != null">
estimated_price,
</if>
<if test="realEndTime != null">
real_end_time,
</if>
......@@ -235,6 +241,9 @@
<if test="addExtent != null">
#{addExtent,jdbcType=BIGINT},
</if>
<if test="estimatedPrice != null">
#{estimatedPrice,jdbcType=BIGINT},
</if>
<if test="realEndTime != null">
#{realEndTime,jdbcType=TIMESTAMP},
</if>
......@@ -285,6 +294,9 @@
<if test="record.addExtent != null">
add_extent = #{record.addExtent,jdbcType=BIGINT},
</if>
<if test="record.estimatedPrice != null">
estimated_price = #{record.estimatedPrice,jdbcType=BIGINT},
</if>
<if test="record.realEndTime != null">
real_end_time = #{record.realEndTime,jdbcType=TIMESTAMP},
</if>
......@@ -317,6 +329,7 @@
end_time = #{record.endTime,jdbcType=TIMESTAMP},
start_price = #{record.startPrice,jdbcType=BIGINT},
add_extent = #{record.addExtent,jdbcType=BIGINT},
estimated_price = #{record.estimatedPrice,jdbcType=BIGINT},
real_end_time = #{record.realEndTime,jdbcType=TIMESTAMP},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
......@@ -348,6 +361,9 @@
<if test="addExtent != null">
add_extent = #{addExtent,jdbcType=BIGINT},
</if>
<if test="estimatedPrice != null">
estimated_price = #{estimatedPrice,jdbcType=BIGINT},
</if>
<if test="realEndTime != null">
real_end_time = #{realEndTime,jdbcType=TIMESTAMP},
</if>
......@@ -377,6 +393,7 @@
end_time = #{endTime,jdbcType=TIMESTAMP},
start_price = #{startPrice,jdbcType=BIGINT},
add_extent = #{addExtent,jdbcType=BIGINT},
estimated_price = #{estimatedPrice,jdbcType=BIGINT},
real_end_time = #{realEndTime,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
......@@ -418,8 +435,8 @@
</foreach>
</when>
<otherwise>
id, item_id, creator_id, start_time, end_time, start_price, add_extent, real_end_time,
create_time, update_time, is_valid, is_deal, `state`
id, item_id, creator_id, start_time, end_time, start_price, add_extent, estimated_price,
real_end_time, create_time, update_time, is_valid, is_deal, `state`
</otherwise>
</choose>
from auction_config
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/AuctionDetailVo.java
View file @ 29e1eeb5
......@@ -38,6 +38,11 @@ public class AuctionDetailVo implements Entity {
*/
private String startPrice;
/**
* 预估价
*/
private String estimatedPrice;
/**
* 商品图片,分号分隔
*/
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java
View file @ 29e1eeb5
......@@ -593,6 +593,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
String addExtent = PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent());
auctionDetailVo.setAddExtent(addExtent);
auctionDetailVo.setAddExtentStr("¥" + addExtent + "/次");
auctionDetailVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
Date startTime = auctionConfig.getStartTime();
Date realEndTime = auctionConfig.getRealEndTime();
auctionDetailVo.setStartTime(startTime);
......
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