|
@@ -9,10 +9,14 @@ import com.zhongzheng.modules.base.bo.ActivityAdvertisingAddBo;
|
|
|
import com.zhongzheng.modules.base.bo.ActivityAdvertisingEditBo;
|
|
import com.zhongzheng.modules.base.bo.ActivityAdvertisingEditBo;
|
|
|
import com.zhongzheng.modules.base.bo.ActivityAdvertisingQueryBo;
|
|
import com.zhongzheng.modules.base.bo.ActivityAdvertisingQueryBo;
|
|
|
import com.zhongzheng.modules.base.domain.ActivityAdvertising;
|
|
import com.zhongzheng.modules.base.domain.ActivityAdvertising;
|
|
|
|
|
+import com.zhongzheng.modules.base.domain.ActivityAdvertisingLocation;
|
|
|
import com.zhongzheng.modules.base.domain.Certificate;
|
|
import com.zhongzheng.modules.base.domain.Certificate;
|
|
|
import com.zhongzheng.modules.base.mapper.ActivityAdvertisingMapper;
|
|
import com.zhongzheng.modules.base.mapper.ActivityAdvertisingMapper;
|
|
|
|
|
+import com.zhongzheng.modules.base.service.IActivityAdvertisingLocationService;
|
|
|
import com.zhongzheng.modules.base.service.IActivityAdvertisingService;
|
|
import com.zhongzheng.modules.base.service.IActivityAdvertisingService;
|
|
|
|
|
+import com.zhongzheng.modules.base.service.IApplyAreasService;
|
|
|
import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
|
|
import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
|
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
@@ -33,6 +37,9 @@ import java.util.stream.Collectors;
|
|
|
@Service
|
|
@Service
|
|
|
public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertisingMapper, ActivityAdvertising> implements IActivityAdvertisingService {
|
|
public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertisingMapper, ActivityAdvertising> implements IActivityAdvertisingService {
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private IActivityAdvertisingLocationService iActivityAdvertisingLocationService;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public ActivityAdvertisingVo queryById(Long id){
|
|
public ActivityAdvertisingVo queryById(Long id){
|
|
|
ActivityAdvertising db = this.baseMapper.selectById(id);
|
|
ActivityAdvertising db = this.baseMapper.selectById(id);
|
|
@@ -115,6 +122,12 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
|
|
|
.eq(ActivityAdvertising::getAdvName,entity.getAdvName()).ne(ActivityAdvertising::getStatus,-1)
|
|
.eq(ActivityAdvertising::getAdvName,entity.getAdvName()).ne(ActivityAdvertising::getStatus,-1)
|
|
|
.last("limit 1"));
|
|
.last("limit 1"));
|
|
|
if (Validator.isNotNull(info)) {
|
|
if (Validator.isNotNull(info)) {
|
|
|
|
|
+ ActivityAdvertisingLocation location = iActivityAdvertisingLocationService.getOne(new LambdaQueryWrapper<ActivityAdvertisingLocation>()
|
|
|
|
|
+ .eq(ActivityAdvertisingLocation::getLocationId,info.getLocationId()).ne(ActivityAdvertisingLocation::getStatus,-1)
|
|
|
|
|
+ .last("limit 1"));
|
|
|
|
|
+ if(Validator.isEmpty(location)){
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
if(Validator.isNotEmpty(entity.getId())){
|
|
if(Validator.isNotEmpty(entity.getId())){
|
|
|
if(entity.getId().longValue() != info.getId().longValue()){
|
|
if(entity.getId().longValue() != info.getId().longValue()){
|
|
|
return true;
|
|
return true;
|