Merge remote-tracking branch 'origin/dev' into feature/20260228-export

# Conflicts:
#	lot/src/main/java/cn/hobbystocks/auc/service/impl/AuctionServiceImpl.java

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

@@ -99,7 +99,7 @@ public class LotController extends AdminBaseController {
         if (lot.getStartTime().before(dbAuction.getStartTime())){
             return AjaxResult.error("拍品开始时间不能小于拍卖会开始时间");
         }
-        if (dbAuction.getEndTime().after(lot.getEndTime()))
+        if (dbAuction.getEndTime().before(lot.getEndTime()))
             return AjaxResult.error("拍品结束时间不能大于拍卖会结束时间");
 		lot.setMerchantId(userInfo.getMerchantId());
 		lot.setMerchantName(userInfo.getMerchantName());

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

@@ -191,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectAucBannerList" resultType="cn.hobbystocks.auc.domain.Auction">
-        select id,name,banner,imgs,description,start_time startTime,status from auction
+        select id,name,banner,imgs,description,start_time startTime,end_time endTime,status from auction
         where pub_status=1 order by sort desc
     </select>
 </mapper>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.hobbystocks.auc.mapper.LotMapper">
 
     <resultMap type="cn.hobbystocks.auc.domain.Lot" id="LotResult">
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectLotByAucId" parameterType="Long" resultMap="LotResult">
         <include refid="selectLotVo"/>
-        where auction_id = #{id} and del_flag  &lt;&gt; 1
+        where auction_id = #{id} and del_flag  &lt;&gt; 1 and pub_status!=0
         order by last_price_time desc
     </select>
 
@@ -164,7 +164,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="payTimeLimit!=null">pay_limit_time,</if>
+            <if test="payTimeLimit!=null">pay_time_limit,</if>
             <if test="category!=null and category!=''">category,</if>
             <if test="subCategory!=null and subCategory!=''">sub_category,</if>
             <if test="properties!=null">properties,</if>
@@ -214,8 +214,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serviceTariff !=null ">#{serviceTariff},</if>
             <if test="payTimeLimit!=null">#{payTimeLimit},</if>
             <if test="category!=null and category!=''">#{category},</if>
-            <if test="subCategory!=null and subCategory!=''">#{subCategory}</if>
-            <if test="properties!=null">#{properties,jdbcType=OTHER,typeHandler=cn.hobbystocks.auc.mapper.handler.JsonNodeTypeHandler}</if>
+            <if test="subCategory!=null and subCategory!=''">#{subCategory},</if>
+            <if test="properties!=null">#{properties,jdbcType=OTHER,typeHandler=cn.hobbystocks.auc.mapper.handler.JsonNodeTypeHandler}::jsonb</if>
          </trim>
     </insert>