拍品编辑修改

auc/src/main/java/cn/hobbystocks/auc/web/BidController.java

@@ -27,7 +27,7 @@ public class BidController extends AdminBaseController {
      * 查询出价列表
      * foreach
      */
-    @ApiOperation(value = "list", notes = "查询出价列表", response = Bid.class, responseContainer = "List<Bid>")
+    @ApiOperation(value = "查询拍品出价列表", notes = "查询出价列表", response = Bid.class, responseContainer = "List<Bid>")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody BidVO bidVO) {
         bidVO.setDelFlag(Constants.DEL_FLAG_NO_DELETE);

auc/src/main/java/cn/hobbystocks/auc/web/LotNoticeController.java

@@ -0,0 +1,11 @@
+package cn.hobbystocks.auc.web;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/lot/notice/")
+public class LotNoticeController extends AdminBaseController{
+
+
+}

lot/src/main/java/cn/hobbystocks/auc/domain/Auction.java

@@ -84,7 +84,7 @@ public class Auction extends BaseEntity {
     @TableField("merchant_id")
     private Long merchantId;
     @ApiModelProperty("拍品数量")
-    @TableField("lot_num")
+    @TableField(exist = false)
     private Long lotNum;
     //排序
     @ApiModelProperty("排序，值越大排名越靠前")

lot/src/main/java/cn/hobbystocks/auc/domain/LotNotice.java

@@ -0,0 +1,24 @@
+package cn.hobbystocks.auc.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 拍卖公告
+ */
+@Data
+@TableName("lot_notice")
+public class LotNotice {
+
+    @TableId
+    private Long id;
+    private String title;
+    private String content;
+    private String type;
+    private Integer status;
+    private Date createTime;
+    private Date pubTime;
+}

lot/src/main/java/cn/hobbystocks/auc/mapper/LotNoticeMapper.java

@@ -0,0 +1,7 @@
+package cn.hobbystocks.auc.mapper;
+
+import cn.hobbystocks.auc.domain.LotNotice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface LotNoticeMapper extends BaseMapper<LotNotice> {
+}

lot/src/main/java/cn/hobbystocks/auc/service/LotNoticeService.java

@@ -0,0 +1,18 @@
+package cn.hobbystocks.auc.service;
+
+import cn.hobbystocks.auc.domain.LotNotice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface LotNoticeService extends IService<LotNotice> {
+
+
+    /**
+     * 查询拍卖公告列表
+     * @param lotNotice
+     * @return
+     */
+    List<LotNotice> selectLotNoticeList(LotNotice lotNotice);
+
+}

lot/src/main/java/cn/hobbystocks/auc/service/impl/LotNoticeServiceImpl.java

@@ -0,0 +1,17 @@
+package cn.hobbystocks.auc.service.impl;
+
+import cn.hobbystocks.auc.domain.LotNotice;
+import cn.hobbystocks.auc.mapper.LotNoticeMapper;
+import cn.hobbystocks.auc.service.LotNoticeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class LotNoticeServiceImpl extends ServiceImpl<LotNoticeMapper, LotNotice> implements LotNoticeService {
+    @Override
+    public List<LotNotice> selectLotNoticeList(LotNotice lotNotice) {
+        return null;
+    }
+}

lot/src/main/resources/mapper/LotMapper.xml

@@ -142,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupId != null ">group_id,</if>
             <if test="deposit !=null ">deposit,</if>
             <if test="serviceTariff !=null ">service_tariff,</if>
+            <if test="payLimitTime=null">pay_limit_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -187,6 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupId != null ">#{groupId},</if>
             <if test="deposit !=null ">#{deposit},</if>
             <if test="serviceTariff !=null ">#{serviceTariff},</if>
+            <if test="payLimitTime=null">#{payLimitTime},</if>
          </trim>
     </insert>
 
@@ -221,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupId != null ">group_id,</if>
             <if test="deposit !=null ">deposit,</if>
             <if test="serviceTariff !=null ">service_tariff,</if>
+            <if test="payLimitTime=null">pay_limit_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="goodsId != null">#{goodsId},</if>
@@ -251,6 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupId != null ">#{groupId},</if>
             <if test="deposit !=null ">#{deposit},</if>
             <if test="serviceTariff !=null ">#{serviceTariff},</if>
+            <if test="payLimitTime=null">#{payLimitTime},</if>
         </trim>
     </insert>
 
@@ -281,7 +285,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dealAccountId != null">deal_account_id = #{dealAccountId},</if>
             <if test="dealAccount != null">deal_account = #{dealAccount},</if>
             <if test="paid != null">paid = #{paid},</if>
-
             <if test="bidCount != null">bid_count = #{bidCount},</if>
             <if test="bidPersionCount != null">bid_persion_count = #{bidPersionCount},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -301,6 +304,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupId != null ">group_id = #{groupId},</if>
             <if test="deposit !=null ">deposit=#{deposit},</if>
             <if test="serviceTariff !=null ">service_tariff=#{serviceTariff},</if>
+            <if test="payLimitTime=null">pay_limit_time=#{payLimitTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -347,7 +351,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="privateDomain != null">private_domain = #{privateDomain},</if>
             <if test="1==1">delay_publish = #{delayPublish},</if>
             <if test="groupId != null ">group_id = #{groupId},</if>
-
+            <if test="deposit !=null ">deposit=#{deposit},</if>
+            <if test="serviceTariff !=null ">service_tariff=#{serviceTariff},</if>
+            <if test="payLimitTime=null">pay_limit_time=#{payLimitTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -425,7 +431,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="privateDomain != null">private_domain = #{privateDomain},</if>
             <if test="1 == 1">delay_publish = #{delayPublish},</if>
             <if test="groupId != null ">group_id = #{groupId},</if>
-
+            <if test="deposit !=null ">deposit=#{deposit},</if>
+            <if test="serviceTariff !=null ">service_tariff=#{serviceTariff},</if>
+            <if test="payLimitTime=null">pay_limit_time=#{payLimitTime},</if>
         </trim>
         where id = #{id}
     </update>