1.拍品订单列表 拍卖会名称搜索无效

2.拍品订单列表 拍品名称搜索无效
3.保证金订单列表返回保证金单号
4.保证金订单列表订单编号搜索
5.保证金订单列表分页无效
6.拍品列表分页有问题
7.拍卖会分页有问题
8.新增拍卖会时保证金丢失

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

@@ -46,6 +46,7 @@ public class AuctionController extends AdminBaseController {
         if (Objects.isNull(userInfo)){
             return AjaxResult.error("请先登录");
         }
+        startPage(auction);
 		List<Auction> list = auctionService.selectAuctionList(auction);
 		return AjaxResult.successPage(list);
 	}
@@ -60,6 +61,9 @@ public class AuctionController extends AdminBaseController {
         if (Objects.isNull(simpleUserInfo)){
             return AjaxResult.error("请先登录");
         }
+        if (DateUtils.isTimeRangeExpired(auctionDTO.getStartTime(), auctionDTO.getEndTime())) {
+            return AjaxResult.error("结束时间不能早于当前时间");
+        }
         Auction auction = new Auction();
         BeanUtils.copyProperties(auctionDTO,auction);
 		auction.setDelFlag(Constants.DEL_FLAG_NO_DELETE);
@@ -93,6 +97,9 @@ public class AuctionController extends AdminBaseController {
 		if ((BooleanUtil.isFalse(auction.getEditSortFlag())||Objects.isNull(auction.getEditSortFlag())) &&Objects.equals(Constants.PUB_STATUS_PUBLISHED, dbAuc.getPubStatus())) {
 			return AjaxResult.error("拍卖会已发布不能修改");
 		}
+		if (DateUtils.isTimeRangeExpired(auction.getStartTime(), auction.getEndTime())) {
+			return AjaxResult.error("结束时间不能早于当前时间");
+		}
 		auction.setUpdateBy(getUsername());
 		return AjaxResult.success(auctionService.updateById(auction));
 	}

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

@@ -12,6 +12,7 @@ import cn.hobbystocks.auc.common.easy.factory.EasyExcelTypeEnums;
 import cn.hobbystocks.auc.common.poi.ExcelUtil;
 import cn.hobbystocks.auc.common.user.UserInfo;
 import cn.hobbystocks.auc.common.user.UserUtils;
+import cn.hobbystocks.auc.common.utils.DateUtils;
 import cn.hobbystocks.auc.common.utils.ExcelUtils;
 import cn.hobbystocks.auc.common.utils.StringUtils;
 import cn.hobbystocks.auc.common.utils.UserType;
@@ -67,6 +68,7 @@ public class LotController extends AdminBaseController {
 
 		lot.setDelFlag(Constants.DEL_FLAG_NO_DELETE);
 
+        startPage(lot);
 		List<Lot> lotList = lotService.selectLotList(lot);
 		lotList.forEach(l -> {
 			l.setDelay(StringUtils.isEmpty(l.getDelayPublish()) ? 0 : 1);
@@ -92,6 +94,8 @@ public class LotController extends AdminBaseController {
         if (Objects.isNull(userInfo))
             return AjaxResult.error("请先登录");
         Auction dbAuction = auctionService.selectAuctionById(lot.getAuctionId());
+		if (DateUtils.isTimeRangeExpired(lot.getStartTime(), lot.getEndTime()))
+			return AjaxResult.error("结束时间不能早于当前时间");
 		if (System.currentTimeMillis()> dbAuction.getEndTime().getTime())
 			return AjaxResult.error("拍卖会已经结束");
 		//拍品结束时间不能小于拍卖会结束时间
@@ -124,6 +128,8 @@ public class LotController extends AdminBaseController {
 		Lot dbLot = lotService.selectLotById(lot.getId());
 		if (dbLot==null)
 		    return AjaxResult.error("请传入拍品id");
+		if (DateUtils.isTimeRangeExpired(lot.getStartTime(), lot.getEndTime()))
+			return AjaxResult.error("结束时间不能早于当前时间");
 		lot.setUpdateBy(getUsername());
 		if (Constants.PUB_STATUS_PUBLISHED.equals(dbLot.getPubStatus())) {
 			lotService.updateLotEx(lot);

lot/src/main/java/cn/hobbystocks/auc/common/utils/DateUtils.java

@@ -242,4 +242,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return Date.from(targetTime.atZone(DEFAULT_ZONE_ID).toInstant());
     }
 
+    public static boolean isTimeRangeExpired(Date startTime, Date endTime) {
+        return isTimeRangeExpired(startTime, endTime, getNowDate());
+    }
+
+    public static boolean isTimeRangeExpired(Date startTime, Date endTime, Date now) {
+        if (endTime == null || now == null) {
+            return false;
+        }
+        return endTime.before(now);
+    }
+
 }

lot/src/main/java/cn/hobbystocks/auc/dto/AuctionDTO.java

@@ -18,7 +18,7 @@ public class AuctionDTO {
     //拍卖会banner
     private String banner;
     //    保证金（元）
-    private Integer deposit;
+    private Long deposit;
     //    服务费（%）
     private BigDecimal serviceTariff;
     //    中拍支付时限（天）

lot/src/main/java/cn/hobbystocks/auc/dto/DepositRecordDTO.java

@@ -26,6 +26,9 @@ public class DepositRecordDTO {
     @ApiModelProperty("保证金Id")
     private Long id;
 
+    @ApiModelProperty("保证金号")
+    private String depositNo;
+
     @ApiModelProperty("保证金类型")
     private String depositType;
 

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

@@ -14,7 +14,7 @@ public interface AuctionMapper extends BaseMapper<Auction> {
 
     Auction selectAuctionByNo(String no);
 
-    List<Auction> selectAuctionList(IPage<Auction> page,@Param("auction") Auction auction);
+    List<Auction> selectAuctionList(@Param("auction") Auction auction);
 
     int insertAuction(Auction auction);
 

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

@@ -57,8 +57,8 @@ public class AuctionServiceImpl extends ServiceImpl<AuctionMapper,Auction> imple
 
     @Override
     public List<Auction> selectAuctionList(Auction auction) {
-        IPage<Auction> page=new Page<>(auction.getPageNum(),auction.getPageSize());
-        List<Auction> auctions = getBaseMapper().selectAuctionList(page, auction);
+//        IPage<Auction> page=new Page<>(auction.getPageNum(),auction.getPageSize());
+        List<Auction> auctions = getBaseMapper().selectAuctionList(auction);
         // 过滤掉时间已结束的拍品
 //        auctions.removeIf(po -> System.currentTimeMillis() > po.getEndTime().getTime());
         // 返回

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

@@ -16,6 +16,7 @@
         <result property="amount" column="amount"/>
         <result property="createTime" column="create_time"/>
         <result property="payTime" column="pay_time"/>
+        <result property="depositNo" column="deposit_no"/>
         <association property="userInfo" javaType="cn.hobbystocks.auc.dto.DepositRecordDTO$UserInfo">
             <result property="userId" column="user_id"/>
             <result property="nickname" column="nickname"/>
@@ -44,7 +45,8 @@
                dor.pay_time,
                abu.nickname,
                a.phone,
-               dor.user_id
+               dor.user_id,
+               dor.order_no as deposit_no
         from deposit_order_record dor
                  inner join app_base_user abu on abu.id = dor.user_id
                  inner join app_account a on abu.username = a.account
@@ -55,7 +57,7 @@
             <if test="status != null">
                 and dor.status = #{status}
             </if>
-            <if test="depositNo!=null">
+            <if test="depositNo!=null and depositNo!=''">
                 and dor.order_no like concat('%', #{depositNo}, '%')
             </if>
         </where>