From 9998a75c199a1099cf1caf6f9229320435166326 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 20 Aug 2025 22:48:56 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A8=E5=B9=BF=E8=90=A5=E9=94=80=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java | 6 ++++++ .../xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java | 4 ++++ .../dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java | 6 ++++++ .../ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java | 1 + xkt/src/main/resources/mapper/AdvertRoundMapper.xml | 1 + 5 files changed, 18 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java index 2e4f4e0be..da723062f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java @@ -25,6 +25,12 @@ public class AdminAdRoundSysInterceptVO { @NotNull(message = "推广轮次ID不能为空") @ApiModelProperty(value = "推广轮次ID", required = true) private Long advertRoundId; + @NotBlank(message = "对象锁符号不能为空") + @ApiModelProperty(value = "对象锁符号", required = true) + private String symbol; + @NotNull(message = "投放状态不能为空") + @ApiModelProperty(value = "投放状态", required = true) + private Integer launchStatus; @NotNull(message = "档口ID不能为空") @ApiModelProperty(value = "档口ID", required = true) private Long storeId; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java index 165e9622f..b3f857778 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -21,6 +23,8 @@ public class AdminAdRoundPageResDTO { private Long advertRoundId; @ApiModelProperty(value = "档口ID") private Long storeId; + @ApiModelProperty(value = "对象锁符号") + private String symbol; @ApiModelProperty(value = "档口名称") private String storeName; @ApiModelProperty(value = "TabID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java index 7d4182c90..0461dc6b4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; @@ -24,6 +26,10 @@ public class AdminAdRoundSysInterceptDTO { private Long advertRoundId; @ApiModelProperty(value = "档口ID") private Long storeId; + @ApiModelProperty(value = "对象锁符号") + private String symbol; + @ApiModelProperty(value = "投放状态") + private Integer launchStatus; @ApiModelProperty(value = "档口名称") private String storeName; @ApiModelProperty(value = "管理员上传推广图") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java index 26ea53109..68b30b970 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java @@ -197,6 +197,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService { // 判断要给档口购买的推广位，该档口是否自己已购买 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(AdvertRound::getAdvertId, advertRound.getAdvertId()).eq(AdvertRound::getRoundId, advertRound.getRoundId()) + .eq(AdvertRound::getSymbol, interceptDTO.getSymbol()).eq(AdvertRound::getLaunchStatus, interceptDTO.getLaunchStatus()) .eq(AdvertRound::getStoreId, interceptDTO.getStoreId()).eq(AdvertRound::getDelFlag, Constants.UNDELETED); // 如果是位置枚举类型，则要加上具体的位置 if (Objects.equals(advertRound.getShowType(), AdShowType.POSITION_ENUM.getValue())) { diff --git a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml index d93af3f59..80010ccb9 100644 --- a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml +++ b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml @@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultType="com.ruoyi.xkt.dto.adminAdvertRound.AdminAdRoundPageResDTO"> SELECT ar.id AS advertRoundId, + ar.symbol, s.id AS storeId, s.store_name, a.tab_id,