拍卖会，拍品管理添加参数说明

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

@@ -58,7 +58,7 @@ public class AuctionController extends AdminBaseController {
 	/**
 	 * 新增保存拍卖会
 	 */
-	@ApiOperation(value = "新增保存拍卖会", notes = "新增保存拍卖会", response = AjaxResult.class, responseContainer = "int")
+	@ApiOperation(value = "新增拍卖会", notes = "新增保存拍卖会", response = AjaxResult.class, responseContainer = "int")
 	@PostMapping("/add")
 	public AjaxResult addSave(@RequestBody AuctionDTO auctionDTO) {
         UserInfo simpleUserInfo = UserUtils.getSimpleUserInfo();

bid/src/main/java/cn/hobbystocks/auc/web/LocalController.java

@@ -10,6 +10,7 @@ import cn.hobbystocks.auc.dto.LotDTO;
 import cn.hobbystocks.auc.handle.context.tradition.TraditionRule;
 import cn.hobbystocks.auc.service.IBidService;
 import cn.hobbystocks.auc.service.ILotService;
+import cn.hobbystocks.auc.service.IOrderService;
 import cn.hobbystocks.auc.vo.LotGroupDTO;
 import cn.hobbystocks.auc.vo.LotGroupVO;
 import com.alibaba.fastjson.JSON;
@@ -35,6 +36,8 @@ public class LocalController {
     private ILotService lotService;
     @Autowired
     private IBidService bidService;
+    @Autowired
+    private IOrderService orderService;
 
     @ApiOperation(value = "查询拍品是否正在竞拍",notes = "检查拍品ID数组的拍卖是否正在进行")
     @PostMapping("/lot/status")
@@ -65,10 +68,10 @@ public class LocalController {
     public AjaxResult callback(@PathVariable("orderNo") String orderNo,@PathVariable("status") Long status){
         //根据orderId更新order状态
         Order order = Order.builder().orderNo(orderNo).status(status).build();
-        /*int num = orderStatusService.modifyOrder(order);
+        int num = orderService.modifyOrder(order);
         if (num>0){
             return AjaxResult.success("请求成功");
-        }*/
+        }
         return AjaxResult.error("更新状态失败");
     }
     @ApiOperation(value = "出价记录查询",notes = "根据出价id查询当前出价是否中标")

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

@@ -46,11 +46,12 @@ public class Constants {
     // 拍卖会
     public static final String REDIS_AUC_PREFIX = "MAP:AUC:PUB:*";
 
-    // 传统拍 + 延迟拍
+    // 标准延时
     public static final String AUC_RULE_TYPE_TRADITIONAL_DELAY = "traditional_delay";
 
-    // 传统拍 + 延迟拍 + v2
+    // 重置延时
     public static final String AUC_RULE_TYPE_TRADITIONAL_DELAY_V2 = "traditional_delay_v2";
+    //增价拍卖
     public static final String AUC_RULE_TYPE_TRADITIONAL_DELAY_V3 = "traditional_delay_v3";
 
 	//拍品状态未开始

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -16,6 +18,7 @@ import lombok.ToString;
 @Data
 @ToString
 @TableName("auction")
+@ApiModel("拍卖会")
 public class Auction extends BaseEntity {
     private static final long serialVersionUID = 1L;
     //拍卖会id
@@ -24,47 +27,62 @@ public class Auction extends BaseEntity {
     private Long id;
 //拍卖会名称
     @TableField("name")
+    @ApiModelProperty("拍卖会名称")
     private String name;
 //拍卖会种类：1、标准拍卖；2、直播拍卖；3、混合拍卖
     @TableField("type")
+    @ApiModelProperty("拍卖会种类：1、标准拍卖；2、直播拍卖；3、混合拍卖")
     private Integer type;
 //拍卖会封面
     @TableField("imgs")
+    @ApiModelProperty("拍卖会封面")
     private String imgs;
 //拍卖会banner
     @TableField("banner")
+    @ApiModelProperty("拍卖会banner")
     private String banner;
 //    保证金（元）
     @TableField("deposit")
+    @ApiModelProperty("保证金（元）")
     private Long deposit;
 //    服务费（%）
     @TableField("service_tariff")
+    @ApiModelProperty("服务费（%）")
     private BigDecimal serviceTariff;
 //    中拍支付时限（天）
     @TableField("pay_time_limit")
+    @ApiModelProperty("中拍支付时限（天）")
     private Integer payTimeLimit;
 //    拍卖会介绍
     @TableField("description")
+    @ApiModelProperty("拍卖会介绍")
     private String description;
     @TableField("pub_status")
+    @ApiModelProperty("发布状态")
     private Integer pubStatus;
     @TableField("pub_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("发布时间")
     private Date pubTime;
     @TableField("status")
+    @ApiModelProperty("拍卖会状态：Waiting 未开始，")
     private String status;
 //拍卖会开始时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("start_time")
+    @ApiModelProperty("拍卖会开始时间")
     private Date startTime;
     //拍卖会结束时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("end_time")
+    @ApiModelProperty("拍卖会结束时间")
     private Date endTime;
     @TableField("del_flag")
     private Integer delFlag;
     //商家id
+    @ApiModelProperty("商家id")
     private Long merchantId;
     //排序
+    @ApiModelProperty("排序，值越大排名越靠前")
     private Integer sort;
 }

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

@@ -9,6 +9,9 @@ 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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import nonapi.io.github.classgraph.json.Id;
 
@@ -20,6 +23,7 @@ import javax.validation.constraints.NotBlank;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName("lot")
+@ApiModel("拍品")
 public class Lot extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -29,134 +33,166 @@ public class Lot extends BaseEntity
 
     /** 商品ID */
     @NotBlank(message = "goodsId is empty")
+    @ApiModelProperty("商品id")
     private String goodsId;
-
+    @ApiModelProperty("商品名称")
     private String goodsName;
 
-    @NotBlank(message = "goodsType is empty")
+    @ApiModelProperty("商品类型：默认sku")
     private String goodsType;
 
     /** 拍卖会ID */
+    @ApiModelProperty("拍卖会id")
     private Long auctionId;
 
     /** 拍品名称 */
+    @ApiModelProperty("拍品名称")
     private String name;
-
+    @ApiModelProperty("商家id")
     private Long merchantId;
-
+    @ApiModelProperty("商家名称")
     private String merchantName;
-
+    @ApiModelProperty("商家头像")
     private String merchantAvatar;
 
     /** 拍品数量 */
+    @ApiModelProperty("拍品数量")
     private Long num;
 
     /** 数量单位 */
+    @ApiModelProperty("数量单位")
     private String unit;
 
     /** 拍品图片 */
+    @ApiModelProperty("拍品图片")
     private String imgs;
 
     /** 轮播图片 */
+    @ApiModelProperty("轮播图片")
     private String carouselImgs;
 
     /** 拍品介绍 */
+    @ApiModelProperty("拍品介绍")
     private String detail;
 
     /** 是否发布（0:未发布;1:已发布） */
+    @ApiModelProperty("是否发布（0:未发布;1:已发布）")
     private Integer pubStatus;
 
     /** 发布时间 */
+    @ApiModelProperty("发布时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @View(type = 1)
     private Date pubTime;
 
     /** 拍卖状态（Waiting:未开始;Starting:开启中;Bidding:进行中;Finished:拍卖结束;Cancelled:撤拍;Pass:流拍;Sold:成交） */
+    @ApiModelProperty("拍卖状态（Waiting:未开始;Starting:开启中;Bidding:进行中;Finished:拍卖结束;Cancelled:撤拍;Pass:流拍;Sold:成交）")
     private String status;
 
     /** 拍卖开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("拍卖开始时间")
     private Date startTime;
 
     /** 拍卖结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("拍卖结束时间")
     private Date endTime;
 
     /** 实际结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("实际结束时间")
     private Date realEndTime;
 
     /** 规则类型 */
+    @ApiModelProperty("规则类型：traditional_delay；标准延时，traditional_delay_v2：重置延时，traditional_delay_v3：增价拍卖")
     private String ruleType;
 
     /** 规则内容 */
     @View(type = 1)
+    @ApiModelProperty("规则内容")
     private String ruleContent;
 
     /** 最新出价 */
+    @ApiModelProperty("最新出价")
     private BigDecimal lastPrice;
 
     /** 最新出价时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("最新出价时间")
     private Date lastPriceTime;
 
     /** 成交价 */
+    @ApiModelProperty("成交价")
     private BigDecimal dealPrice;
 
     /** 成交时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("成交时间")
     private Date dealTime;
 
     /** 成交用户id */
+    @ApiModelProperty("成交用户id")
     private String dealAccountId;
 
     /** 成交用户 */
     @Sensitive(type = 1)
+    @ApiModelProperty("成交用户")
     private String dealAccount;
 
     /** 成交用户avatar */
+    @ApiModelProperty("成交用户avatar")
     private String dealAccountavatar;
 
     /** 已支付 */
+    @ApiModelProperty("已支付")
     private Long paid;
 
     /** 订单id */
+    @ApiModelProperty("订单id")
     private String orderId;
 
     /** 出价次数 */
+    @ApiModelProperty("出价次数")
     private Long bidCount;
 
     /** 出价人数 */
+    @ApiModelProperty("出价人数")
     private Long bidPersionCount;
 
     /** 0:未删除;1:已删除 */
+    @ApiModelProperty("删除标识：0:未删除;1:已删除")
     private Integer delFlag;
 
     /** 排序 */
+    @ApiModelProperty("排序")
     private Integer sort;
 
     /** 是否是私域 0 不是  1 是 */
+    @ApiModelProperty("是否是私域 0 不是  1 是")
     private Integer privateDomain;
 
     private String delayPublish;
-
+    @ApiModelProperty("是否自动续期：0、否，1、是")
     private Integer delay;
-
+    @ApiModelProperty("")
     private BigDecimal manualReturnPoint;
-
+    @ApiModelProperty("")
     private Long groupId;
 
-
+    @ApiModelProperty("是否匿名：")
     private Integer anonymous;
 
 
     private Long lotFansId;
     //    保证金（元）
     @TableField("deposit")
+    @ApiModelProperty("保证金（元）")
     private Long deposit;
     //    服务费（%）
     @TableField("service_tariff")
+    @ApiModelProperty("服务费（%）")
     private BigDecimal serviceTariff;
-
+    @ApiModelProperty("中拍支付时限（小时）")
     private Integer payTimeLimit;
 }

lot/src/main/java/cn/hobbystocks/auc/vo/AuctionVO.java

@@ -1,11 +1,12 @@
 package cn.hobbystocks.auc.vo;
 
 import cn.hobbystocks.auc.domain.Auction;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class AuctionVO extends Auction implements InData {
-
+    @ApiModelProperty("是否发布拍卖会下所有拍品")
     private Boolean pubLots = false;
 
 }