From 73694a9560b297b3f5c285ecb6a87d17c5af1fe6 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Fri, 5 Sep 2025 16:32:35 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=8E=A8=E5=B9=BF=E8=90=A5?=
 =?UTF-8?q?=E9=94=80=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/xkt/dto/advertRound/AdvertRoundStorePageResDTO.java  | 3 ++-
 .../com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java     | 1 +
 xkt/src/main/resources/mapper/AdvertRoundMapper.xml            | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdvertRoundStorePageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdvertRoundStorePageResDTO.java
index c449502d4..a9c61556a 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdvertRoundStorePageResDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdvertRoundStorePageResDTO.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -40,7 +41,7 @@ public class AdvertRoundStorePageResDTO {
     @ApiModelProperty(value = "投放结束时间")
     private String endTime;
     @ApiModelProperty(value = "出价")
-    private String payPrice;
+    private BigDecimal payPrice;
     @ApiModelProperty(value = "商品ID")
     private String prodIdStr;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java
index e46826d5b..be0e078a8 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java
@@ -725,6 +725,7 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService {
             throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR);
         }
         PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize());
+        // 过滤掉系统管理员拦截的推广
         List<AdvertRoundStorePageResDTO> list = this.advertRoundMapper.selectStoreAdvertPage(pageDTO);
         List<String> idList = list.stream().map(AdvertRoundStorePageResDTO::getProdIdStr)
                 .filter(StringUtils::isNotBlank).flatMap(str -> StrUtil.split(str, ",").stream())
diff --git a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml
index 80010ccb9..93f79b8b4 100644
--- a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml
+++ b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ar.voucher_date,
             ar.start_time,
             ar.end_time,
-            ar.pay_price,
+            ar.pay_price AS payPrice,
             ar.launch_status,
             ar.bidding_status,
             ar.pic_design_type,
@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN sys_file sf ON ar.pic_id = sf.id
         WHERE
             ar.del_flag = 0
+            AND ar.sys_intercept = 0
             AND ar.store_id = #{storeId}
             AND ar.bidding_status IN
             <foreach item="biddingStatus" collection="biddingStatusList" open="(" separator="," close=")">