拍品接口修改

auc/pom.xml

@@ -16,16 +16,7 @@
 			<groupId>cn.hobbystocks</groupId>
 			<artifactId>lot</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.flywaydb</groupId>
-			<artifactId>flyway-core</artifactId>
-			<version>5.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.flywaydb</groupId>
-			<artifactId>flyway-mysql</artifactId>
-			<version>8.5.11</version>
-		</dependency>
+
 		<!-- redis 缓存操作 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -38,8 +29,6 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.3.1-jre</version>
-			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 	<build>

auc/src/main/java/cn/hobbystocks/auc/config/MyFlywayMigrationStrategy.java

@@ -1,38 +1,29 @@
 package cn.hobbystocks.auc.config;
 
 import cn.hobbystocks.auc.common.user.UserUtils;
-import cn.hobbystocks.auc.service.IAuctionService;
+
 import cn.hobbystocks.auc.service.ILotService;
 import lombok.SneakyThrows;
-import org.flywaydb.core.Flyway;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
 import org.springframework.stereotype.Component;
 
 import java.util.TimeZone;
 
 @Component
-public class MyFlywayMigrationStrategy implements FlywayMigrationStrategy {
+public class MyFlywayMigrationStrategy  {
 
     @Value("${user.info-url:http://coresvc2/user/}")
     private String userUrl;
 
-    @Autowired
-    protected IAuctionService auctionService;
+
     @Autowired
     private ILotService lotService;
 
     @SneakyThrows
-    @Override
-    public void migrate(Flyway flyway)  {
-        try {
-            flyway.migrate();
-        }
-        catch (NoSuchMethodError ex) {
-            // Flyway < 7.0
-            flyway.getClass().getMethod("migrate").invoke(flyway);
-        }
+    public void migrate()  {
+
         init();
     }
 

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

@@ -6,9 +6,13 @@ import java.util.Objects;
 import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.core.redis.RedisCache;
+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.dto.AuctionDTO;
 import cn.hobbystocks.auc.vo.AuctionVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,9 +47,11 @@ public class AuctionController extends AdminBaseController {
 	@ApiOperation(value = "查询拍卖会列表", notes = "分页查询拍卖会列表", response = Auction.class, responseContainer = "List<Auction>")
 	@PostMapping("/list")
 	public AjaxResult list(@RequestBody AuctionVO auction) {
-
-        IPage<Auction> page=new Page<>(auction.getPageNum(),auction.getPageSize());
-		List<Auction> list = auctionService.list(page);
+        UserInfo userInfo = UserUtils.getSimpleUserInfo();
+        if (Objects.isNull(userInfo)){
+            return AjaxResult.error("请先登录");
+        }
+		List<Auction> list = auctionService.selectAuctionList(auction);
 		return AjaxResult.successPage(list);
 	}
 
@@ -55,19 +61,26 @@ public class AuctionController extends AdminBaseController {
 	@ApiOperation(value = "新增保存拍卖会", notes = "新增保存拍卖会", response = AjaxResult.class, responseContainer = "int")
 	@PostMapping("/add")
 	public AjaxResult addSave(@RequestBody AuctionDTO auctionDTO) {
+        UserInfo simpleUserInfo = UserUtils.getSimpleUserInfo();
+        if (Objects.isNull(simpleUserInfo)){
+            return AjaxResult.error("请先登录");
+        }
         Auction auction = new Auction();
         BeanUtils.copyProperties(auctionDTO,auction);
 		auction.setDelFlag(Constants.DEL_FLAG_NO_DELETE);
 		auction.setStatus(Constants.GROUP_STATUS_WAITING);
 		auction.setPubStatus(Constants.PUB_STATUS_NO_PUBLISHED);
 		auction.setCreateBy(getUsername());
+		auction.setCreateTime(DateUtils.getNowDate());
+		auction.setMerchantId(simpleUserInfo.getMerchantId());
+		auction.setSort(0);
 		return AjaxResult.success(auctionService.save(auction));
 	}
 
 	/**
-	 * 根据拍卖会编号获取拍卖会详情
+	 * 根据拍卖会id获取拍卖会详情
 	 */
-	@ApiOperation(value = "根据拍卖会编号获取拍卖会详情", notes = "根据拍卖会编号获取拍卖会详情", response = Auction.class, responseContainer = "Auction")
+	@ApiOperation(value = "根据拍卖会id获取拍卖会详情", notes = "根据拍卖会id获取拍卖会详情", response = Auction.class, responseContainer = "Auction")
 	@PostMapping(value = "/get")
 	public AjaxResult getInfo(@RequestBody AuctionVO auction) {
 		return AjaxResult.success(auctionService.getById(auction.getId()));

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

@@ -6,6 +6,8 @@ import java.util.*;
 import cn.hobbystocks.auc.annotation.RequireRoles;
 import cn.hobbystocks.auc.app.AppClient;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
+import cn.hobbystocks.auc.common.user.UserInfo;
+import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.common.utils.StringUtils;
 import cn.hobbystocks.auc.common.utils.UserType;
 import cn.hobbystocks.auc.domain.Bid;
@@ -15,6 +17,9 @@ import cn.hobbystocks.auc.mapper.BidMapper;
 import cn.hobbystocks.auc.service.SyncService;
 import cn.hobbystocks.auc.task.DynamicTaskService;
 import cn.hobbystocks.auc.vo.LotVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
@@ -43,16 +48,14 @@ public class LotController extends AdminBaseController {
 	/**
 	 * 查询拍品列表
 	 */
-	@ApiOperation(value = "查询拍品列表", notes = "分页查询拍品列表", response = Lot.class, responseContainer = "List<Lot>")
+	@ApiOperation(value = "查询拍卖会下的拍品列表", notes = "分页查询拍品列表", response = Lot.class, responseContainer = "List<Lot>")
 	@PostMapping("/list")
 	@RequireRoles({UserType.USER_ROLE_ADMIN})
 	public AjaxResult list(@RequestBody LotVO lot) {
-	    if (StringUtils.isEmpty(lot.getBusinessCode())){
-	        return AjaxResult.error("业务系统编码不能为空");
-        }
-		startPage(lot);
+	    if (lot.getAuctionId()==null)
+	        return AjaxResult.error("拍卖会id不能为空");
 		lot.setDelFlag(Constants.DEL_FLAG_NO_DELETE);
-		lot.setAuctionId(1L);
+		lot.setAuctionId(lot.getAuctionId());
 		List<Lot> lotList = lotService.selectLotList(lot);
 		lotList.forEach(l -> {
 			l.setDelay(StringUtils.isEmpty(l.getDelayPublish()) ? 0 : 1);
@@ -74,14 +77,21 @@ public class LotController extends AdminBaseController {
 	@PostMapping("/add")
 	@RequireRoles({UserType.USER_ROLE_ADMIN})
 	public AjaxResult addSave(@RequestBody @Valid LotVO lot) {
-		Auction dbAuction = auctionService.selectAuctionById(lot.getAuctionId());
+        UserInfo userInfo = UserUtils.getSimpleUserInfo();
+        if (Objects.isNull(userInfo))
+            return AjaxResult.error("请先登录");
+        Auction dbAuction = auctionService.selectAuctionById(lot.getAuctionId());
 		if (Objects.equals(Constants.GROUP_STATUS_FINISH, dbAuction.getStatus()))
 			return AjaxResult.error("拍卖会已经结束");
+		lot.setMerchantId(userInfo.getMerchantId());
+		lot.setMerchantName(userInfo.getMerchantName());
+		lot.setMerchantAvatar(userInfo.getMerchantAvatar());
 		lot.setCreateBy(getUsername());
 		lot.setStatus(Constants.LOT_STATUS_WAITING);
 		lot.setDelFlag(Constants.DEL_FLAG_NO_DELETE);
 		lot.setGoodsType(StringUtils.isEmpty(lot.getGoodsType()) ? "sku" : lot.getGoodsType());
 		lot.setPubStatus(Constants.PUB_STATUS_NO_PUBLISHED);
+		lot.setSort(0);
 		lotService.insertLot(lot);
 		return AjaxResult.success();
 	}

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

@@ -39,7 +39,7 @@ import java.util.Objects;
 @RestController
 @RequestMapping("/auction/admin/shipping/lot")
 @Slf4j
-@Api(tags = "商家拍品管理")
+@Api(tags = "商家拍品组管理")
 public class LotGroupController extends AdminBaseController {
 	@Autowired
 	private AppClient appClient;

auc/src/main/resources/application.yml

@@ -10,33 +10,6 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
-  flyway:
-    # 是否启用flyway
-    enabled: false
-    # 指定表
-    table: flyway_schema_history_auction
-    # 禁止清理数据库表
-    clean-disabled: true
-    # 编码格式，默认UTF-8
-    encoding: UTF-8
-    # 迁移sql脚本文件存放路径，默认db/migration
-    locations: classpath:db/migration
-    # 迁移sql脚本文件名称的前缀，默认V
-    sql-migration-prefix: V
-    # 迁移sql脚本文件名称的分隔符，默认2个下划线__
-    sql-migration-separator: _
-    # 迁移sql脚本文件名称的后缀
-    sql-migration-suffixes: .sql
-    # 迁移时是否进行校验，默认true
-    validate-on-migrate: true
-    # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表
-    baseline-on-migrate: true
-    url: ${DB_URL:jdbc:postgresql://localhost:5432/auction}
-    user: ${DB_USERNAME:hobby_auction}
-    password: ${DB_PASSWORD:Pass2025}
-
-
-
 
 server:
   # 服务器的HTTP端口，默认为8080

auc/src/main/resources/db/migration/V1.1_Init_.sql

@@ -1,160 +0,0 @@
-CREATE TABLE "public"."auction" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "no" varchar(50) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "name" varchar(200) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "site" varchar(50) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "imgs" varchar(2000) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "banner" varchar(200) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "attachment" varchar(2000) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "detail" varchar(2000) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "des_data" varchar(2000) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "labels" varchar(500) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "pub_status" int4 DEFAULT 0,
-  "pub_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "status" varchar(10) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "start_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "end_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "del_flag" int4 DEFAULT 0,
-  "create_by" varchar(30) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "create_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "update_by" varchar(30) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "update_time" timestamp(6) DEFAULT NULL::timestamp without time zone
-)
-;
-COMMENT ON COLUMN "public"."auction"."no" IS '拍卖会编号';
-COMMENT ON COLUMN "public"."auction"."name" IS '拍卖会名称';
-COMMENT ON COLUMN "public"."auction"."pub_status" IS '发布状态';
-COMMENT ON COLUMN "public"."auction"."pub_time" IS '发布时间';
-COMMENT ON COLUMN "public"."auction"."status" IS '拍卖会状态';
-COMMENT ON COLUMN "public"."auction"."start_time" IS '拍卖会开始时间';
-COMMENT ON COLUMN "public"."auction"."end_time" IS '拍卖会结束时间';
-COMMENT ON COLUMN "public"."auction"."del_flag" IS '删除标志';
-
--- ----------------------------
--- Primary Key structure for table auction
--- ----------------------------
-ALTER TABLE "public"."auction" ADD CONSTRAINT "auction_pkey" PRIMARY KEY ("id");
-
-
-CREATE TABLE "public"."lot" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "goods_id" varchar(32) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "auction_id" int4 NOT NULL,
-  "name" varchar(200) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "num" numeric(20,4) DEFAULT NULL::numeric,
-  "unit" varchar(20) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "imgs" varchar(2000) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "detail" varchar(2000) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "pub_status" int4 DEFAULT 0,
-  "pub_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "status" varchar(10) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "start_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "end_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "real_end_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "rule_type" varchar(10) COLLATE "pg_catalog"."default" NOT NULL DEFAULT NULL::character varying,
-  "last_price" numeric(20,2) DEFAULT NULL::numeric,
-  "last_price_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "deal_price" numeric(20,2) DEFAULT NULL::numeric,
-  "deal_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "deal_account_id" varchar(40) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "deal_account" varchar(40) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "paid" int4 DEFAULT 0,
-  "order_id" varchar(32) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "bid_count" int4 DEFAULT 0,
-  "bid_persion_count" int4 DEFAULT 0,
-  "del_flag" int4 DEFAULT 0,
-  "create_by" varchar(30) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "create_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "update_by" varchar(30) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "update_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "sort" int8,
-  "rule_content" varchar(2000) COLLATE "pg_catalog"."default" NOT NULL DEFAULT NULL::numeric
-)
-;
-COMMENT ON COLUMN "public"."lot"."goods_id" IS '商品ID';
-COMMENT ON COLUMN "public"."lot"."auction_id" IS '拍卖会ID';
-COMMENT ON COLUMN "public"."lot"."name" IS '拍品名称';
-COMMENT ON COLUMN "public"."lot"."num" IS '拍品数量';
-COMMENT ON COLUMN "public"."lot"."unit" IS '数量单位';
-COMMENT ON COLUMN "public"."lot"."imgs" IS '拍品图片';
-COMMENT ON COLUMN "public"."lot"."detail" IS '拍品介绍';
-COMMENT ON COLUMN "public"."lot"."pub_status" IS '是否发布（0:未发布;1:已发布）';
-COMMENT ON COLUMN "public"."lot"."pub_time" IS '发布时间';
-COMMENT ON COLUMN "public"."lot"."status" IS '拍卖状态（Waiting:未开始;Starting:开启中;Bidding:进行中Finished:拍卖结束;Cancelled:撤拍;Pass:流拍;Sold:成交;Regret :悔拍）';
-COMMENT ON COLUMN "public"."lot"."start_time" IS '拍卖开始时间';
-COMMENT ON COLUMN "public"."lot"."end_time" IS '拍卖结束时间';
-COMMENT ON COLUMN "public"."lot"."real_end_time" IS '实际结束时间';
-COMMENT ON COLUMN "public"."lot"."rule_type" IS '规则类型';
-COMMENT ON COLUMN "public"."lot"."last_price" IS '最新出价';
-COMMENT ON COLUMN "public"."lot"."last_price_time" IS '最新出价时间';
-COMMENT ON COLUMN "public"."lot"."deal_price" IS '成交价';
-COMMENT ON COLUMN "public"."lot"."deal_time" IS '成交时间';
-COMMENT ON COLUMN "public"."lot"."deal_account_id" IS '成交用过id';
-COMMENT ON COLUMN "public"."lot"."deal_account" IS '成交用户';
-COMMENT ON COLUMN "public"."lot"."paid" IS '已支付';
-COMMENT ON COLUMN "public"."lot"."order_id" IS '订单id';
-COMMENT ON COLUMN "public"."lot"."bid_count" IS '出价次数';
-COMMENT ON COLUMN "public"."lot"."bid_persion_count" IS '出价人数';
-COMMENT ON COLUMN "public"."lot"."del_flag" IS '0:未删除;1:已删除';
-COMMENT ON COLUMN "public"."lot"."sort" IS '排序';
-COMMENT ON COLUMN "public"."lot"."rule_content" IS '规则';
-
--- ----------------------------
--- Primary Key structure for table lot
--- ----------------------------
-ALTER TABLE "public"."lot" ADD CONSTRAINT "lot_pkey" PRIMARY KEY ("id");
-
-
-
-CREATE TABLE "public"."bid" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "lot_id" int4 NOT NULL,
-  "round" int4,
-  "account" varchar(40) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "account_id" varchar(40) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "amount" numeric(20,2) DEFAULT NULL::numeric,
-  "device_type" varchar(50) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "ip" varchar(200) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "del_flag" int4 DEFAULT 0,
-  "create_by" varchar(40) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "create_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "update_by" varchar(40) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "update_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "remark" varchar(500) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "status" int2 DEFAULT 0,
-  "anonymous" int2,
-  "curr" int2
-)
-;
-COMMENT ON COLUMN "public"."bid"."lot_id" IS '拍品ID';
-COMMENT ON COLUMN "public"."bid"."round" IS '轮次';
-COMMENT ON COLUMN "public"."bid"."account" IS '昵称';
-COMMENT ON COLUMN "public"."bid"."account_id" IS '用户id';
-COMMENT ON COLUMN "public"."bid"."amount" IS '消耗积分/金额';
-COMMENT ON COLUMN "public"."bid"."device_type" IS '设备类型';
-COMMENT ON COLUMN "public"."bid"."status" IS '状态：0未中标 1中标';
-COMMENT ON COLUMN "public"."bid"."anonymous" IS '是否匿名：0否 1是';
-COMMENT ON COLUMN "public"."bid"."curr" IS '是否是当前最高价';
-
--- ----------------------------
--- Primary Key structure for table bid
--- ----------------------------
-ALTER TABLE "public"."bid" ADD CONSTRAINT "bid_pkey" PRIMARY KEY ("id");

auc/src/main/resources/db/migration/V1.2_lot_goods_type_.sql

@@ -1,7 +0,0 @@
-ALTER TABLE "public"."lot"
-ADD COLUMN "goods_type" varchar(32);
-
-COMMENT ON COLUMN "public"."lot"."goods_type" IS '商品类型';
-
-ALTER TABLE "public"."lot"
-ALTER COLUMN "rule_type" TYPE varchar(200) COLLATE "pg_catalog"."default";

auc/src/main/resources/db/migration/V1.3_bid_mod_.sql

@@ -1,3 +0,0 @@
-ALTER TABLE "public"."bid"
-ALTER COLUMN "anonymous" SET DEFAULT 0,
-ALTER COLUMN "curr" SET DEFAULT 0;

auc/src/main/resources/db/migration/V1.4_carousel_imgs_.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "public"."lot"
-  ADD COLUMN "carousel_imgs" varchar(2000);
-
-COMMENT ON COLUMN "public"."lot"."carousel_imgs" IS '轮播图片 逗号分割';

auc/src/main/resources/db/migration/V1.5_bid_avatar_.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."bid"
-  ADD COLUMN "avatar" varchar(255);

auc/src/main/resources/db/migration/V1.6_lot_avatar_.sql

@@ -1,3 +0,0 @@
-ALTER TABLE "public"."lot"
-  ADD COLUMN "merchant_name" varchar(255),
-  ADD COLUMN "merchant_avatar" varchar(2000);

auc/src/main/resources/db/migration/V1.7_lot_goods_.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."lot"
-  ADD COLUMN "goods_name" varchar(255);

auc/src/main/resources/db/migration/V1.8_lot_merchant_.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."lot"
-  ADD COLUMN "merchant_id" int4;

auc/src/main/resources/db/migration/V1.9_error_.sql

@@ -1,20 +0,0 @@
-CREATE TABLE "public"."lot_error" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "create_time" timestamp(6) NOT NULL,
-  "type" varchar(255) NOT NULL,
-  "lot_id" int4 NOT NULL ,
-  "bid_id" int4,
-  "point" int4,
-  "msg" varchar(255),
-  "order_id" varchar(255),
-  PRIMARY KEY ("id")
-)
-;
-
-COMMENT ON COLUMN "public"."lot_error"."type" IS '错误维度';

auc/src/main/resources/db/migration/V2.0_index_.sql

@@ -1,7 +0,0 @@
-CREATE INDEX "auctionId" ON "public"."lot" USING btree (
-  "auction_id"
-);
-
-CREATE INDEX "lotId" ON "public"."bid" USING btree (
-  "lot_id"
-);

auc/src/main/resources/db/migration/V2.1_bid_no_.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."bid"
-  ADD COLUMN "bid_no" varchar(255);

auc/src/main/resources/db/migration/V2.2_bid_user_code_.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."bid"
-  ADD COLUMN "user_code" varchar(255);

auc/src/main/resources/db/migration/V2.3_bid_record_.sql

@@ -1,16 +0,0 @@
-CREATE TABLE "public"."bid_record" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "user_id" int4,
-  "amount" numeric(20,2),
-  "lot_id" int4 NOT NULL,
-  "create_time" timestamp(6),
-  "bid_no" varchar(255),
-  PRIMARY KEY ("id")
-)
-;

auc/src/main/resources/db/migration/V2.4_update_lot_goods_type_.sql

@@ -1 +0,0 @@
-UPDATE lot set goods_type = 'sku' WHERE goods_type is NULL;

auc/src/main/resources/db/migration/V2.5_sold_order_record_.sql

@@ -1,18 +0,0 @@
-CREATE TABLE "public"."sold_order_record" (
-    "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-  INCREMENT 1
-  MINVALUE  1
-  MAXVALUE 2147483647
-  START 1
-  CACHE 1
-  ),
-  "lot_id" int4 NOT NULL,
-  "bid_id" int4 NOT NULL,
-  "create_time" timestamp(6) NOT NULL,
-  "order_id" varchar(255)
-)
-;
-
-CREATE UNIQUE INDEX "lotid" ON "public"."sold_order_record" USING btree (
-  "lot_id"
-);

auc/src/main/resources/db/migration/V2.6_private_domain_.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "public"."lot"
-  ADD COLUMN "private_domain" int2 NOT NULL DEFAULT 0;
-
-COMMENT ON COLUMN "public"."lot"."private_domain" IS '是否是私域 0 不是  1 是';

auc/src/main/resources/db/migration/V2.7_nickname_too_long_.sql

@@ -1,17 +0,0 @@
-ALTER TABLE "public"."lot" 
-  ALTER COLUMN "deal_account" TYPE varchar(64) COLLATE "pg_catalog"."default",
-  ALTER COLUMN "create_by" TYPE varchar(64) COLLATE "pg_catalog"."default",
-  ALTER COLUMN "update_by" TYPE varchar(64) COLLATE "pg_catalog"."default";
-
-
-ALTER TABLE "public"."bid"
-  ALTER COLUMN "account" TYPE varchar(64) COLLATE "pg_catalog"."default",
-  ALTER COLUMN "create_by" TYPE varchar(64) COLLATE "pg_catalog"."default",
-  ALTER COLUMN "update_by" TYPE varchar(64) COLLATE "pg_catalog"."default";
-
-
-ALTER TABLE "public"."auction"
-  ALTER COLUMN "create_by" TYPE varchar(64) COLLATE "pg_catalog"."default",
-  ALTER COLUMN "update_by" TYPE varchar(64) COLLATE "pg_catalog"."default";
-
-

auc/src/main/resources/db/migration/V2.8_img_too_long_.sql

@@ -1,5 +0,0 @@
-ALTER TABLE "public"."lot"
-  ALTER COLUMN "imgs" TYPE varchar(5000) COLLATE "pg_catalog"."default",
-  ALTER COLUMN "detail" TYPE varchar(5000) COLLATE "pg_catalog"."default",
-  ALTER COLUMN "rule_content" TYPE varchar(5000) COLLATE "pg_catalog"."default",
-  ALTER COLUMN "carousel_imgs" TYPE varchar(5000) COLLATE "pg_catalog"."default";

auc/src/main/resources/db/migration/V2.9_delay_publish_.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."lot"
-  ADD COLUMN "delay_publish" varchar(255);

auc/src/main/resources/db/migration/V3.0_lot_fans_.sql

@@ -1,26 +0,0 @@
-CREATE TABLE "public"."lot_fans" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "user_id" int4 NOT NULL,
-  "lot_id" int4 NOT NULL,
-  "create_time" timestamp(6) NOT NULL,
-  "type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL
-)
-;
-
-CREATE INDEX "lot_id_type" ON "public"."lot_fans" USING btree (
-  "lot_id",
-  "type"
-);
-
-CREATE INDEX "user_id_lot_id" ON "public"."lot_fans" USING btree (
-  "user_id",
-  "lot_id"
-);
-
-COMMENT ON COLUMN "public"."lot_fans"."type" IS '类型,user_like';

auc/src/main/resources/db/migration/V3.1_lot_fans_push_record_.sql

@@ -1,19 +0,0 @@
-CREATE TABLE "public"."lot_fans_push_record" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "lot_id" int4 NOT NULL,
-  "create_time" timestamp(6) NOT NULL,
-  "type" varchar(255) NOT NULL,
-  "content" varchar(5000)
-)
-;
-
-CREATE UNIQUE INDEX "lot_id_type_record" ON "public"."lot_fans_push_record" USING btree (
-  "lot_id",
-  "type"
-);

auc/src/main/resources/db/migration/V3.2_manual_return_point_.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."bid"
-  ADD COLUMN "manual_return_point" numeric(20,2);

auc/src/main/resources/db/migration/V3.3_new_v2_auction_.sql

@@ -1,152 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : sh.light.ipangyou.com
- Source Server Type    : PostgreSQL
- Source Server Version : 130012
- Source Host           : sh.light.ipangyou.com:5432
- Source Catalog        : auction
- Source Schema         : public
-
- Target Server Type    : PostgreSQL
- Target Server Version : 130012
- File Encoding         : 65001
-
- Date: 05/12/2024 11:37:36
-*/
-
-
--- ----------------------------
--- Table structure for lot_group
--- ----------------------------
-DROP TABLE IF EXISTS "public"."lot_group";
-CREATE TABLE "public"."lot_group" (
-  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-INCREMENT 1
-MINVALUE  1
-MAXVALUE 2147483647
-START 1
-CACHE 1
-),
-  "goods_id" varchar(32) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "auction_id" int4 NOT NULL,
-  "name" varchar(200) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "num" numeric(20,4) DEFAULT NULL::numeric,
-  "unit" varchar(20) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "imgs" varchar(5000) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "detail" varchar(5000) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "pub_status" int4 DEFAULT 0,
-  "pub_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "status" varchar(10) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "start_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "end_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "real_end_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "rule_type" varchar(200) COLLATE "pg_catalog"."default" NOT NULL DEFAULT NULL::character varying,
-  "last_price" numeric(20,2) DEFAULT NULL::numeric,
-  "last_price_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "deal_price" numeric(20,2) DEFAULT NULL::numeric,
-  "deal_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "deal_account_id" varchar(40) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "deal_account" varchar(64) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "paid" int4 DEFAULT 0,
-  "order_id" varchar(32) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "bid_count" int4 DEFAULT 0,
-  "bid_persion_count" int4 DEFAULT 0,
-  "del_flag" int4 DEFAULT 0,
-  "create_by" varchar(64) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "create_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "update_by" varchar(64) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "update_time" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "sort" int8,
-  "rule_content" varchar(5000) COLLATE "pg_catalog"."default" NOT NULL DEFAULT NULL::numeric,
-  "goods_type" varchar(32) COLLATE "pg_catalog"."default",
-  "carousel_imgs" varchar(5000) COLLATE "pg_catalog"."default",
-  "merchant_name" varchar(255) COLLATE "pg_catalog"."default",
-  "merchant_avatar" varchar(2000) COLLATE "pg_catalog"."default",
-  "goods_name" varchar(255) COLLATE "pg_catalog"."default",
-  "merchant_id" int4,
-  "private_domain" int2 NOT NULL DEFAULT 0,
-  "delay_publish" varchar(255) COLLATE "pg_catalog"."default",
-  "live_id" int4,
-  "finish_num" int4 NOT NULL DEFAULT 0,
-  "sold_num" int4 NOT NULL DEFAULT 0,
-  "start_num" int4 NOT NULL DEFAULT 0,
-  "lot_id" int4,
-  "sell_point" varchar(255) COLLATE "pg_catalog"."default",
-  "next_lot_id" int4
-)
-;
-COMMENT ON COLUMN "public"."lot_group"."goods_id" IS '商品ID';
-COMMENT ON COLUMN "public"."lot_group"."auction_id" IS '拍卖会ID';
-COMMENT ON COLUMN "public"."lot_group"."name" IS '拍品名称';
-COMMENT ON COLUMN "public"."lot_group"."num" IS '拍品数量';
-COMMENT ON COLUMN "public"."lot_group"."unit" IS '数量单位';
-COMMENT ON COLUMN "public"."lot_group"."imgs" IS '拍品图片';
-COMMENT ON COLUMN "public"."lot_group"."detail" IS '拍品介绍';
-COMMENT ON COLUMN "public"."lot_group"."pub_status" IS '是否发布（0:未发布;1:已发布）';
-COMMENT ON COLUMN "public"."lot_group"."pub_time" IS '发布时间';
-COMMENT ON COLUMN "public"."lot_group"."status" IS '拍卖状态（Waiting:未开始;Starting:开启中;Bidding:进行中Finished:拍卖结束;Cancelled:撤拍;Pass:流拍;Sold:成交;Regret :悔拍）';
-COMMENT ON COLUMN "public"."lot_group"."start_time" IS '拍卖开始时间';
-COMMENT ON COLUMN "public"."lot_group"."end_time" IS '拍卖结束时间';
-COMMENT ON COLUMN "public"."lot_group"."real_end_time" IS '实际结束时间';
-COMMENT ON COLUMN "public"."lot_group"."rule_type" IS '规则类型';
-COMMENT ON COLUMN "public"."lot_group"."last_price" IS '最新出价';
-COMMENT ON COLUMN "public"."lot_group"."last_price_time" IS '最新出价时间';
-COMMENT ON COLUMN "public"."lot_group"."deal_price" IS '成交价';
-COMMENT ON COLUMN "public"."lot_group"."deal_time" IS '成交时间';
-COMMENT ON COLUMN "public"."lot_group"."deal_account_id" IS '成交用过id';
-COMMENT ON COLUMN "public"."lot_group"."deal_account" IS '成交用户';
-COMMENT ON COLUMN "public"."lot_group"."paid" IS '已支付';
-COMMENT ON COLUMN "public"."lot_group"."order_id" IS '订单id';
-COMMENT ON COLUMN "public"."lot_group"."bid_count" IS '出价次数';
-COMMENT ON COLUMN "public"."lot_group"."bid_persion_count" IS '出价人数';
-COMMENT ON COLUMN "public"."lot_group"."del_flag" IS '0:未删除;1:已删除';
-COMMENT ON COLUMN "public"."lot_group"."sort" IS '排序';
-COMMENT ON COLUMN "public"."lot_group"."rule_content" IS '规则';
-COMMENT ON COLUMN "public"."lot_group"."goods_type" IS '商品类型';
-COMMENT ON COLUMN "public"."lot_group"."carousel_imgs" IS '轮播图片 逗号分割';
-COMMENT ON COLUMN "public"."lot_group"."private_domain" IS '是否是私域 0 不是  1 是';
-
--- ----------------------------
--- Indexes structure for table lot_group
--- ----------------------------
-CREATE INDEX "LotStatus_copy1" ON "public"."lot_group" USING hash (
-  "status" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops"
-);
-CREATE INDEX "create_time" ON "public"."lot_group" USING btree (
-  "create_time" "pg_catalog"."timestamp_ops" ASC NULLS LAST
-);
-CREATE INDEX "live_id" ON "public"."lot_group" USING btree (
-  "live_id" "pg_catalog"."int4_ops" ASC NULLS LAST
-);
-
--- ----------------------------
--- Primary Key structure for table lot_group
--- ----------------------------
-ALTER TABLE "public"."lot_group" ADD CONSTRAINT "lot_copy1_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "public"."lot_fans"
-  ADD COLUMN "expire" timestamp(6);
-
-ALTER TABLE "public"."lot"
-  ADD COLUMN "live_id" int4,
-  ADD COLUMN "group_id" int4;
-
-ALTER TABLE "public"."lot"
-  ALTER COLUMN "order_id" TYPE varchar(1000) COLLATE "pg_catalog"."default";
-
-CREATE INDEX "expire" ON "public"."lot_fans" USING btree (
-  "expire"
-);
-
-CREATE INDEX "lot_create_time" ON "public"."lot" USING btree (
-  "create_time"
-);
-
-CREATE INDEX "lot_group_id" ON "public"."lot" USING btree (
-  "group_id"
-);
-
-CREATE INDEX "lot_live_id" ON "public"."lot" USING btree (
-  "live_id"
-);

auc/src/main/resources/db/migration/V3.4_merch_.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."lot_fans"
-  ADD COLUMN "merchant_id" int4;

auc/src/main/resources/db/migration/V3.5_lot_group_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "lot_group"
-    ADD COLUMN "live_name" varchar(255);
-
-COMMENT ON COLUMN "lot_group"."live_name" IS '直播间名称';

auc/src/main/resources/db/migration/V3.6_bid_index_.sql

@@ -1,5 +0,0 @@
-CREATE INDEX "lotId_accountId" ON "public"."bid" USING btree (
-  "lot_id",
-  "account_id",
-  "status"
-);

auc/src/main/resources/db/migration/V3.7_lot_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "lot"
-    ADD COLUMN "live_name" varchar(255);
-
-COMMENT ON COLUMN "lot"."live_name" IS '直播间名称';

auc/src/main/resources/db/migration/V3.8_lot_fans_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "lot_fans"
-    ADD COLUMN "del_flag" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "lot_fans"."del_flag" IS '是否删除 默认0否 1是';

bid/pom.xml

@@ -15,7 +15,6 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.3.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.hobbystocks</groupId>
@@ -31,12 +30,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<!-- 数据库连接驱动 -->
-
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
-		</dependency>
 		<!-- Druid 数据库连接池 -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -69,7 +62,6 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-            <version>3.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
@@ -93,7 +85,6 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.13</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.janino</groupId>
@@ -116,23 +107,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
-		<!--bee-->
-		<!--<dependency>
-			<groupId>org.teasoft</groupId>
-			<artifactId>bee</artifactId>
-			<version>${bee.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.teasoft</groupId>
-			<artifactId>honey</artifactId>
-			<version>${bee.version}</version>
-		</dependency>
-		&lt;!&ndash;for log framework,Excel(poi) &ndash;&gt;
-		<dependency>
-			<groupId>org.teasoft</groupId>
-			<artifactId>bee-ext</artifactId>
-			<version>${bee.version}</version>
-		</dependency>-->
+
 	</dependencies>
 	<build>
 		<plugins>

lot/pom.xml

@@ -33,6 +33,11 @@
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-jsqlparser-4.9</artifactId>
+			<version>${mybatis-plus-spring-boot.version}</version>
+		</dependency>
 		<!-- Druid 数据库连接池 -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -69,7 +74,6 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-            <version>3.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
@@ -94,7 +98,6 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.13</version>
 		</dependency>
 
 		<dependency>
@@ -136,11 +139,7 @@
 			<artifactId>commons-io</artifactId>
 		</dependency>
 
-		<!-- 文件上传工具类 -->
-<!--		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-		</dependency>-->
+
 
 		<!-- yml解析器 -->
 		<dependency>
@@ -149,11 +148,7 @@
             <version>2.0</version>
         </dependency>
 
-		<!-- Token生成与解析-->
-		<!--<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt</artifactId>
-		</dependency>-->
+
 
 		<!-- Jaxb -->
 		<dependency>

lot/src/main/java/cn/hobbystocks/auc/common/constant/Constants.java

@@ -79,6 +79,8 @@ public class Constants {
     public static final Integer PUB_STATUS_NO_PUBLISHED = 0;
     // 发布状态 已发布
     public static final Integer PUB_STATUS_PUBLISHED = 1;
+    //发布状态 取消发布
+    public static final Integer PUB_STATUS_CANCEL_PUBLISHED=2;
 
 	// 未删除
     public static final Integer DEL_FLAG_NO_DELETE = 0;

lot/src/main/java/cn/hobbystocks/auc/common/user/UserInfo.java

@@ -23,7 +23,7 @@ public class UserInfo implements Serializable {
 	private String avatar;
 	/**角色code*/
 	private List<String> roleCodeList;
-	private Integer merchantId;
+	private Long merchantId;
 	private String merchantName;
 	private String merchantAvatar;
 	/**权限*/

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

@@ -62,5 +62,8 @@ public class Auction extends BaseEntity {
     private Date endTime;
     @TableField("del_flag")
     private Integer delFlag;
-
+    //商家id
+    private Long merchantId;
+    //排序
+    private Integer sort;
 }

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

@@ -5,9 +5,12 @@ import java.util.Date;
 
 import cn.hobbystocks.auc.annotation.Sensitive;
 import cn.hobbystocks.auc.annotation.View;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import lombok.*;
+import nonapi.io.github.classgraph.json.Id;
 
 import javax.validation.constraints.NotBlank;
 
@@ -16,10 +19,12 @@ import javax.validation.constraints.NotBlank;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@TableName("lot")
 public class Lot extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    @Id
     private Long id;
 
     /** 商品ID */
@@ -146,7 +151,10 @@ public class Lot extends BaseEntity
 
 
     private Long lotFansId;
-    //业务系统编码;
-    @NotBlank(message = "businessCode is empty")
-    private String businessCode;
+    //    保证金（元）
+    @TableField("deposit")
+    private Integer deposit;
+    //    服务费（%）
+    @TableField("service_tariff")
+    private Integer serviceTariff;
 }

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

@@ -3,6 +3,7 @@ package cn.hobbystocks.auc.mapper;
 
 import cn.hobbystocks.auc.domain.Auction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
@@ -12,7 +13,7 @@ public interface AuctionMapper extends BaseMapper<Auction> {
 
     Auction selectAuctionByNo(String no);
 
-    List<Auction> selectAuctionList(Auction auction);
+    List<Auction> selectAuctionList(IPage<Auction> page, Auction auction);
 
     int insertAuction(Auction auction);
 

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

@@ -3,17 +3,19 @@ package cn.hobbystocks.auc.mapper;
 import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.domain.LotGroup;
 import cn.hobbystocks.auc.vo.LotVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface LotMapper {
+public interface LotMapper extends BaseMapper<Lot> {
 
     Lot selectLotById(Long id);
 
     List<Lot> selectLotByAucId(Long id);
 
-    List<Lot> selectLotList(Lot lot);
+    List<Lot> selectLotList(IPage<Lot> page,Lot lot);
 
     List<Lot> selectLotByGroupIds(@Param("lotGroupIds") Long[] lotGroupIds);
 

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

@@ -8,10 +8,11 @@ import cn.hobbystocks.auc.handle.context.Live;
 import cn.hobbystocks.auc.vo.LiveVO;
 import cn.hobbystocks.auc.vo.LotVO;
 import cn.hobbystocks.auc.vo.SelfVO;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
-public interface ILotService {
+public interface ILotService extends IService<Lot> {
     Lot selectLotById(Long id);
 
     List<Lot> selectLotList(Lot lot);

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

@@ -10,6 +10,8 @@ import cn.hobbystocks.auc.domain.Auction;
 import cn.hobbystocks.auc.mapper.AuctionMapper;
 import cn.hobbystocks.auc.service.IAuctionService;
 import cn.hobbystocks.auc.vo.AuctionVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +32,7 @@ import java.util.Objects;
 @Slf4j
 public class AuctionServiceImpl extends ServiceImpl<AuctionMapper,Auction> implements IAuctionService
 {
-    @Autowired
-    private AuctionMapper auctionMapper;
+
     @Autowired
     private ILotService lotService;
     @Autowired
@@ -44,52 +45,58 @@ public class AuctionServiceImpl extends ServiceImpl<AuctionMapper,Auction> imple
     @Override
     public Auction selectAuctionById(Long id)
     {
-        return auctionMapper.selectAuctionById(id);
+        return getBaseMapper().selectAuctionById(id);
     }
 
     @Override
     public Auction selectAuctionByNo(String no) {
-        return auctionMapper.selectAuctionByNo(no);
+        return getBaseMapper().selectAuctionByNo(no);
     }
 
     @Override
     public List<Auction> selectAuctionList(Auction auction) {
-        return auctionMapper.selectAuctionList(auction);
+        IPage<Auction> page=new Page<>(auction.getPageNum(),auction.getPageSize());
+        return getBaseMapper().selectAuctionList(page,auction);
     }
 
     @Override
     public int insertAuction(Auction auction) {
         auction.setCreateTime(DateUtils.getNowDate());
-        return auctionMapper.insertAuction(auction);
+        return getBaseMapper().insertAuction(auction);
     }
 
     @Override
     public int updateAuction(Auction auction) {
         auction.setUpdateTime(DateUtils.getNowDate());
-        return auctionMapper.updateAuction(auction);
+        return getBaseMapper().updateAuction(auction);
     }
 
     @Override
     public int deleteAuctionByIds(String ids)
     {
-        return auctionMapper.deleteAuctionByIds(Convert.toLongArray(ids));
+        return getBaseMapper().deleteAuctionByIds(Convert.toLongArray(ids));
     }
 
     @Override
     public int deleteAuctionById(Long id)
     {
-        return auctionMapper.deleteAuctionById(id);
+        return getBaseMapper().deleteAuctionById(id);
     }
 
     @Override
     @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
     public void pubAuction(AuctionVO auction) {
-        auction.setPubStatus(Constants.PUB_STATUS_PUBLISHED);
-        auction.setPubTime(new Date());
-        auction.setStatus(Constants.LOT_STATUS_WAITING);
-        auctionMapper.updateAuction(auction);
+        if (Objects.equals(Constants.PUB_STATUS_PUBLISHED, auction.getPubStatus())) {
+
+            auction.setPubTime(new Date());
+            auction.setStatus(Constants.LOT_STATUS_WAITING);
+        }else if (Objects.equals(Constants.PUB_STATUS_CANCEL_PUBLISHED, auction.getPubStatus())){
+            auction.setPubTime(new Date());
+            auction.setStatus(Constants.LOT_STATUS_CANCELLED);
+        }
+        getBaseMapper().updateAuction(auction);
 
-        Auction db = auctionMapper.selectAuctionById(auction.getId());
+        Auction db = getBaseMapper().selectAuctionById(auction.getId());
         redisCache.setCacheObject(String.format(Constants.REDIS_AUC_TEMPLATE, auction.getId()), db);
 
         if (auction.getPubLots()) {
@@ -99,13 +106,13 @@ public class AuctionServiceImpl extends ServiceImpl<AuctionMapper,Auction> imple
 
     @Override
     public void auctionLive() {
-        auctionMapper.selectNeedStart().forEach(auction -> updateAuction(auction, Constants.GROUP_STATUS_STARTING));
+        getBaseMapper().selectNeedStart().forEach(auction -> updateAuction(auction, Constants.GROUP_STATUS_STARTING));
 //        auctionMapper.selectNeedEnd().forEach(auction -> updateAuction(auction, Constants.AUC_STATUS_FINISH));
     }
 
     @Override
     public List<Auction> live() {
-        return auctionMapper.selectLive();
+        return getBaseMapper().selectLive();
     }
 
     private void updateAuction(Auction auction, String status) {
@@ -117,7 +124,7 @@ public class AuctionServiceImpl extends ServiceImpl<AuctionMapper,Auction> imple
             def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
             def.setIsolationLevel(TransactionDefinition.ISOLATION_READ_COMMITTED);
             transaction = transactionManager.getTransaction(def);
-            auctionMapper.updateAuction(auction);
+            getBaseMapper().updateAuction(auction);
             if (status.equals(Constants.GROUP_STATUS_FINISH)) {
                 redisCache.deleteObject(String.format(Constants.REDIS_AUC_TEMPLATE, auction.getId()));
                 redisCache.deleteObject(String.format(Constants.REDIS_MAP_AUC_LOT_TEMPLATE, auction.getId()));

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

@@ -24,6 +24,10 @@ import cn.hobbystocks.auc.task.DynamicTaskService;
 import cn.hobbystocks.auc.vo.LiveVO;
 import cn.hobbystocks.auc.vo.LotVO;
 import cn.hobbystocks.auc.vo.SelfVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.beans.BeanUtils;
@@ -42,7 +46,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-public class LotServiceImpl implements ILotService
+public class LotServiceImpl extends ServiceImpl<LotMapper,Lot> implements ILotService
 {
     @Autowired
     private LotMapper lotMapper;
@@ -81,7 +85,8 @@ public class LotServiceImpl implements ILotService
 
     @Override
     public List<Lot> selectLotList(Lot lot) {
-        return lotMapper.selectLotList(lot);
+        IPage<Lot> lotIPage=new Page<>(lot.getPageNum(),lot.getPageSize());
+        return lotMapper.selectLotList(lotIPage,lot);
     }
 
     @Override
@@ -135,7 +140,7 @@ public class LotServiceImpl implements ILotService
             nextLot.setPubTime(new Date());
             nextLot.setPubStatus(Constants.PUB_STATUS_PUBLISHED);
             nextLot.setGroupId(lotGroup.getId());
-            nextLot.setBusinessCode(dbLotGroup.getBusinessCode());
+
             nextLot.setAuctionId(2L);
 
             String name = currLot.getName();
@@ -238,7 +243,7 @@ public class LotServiceImpl implements ILotService
         lot.setGroupId(lotGroup.getId());
         lot.setNum(1L);
         lot.setName(lot.getName() + "#1");
-        lot.setBusinessCode(lotGroup.getBusinessCode());
+
         lotMapper.insertLot(lot);
         lotGroupMapper.updateLotGroup(LotGroup.builder().id(lotGroup.getId()).nextLotId(lot.getId()).build());
         return i;
@@ -475,7 +480,9 @@ public class LotServiceImpl implements ILotService
 
     @Override
     public List<Lot> live(Long auctionId) {
-        return lotMapper.selectLotList(Lot.builder().auctionId(1L).delFlag(Constants.DEL_FLAG_NO_DELETE).build());
+        LambdaQueryWrapper<Lot> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(Lot::getAuctionId,auctionId).eq(Lot::getDelFlag,Constants.DEL_FLAG_NO_DELETE);
+        return lotMapper.selectList(queryWrapper);
     }
 
     @Override

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

@@ -40,13 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectAuctionVo"/>
         <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="site != null  and site != ''"> and site like concat('%', #{site}, '%')</if>
+
             <if test="imgs != null  and imgs != ''"> and imgs like concat('%', #{imgs}, '%')</if>
             <if test="banner != null  and banner != ''"> and banner like concat('%', #{banner}, '%')</if>
-            <if test="attachment != null  and attachment != ''"> and attachment like concat('%', #{attachment}, '%')</if>
-            <if test="detail != null  and detail != ''"> and detail like concat('%', #{detail}, '%')</if>
-            <if test="desData != null  and desData != ''"> and des_data like concat('%', #{desData}, '%')</if>
-            <if test="labels != null  and labels != ''"> and labels like concat('%', #{labels}, '%')</if>
+
             <if test="pubStatus != null "> and pub_status = #{pubStatus}</if>
             <if test="pubTime != null "> and pub_time = #{pubTime}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
@@ -54,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null "> and end_time = #{endTime}</if>
             and del_flag &lt;&gt; 1
         </where>
-        order by create_time desc
+        order by sort asc,id asc
     </select>
 
     <select id="selectPubbedAndNoEndAuction" resultMap="AuctionResult">

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

@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auctionId != null "> and auction_id = #{auctionId}</if>
             <if test="privateDomain != null "> and private_domain = #{privateDomain}</if>
         </where>
-        order by id desc
+        order by sort asc,id desc
     </select>
     <select id="selectLotByGroupIds" parameterType="Long" resultMap="LotResult">
         <include refid="selectLotVo"/>

pom.xml

@@ -15,22 +15,16 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<druid.version>1.2.17</druid.version>
-		<bitwalker.version>1.21</bitwalker.version>
+		<druid.version>1.2.27</druid.version>
 		<swagger.version>3.0.0</swagger.version>
-		<kaptcha.version>2.3.2</kaptcha.version>
 		<mybatis-plus-spring-boot.version>3.5.14</mybatis-plus-spring-boot.version>
-		<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
+		<pagehelper.boot.version>2.1.1</pagehelper.boot.version>
 		<fastjson.version>1.2.83</fastjson.version>
-		<oshi.version>6.1.6</oshi.version>
+		<commons.lang3.version>3.19.0</commons.lang3.version>
 		<commons.io.version>2.19.0</commons.io.version>
-		<commons.fileupload.version>1.4</commons.fileupload.version>
 		<commons.collections.version>4.5.0</commons.collections.version>
-
-		<velocity.version>2.3</velocity.version>
-		<jwt.version>0.9.1</jwt.version>
-		<bee.version>1.17</bee.version>
+		<httpclient.version>4.5.14</httpclient.version>
+		<guava.version>33.3.1-jre</guava.version>
 	</properties>
 
 	<!-- 依赖声明 -->
@@ -53,12 +47,7 @@
 				<version>${druid.version}</version>
 			</dependency>
 
-			<!-- SpringBoot集成mybatis框架 -->
-			<!--<dependency>
-				<groupId>org.mybatis.spring.boot</groupId>
-				<artifactId>mybatis-spring-boot-starter</artifactId>
-				<version>${mybatis-spring-boot.version}</version>
-			</dependency>-->
+			<!-- SpringBoot集成mybatis-plus框架 -->
 			<dependency>
 				<groupId>com.baomidou</groupId>
 				<artifactId>mybatis-plus-boot-starter</artifactId>
@@ -91,18 +80,10 @@
 				<version>${commons.io.version}</version>
 			</dependency>
 
-			<!-- 文件上传工具类 -->
-			<dependency>
-				<groupId>commons-fileupload</groupId>
-				<artifactId>commons-fileupload</artifactId>
-				<version>${commons.fileupload.version}</version>
-			</dependency>
-
-			<!-- excel工具 -->
 			<dependency>
-				<groupId>org.apache.poi</groupId>
-				<artifactId>poi-ooxml</artifactId>
-				<version>${poi.version}</version>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-lang3</artifactId>
+				<version>${commons.lang3.version}</version>
 			</dependency>
 
 			<!-- collections工具类 -->
@@ -119,27 +100,22 @@
 				<version>${fastjson.version}</version>
 			</dependency>
 
-			<!-- Token生成与解析 -->
-			<!--<dependency>
-				<groupId>io.jsonwebtoken</groupId>
-				<artifactId>jjwt</artifactId>
-				<version>${jwt.version}</version>
-			</dependency>-->
-
-			<!-- 验证码 -->
-			<dependency>
-				<groupId>com.github.penggle</groupId>
-				<artifactId>kaptcha</artifactId>
-				<version>${kaptcha.version}</version>
-			</dependency>
-
 			<!-- 拍卖模块 -->
 			<dependency>
 				<groupId>cn.hobbystocks</groupId>
 				<artifactId>lot</artifactId>
 				<version>${hobbystocks.version}</version>
 			</dependency>
-
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>${httpclient.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>${guava.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>