From 57c69219eb101c5ecc577a77882febf0cded1aed Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 30 六月 2025 11:02:18 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml | 3 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/BannerServiceImpl.java | 43 ---------------------
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java | 17 --------
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtSelectGoodsPageDto.java | 3 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 8 ++--
5 files changed, 11 insertions(+), 63 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtSelectGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtSelectGoodsPageDto.java
index e8b7616..6d69576 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtSelectGoodsPageDto.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtSelectGoodsPageDto.java
@@ -22,4 +22,7 @@
@ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
private Integer goodsType;
+
+ @ApiModelProperty(value = "商品分类id")
+ private String goodsClassId;
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 7b39e7e..e2cb612 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -468,6 +468,9 @@
<if test="param.goodsNo != null and param.goodsNo != ''">
AND goods_no LIKE CONCAT('%',#{param.goodsNo},'%')
</if>
+ <if test="param.goodsClassId != null and param.goodsClassId != ''">
+ AND goods_class_id LIKE CONCAT('%',#{param.goodsClassId},'%')
+ </if>
</select>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index 25a399c..19c74a2 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
@@ -27,10 +28,7 @@
import javax.annotation.Resource;
import java.time.format.DateTimeFormatter;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -48,6 +46,7 @@
@Resource
private ShopService shopService;
+
@Resource
private ShopCertificateService shopCertificateService;
@@ -223,6 +222,7 @@
@ApiOperation(value = "门店添加不可预约时间段【2.0】")
public R addShopNonAppointableTime(@RequestBody ShopNonAppointableTimeDto dto) {
ShopNonAppointableTime shopNonAppointableTime = new ShopNonAppointableTime();
+ shopNonAppointableTime.setId(IdUtils.simpleUUID());
shopNonAppointableTime.setShopId(dto.getShopId());
shopNonAppointableTime.setNonAppointableStartTime(dto.getNonAppointableStartTime());
shopNonAppointableTime.setNonAppointableEndTime(dto.getNonAppointableEndTime());
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/BannerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/BannerServiceImpl.java
index fec7ace..3d44bd1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/BannerServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/BannerServiceImpl.java
@@ -59,31 +59,6 @@
}
// 将DTO中的属性值复制到横幅对象中
BeanUtils.copyProperties(mgtBannerEditDto, banner);
- if(banner.getTargetType()==1){
- //外链
- if (banner.getLinkType()==1){
- //外链-链接
- banner.setJumpType(null);
- banner.setJumpId(null);
- banner.setAppid(null);
- }else{
- //外链-小程序
- banner.setJumpType(null);
- banner.setJumpId(null);
- }
- }else if(banner.getTargetType()==2){
- if(banner.getLinkType()==1){
- banner.setJumpType(null);
- banner.setJumpId(null);
- }else{
- banner.setLinkUrl(null);
- }
- }else if(banner.getTargetType()==3){
- banner.setLinkUrl(null);
- banner.setLinkType(null);
- banner.setJumpType(null);
- banner.setJumpId(null);
- }
// 设置创建用户ID和创建时间
banner.setCreateUserId(mgtBannerEditDto.getUserId());
banner.setCreateTime(new Date());
@@ -114,23 +89,7 @@
@Override
public MgtBannerGetVo getMgtBanner(Long bannerId){
Banner banner = this.getById(bannerId);
- if(banner.getTargetType()==1){
- banner.setJumpType(null);
- banner.setJumpId(null);
- banner.setLinkType(null);
- }else if(banner.getTargetType()==2){
- if(banner.getLinkType()==1){
- banner.setJumpType(null);
- banner.setJumpId(null);
- }else{
- banner.setLinkUrl(null);
- }
- }else if(banner.getTargetType()==3){
- banner.setLinkUrl(null);
- banner.setLinkType(null);
- banner.setJumpType(null);
- banner.setJumpId(null);
- }
+
MgtBannerGetVo mgtBannerGetVo = new MgtBannerGetVo();
BeanUtils.copyProperties(banner, mgtBannerGetVo);
return mgtBannerGetVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
index b88451e..d49f958 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
@@ -88,23 +88,6 @@
@Override
public MgtPopGetVo getMgtPop(Long popId){
Pop pop = this.getById(popId);
- if(pop.getTargetType()==1){
- pop.setJumpType(null);
- pop.setJumpId(null);
- pop.setLinkType(null);
- }else if(pop.getTargetType()==2){
- if(pop.getLinkType()==1){
- pop.setJumpType(null);
- pop.setJumpId(null);
- }else{
- pop.setLinkUrl(null);
- }
- }else if(pop.getTargetType()==3){
- pop.setLinkUrl(null);
- pop.setLinkType(null);
- pop.setJumpType(null);
- pop.setJumpId(null);
- }
MgtPopGetVo mgtPopGetVo = new MgtPopGetVo();
BeanUtils.copyProperties(pop, mgtPopGetVo);
return mgtPopGetVo;
--
Gitblit v1.7.1