master ：档口推广营销调优；

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRoundRecord/AdvertRoundRecordPageVO.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author liujiang
@@ -15,7 +16,7 @@ import java.util.Date;
  * @date 2025/3/27 15:12
  */
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("档口竞价失败列表入参")
+@ApiModel
 @Data
 public class AdvertRoundRecordPageVO extends BasePageVO {
 
@@ -26,9 +27,21 @@ public class AdvertRoundRecordPageVO extends BasePageVO {
     private Long platformId;
     @ApiModelProperty(value = "推广类型")
     private Integer typeId;
+    @ApiModelProperty(value = "投放状态")
+    private Integer launchStatus;
+    @NotNull(message = "竞价状态不能为空!")
+    @ApiModelProperty(value = "竞价状态 只传3", required = true)
+    private List<Integer> biddingStatusList;
+    @ApiModelProperty(value = "图片是否设置 1 未设置 2已设置")
+    private Integer picSetType;
+    @ApiModelProperty(value = "图片设计 1自主设计、2平台设计")
+    private Integer picDesignType;
+    @ApiModelProperty(value = "图片审核状态 1 待审核 2 审核通过  3 审核驳回")
+    private Integer picAuditStatus;
     @ApiModelProperty(value = "投放开始时间")
     private Date startTime;
     @ApiModelProperty(value = "投放结束时间")
     private Date endTime;
 
+
 }

sql/ry_20240629.sql

@@ -146,7 +146,6 @@ CREATE TABLE `advert_round_record`
     `bidding_temp_status` int UNSIGNED NULL DEFAULT NULL COMMENT '竞价成功',
     `pic_audit_status`    int UNSIGNED NULL DEFAULT NULL COMMENT '图片审核状态（待审核、审核通过、审核驳回）',
     `reject_reason`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核驳回理由',
-    `pic_set`             int UNSIGNED NULL DEFAULT NULL COMMENT '图片是否已设置',
     `pic_id`              bigint UNSIGNED NULL DEFAULT NULL COMMENT '图片ID',
     `prod_id_str`         varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品ID字符串',
     `pic_design_type`     int UNSIGNED NULL DEFAULT NULL COMMENT '图片设计（自主设计、平台设计）',

xkt/src/main/java/com/ruoyi/xkt/dto/advertRoundRecord/AdvertRoundRecordPageDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author liujiang
@@ -24,6 +25,16 @@ public class AdvertRoundRecordPageDTO extends BasePageDTO {
     private Long platformId;
     @ApiModelProperty(value = "推广类型")
     private Integer typeId;
+    @ApiModelProperty(value = "投放状态")
+    private Integer launchStatus;
+    @ApiModelProperty(value = "竞价状态 只传3")
+    private List<Integer> biddingStatusList;
+    @ApiModelProperty(value = "图片是否设置 1 未设置 2已设置")
+    private Integer picSetType;
+    @ApiModelProperty(value = "图片设计 1自主设计、2平台设计")
+    private Integer picDesignType;
+    @ApiModelProperty(value = "图片审核状态 1 待审核 2 审核通过  3 审核驳回")
+    private Integer picAuditStatus;
     @ApiModelProperty(value = "投放开始时间")
     private Date startTime;
     @ApiModelProperty(value = "投放结束时间")

xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java

@@ -97,7 +97,6 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService {
                 .forEach((typeId, roundList) -> roundList
                         // 初始化  锁资源对象
                         .forEach(round -> advertLockMap.putIfAbsent(round.getSymbol(), new Object())));
-        System.err.println(advertLockMap);
     }
 
     /**

xkt/src/main/resources/mapper/AdvertRoundRecordMapper.xml

@@ -22,13 +22,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             JOIN advert a ON arr.advert_id = a.id
         WHERE
             arr.del_flag = 0
+            AND arr.sys_intercept = 0
             AND arr.store_id = #{storeId}
+            AND arr.bidding_status IN
+            <foreach item="biddingStatus" collection="biddingStatusList" open="(" separator="," close=")">
+                #{biddingStatus}
+            </foreach>
             <if test="platformId != null "> and a.platform_id = #{platformId}</if>
             <if test="typeId != null "> and arr.type_id = #{typeId}</if>
+            <if test="launchStatus != null "> and arr.launch_status = #{launchStatus}</if>
+            <if test="picSetType != null "> and arr.pic_set_type = #{picSetType}</if>
+            <if test="picDesignType != null "> and arr.pic_design_type = #{picDesignType}</if>
+            <if test="picAuditStatus != null "> and arr.pic_audit_status = #{picAuditStatus}</if>
             <if test="startTime != null "> and arr.start_time &gt;= #{startTime}</if>
             <if test="endTime != null "> and arr.end_time &lt;= #{endTime}</if>
         ORDER BY
-            arr.start_time
+            arr.launch_status
     </select>