master：管理员管理推广营销返回数据调整；

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;

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")

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 = "管理员上传推广图")

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

@@ -197,6 +197,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
         // 判断要给档口购买的推广位，该档口是否自己已购买
         LambdaQueryWrapper<AdvertRound> queryWrapper = new LambdaQueryWrapper<AdvertRound>()
                 .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())) {

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,