From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
index f20fe70..f59fe7f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
@@ -11,10 +11,7 @@
import com.doumee.dao.business.BannerMapper;
import com.doumee.dao.business.LabelsMapper;
import com.doumee.dao.business.join.BannerJoinMapper;
-import com.doumee.dao.business.model.Areas;
-import com.doumee.dao.business.model.Banner;
-import com.doumee.dao.business.model.Goods;
-import com.doumee.dao.business.model.Labels;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.web.dto.ArticleDTO;
import com.doumee.dao.web.dto.BannerDTO;
import com.doumee.dao.web.dto.LabelsBannerDTO;
@@ -188,7 +185,8 @@
@Override
public List<BannerDTO> findShopBanner() {
Banner banner = new Banner();
- banner.setPosition(Constants.TWO);
+ banner.setPosition(Constants.ZERO);
+ banner.setIsdeleted(Constants.ZERO);
QueryWrapper<Banner> wrapper = new QueryWrapper<>(banner);
wrapper.lambda().orderByDesc(Banner::getSortnum);
List<Banner> banners = bannerMapper.selectList(wrapper);
@@ -197,9 +195,6 @@
BannerDTO dto = new BannerDTO();
BeanUtils.copyProperties(s, dto);
dto.setImgurl(path + s.getImgurl());
- if (Constants.equalsInteger(dto.getType(),Constants.ZERO)){
- dto.setContent(null);
- }
return dto;
}).collect(Collectors.toList());
return collect;
@@ -290,6 +285,16 @@
@Override
+ public void updateStatus(Banner coupon) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(coupon.getId()==null||coupon.getStatus()==null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
+ }
+ coupon.setEditor(user.getId());
+ coupon.setEditDate(new Date());
+ bannerMapper.updateById(coupon);
+ }
+ @Override
public PageData<ShopSimpleDTO> findRecommendShopPage(PageWrap<Banner> pageWrap) {
IPage<Banner> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Banner> queryWrapper = new QueryWrapper<>();
--
Gitblit v1.9.3