From 306c67fe623de2273d70a92ea5faac24c42b1960 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 15:23:35 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 42 ++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java | 35 ++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AgreementService.java | 10 ++
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/domain/vo/MgtBannerPageVo.java | 46 +++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Agreement.java | 14 +-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 8 -
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtAgreementEditDto.java | 22 ++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBannerEditDto.java | 42 ++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/BannerService.java | 23 ++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/BannerMapper.java | 11 ++
11 files changed, 281 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index bde6eb3..53ae5b0 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -1,25 +1,21 @@
package com.ruoyi.shop.service.impl.task;
-import java.util.Date;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
-import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.ShopTask;
import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
-import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
import com.ruoyi.shop.mapper.task.ShopTaskMapper;
import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.service.task.TaskFileService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
index 05c2376..895cc16 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -1,9 +1,16 @@
package com.ruoyi.system.controller.management;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import com.ruoyi.system.domain.dto.MgtAgreementEditDto;
+import com.ruoyi.system.domain.dto.MgtBannerEditDto;
import com.ruoyi.system.domain.dto.MgtCooperationEditDto;
import com.ruoyi.system.domain.dto.MgtServiceMobileEditDto;
+import com.ruoyi.system.domain.vo.MgtBannerPageVo;
+import com.ruoyi.system.service.config.AgreementService;
+import com.ruoyi.system.service.config.BannerService;
import com.ruoyi.system.service.config.CooperationService;
import com.ruoyi.system.service.config.CustomConfigService;
import io.swagger.annotations.Api;
@@ -14,6 +21,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
/**
* @ClassName MgtConfigController
@@ -33,6 +41,11 @@
@Resource
private CooperationService cooperationService;
+ @Resource
+ private AgreementService agreementService;
+
+ @Resource
+ private BannerService bannerService;
@RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
@ApiOperation(value = "修改申请合作")
@@ -52,4 +65,33 @@
return R.ok();
}
+ @RequestMapping(value = "/editAgreement", method = RequestMethod.POST)
+ @ApiOperation(value = "修改协议")
+ public R editAgreement(@RequestBody MgtAgreementEditDto mgtAgreementEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtAgreementEditDto.setUserId(userId);
+ agreementService.editAgreement(mgtAgreementEditDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/editBanner", method = RequestMethod.POST)
+ @ApiOperation(value = "修改banner")
+ public R editBanner(@RequestBody MgtBannerEditDto mgtBannerEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBannerEditDto.setUserId(userId);
+ bannerService.editBanner(mgtBannerEditDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pageBanner", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取banner")
+ public R<Page<MgtBannerPageVo>> pageMerShopRecommend(@RequestBody MgtPageDto mgtPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtPageDto.setUserId(userId);
+ Page<MgtBannerPageVo> page = new Page<>();
+ page.setSize(mgtPageDto.getPageSize());
+ page.setCurrent(mgtPageDto.getPageNum());
+ List<MgtBannerPageVo> mgtBannerPageVoList = bannerService.pageMgtBannerVo(page);
+ return R.ok(page.setRecords(mgtBannerPageVoList));
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtAgreementEditDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtAgreementEditDto.java
new file mode 100644
index 0000000..4a6c13f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtAgreementEditDto.java
@@ -0,0 +1,22 @@
+package com.ruoyi.system.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MgtBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName MgtAgreementEditDto
+ * @Description TODO
+ * @Author jqs
+ * @Date 2023/6/6 14:36
+ * @Version 1.0
+ */
+@Data
+public class MgtAgreementEditDto extends MgtBaseDto {
+
+ @ApiModelProperty(value = "协议类型1用户协议 2隐私协议")
+ private Integer agreementType;
+
+ @ApiModelProperty(value = "协议内容")
+ private String agreementContent;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBannerEditDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBannerEditDto.java
new file mode 100644
index 0000000..069b85f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBannerEditDto.java
@@ -0,0 +1,42 @@
+package com.ruoyi.system.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MgtBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName MgtBannerEditDto
+ * @Description TODO
+ * @Author jqs
+ * @Date 2023/6/6 14:52
+ * @Version 1.0
+ */
+@Data
+public class MgtBannerEditDto extends MgtBaseDto {
+
+ @ApiModelProperty(value = "bannerId 新增不传")
+ private Long bannerId;
+
+ @ApiModelProperty(value = "banner图片")
+ private String bannerUrl;
+
+ @ApiModelProperty(value = "banner位置1.小程序首页")
+ private Integer bannerPosition;
+
+ @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
+ private Integer targetType;
+
+ @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
+ private Integer linkType;
+
+ @ApiModelProperty(value = "链接地址")
+ private String linkUrl;
+
+ @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
+ private Integer jumpType;
+
+ @ApiModelProperty(value = "跳转id")
+ private String jumpId;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Agreement.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Agreement.java
index 56e7a61..3117bdf 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Agreement.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Agreement.java
@@ -1,16 +1,16 @@
package com.ruoyi.system.domain.pojo.config;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -37,7 +37,7 @@
* 删除标记
*/
@TableField("del_flag")
- private String delFlag;
+ private Integer delFlag;
/**
* 协议类型
*/
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtBannerPageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtBannerPageVo.java
new file mode 100644
index 0000000..c7ed3e8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtBannerPageVo.java
@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName MgtBannerEditDto
+ * @Description TODO
+ * @Author jqs
+ * @Date 2023/6/6 14:52
+ * @Version 1.0
+ */
+@Data
+public class MgtBannerPageVo {
+
+ @ApiModelProperty(value = "bannerId")
+ private Long bannerId;
+
+ @ApiModelProperty(value = "banner图片")
+ private String bannerUrl;
+
+ @ApiModelProperty(value = "banner位置1.小程序首页")
+ private Integer bannerPosition;
+
+ @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
+ private Integer targetType;
+
+ @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
+ private Integer linkType;
+
+ @ApiModelProperty(value = "链接地址")
+ private String linkUrl;
+
+ @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
+ private Integer jumpType;
+
+ @ApiModelProperty(value = "跳转id")
+ private String jumpId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/BannerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/BannerMapper.java
index 59a2432..7fb5cd4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/BannerMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/BannerMapper.java
@@ -1,8 +1,10 @@
package com.ruoyi.system.mapper.config;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.domain.pojo.config.Banner;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.vo.AppBannerVo;
+import com.ruoyi.system.domain.vo.MgtBannerPageVo;
import java.util.List;
@@ -21,4 +23,13 @@
* @return
*/
List<AppBannerVo> listHomeBannerVo();
+
+ /**
+ * @description 平台分页获取banner
+ * @author jqs
+ * @date 2023/6/6 15:22
+ * @param page
+ * @return List<MgtBannerPageVo>
+ */
+ List<MgtBannerPageVo> pageMgtBannerVo(Page page);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AgreementService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AgreementService.java
index 8f3d719..a456418 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AgreementService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AgreementService.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.config;
import com.ruoyi.system.domain.dto.AppAgreementDto;
+import com.ruoyi.system.domain.dto.MgtAgreementEditDto;
import com.ruoyi.system.domain.pojo.config.Agreement;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.vo.AppAgreementVo;
@@ -21,4 +22,13 @@
*/
AppAgreementVo getAppAgreement(AppAgreementDto appAgreementDto);
+ /**
+ * @description 修改协议
+ * @author jqs
+ * @date 2023/6/6 14:43
+ * @param mgtAgreementEditDto
+ * @return void
+ */
+ void editAgreement(MgtAgreementEditDto mgtAgreementEditDto);
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/BannerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/BannerService.java
index e30ef9c..b70fde4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/BannerService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/BannerService.java
@@ -1,8 +1,11 @@
package com.ruoyi.system.service.config;
-import com.ruoyi.system.domain.pojo.config.Banner;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.dto.MgtBannerEditDto;
+import com.ruoyi.system.domain.pojo.config.Banner;
import com.ruoyi.system.domain.vo.AppBannerVo;
+import com.ruoyi.system.domain.vo.MgtBannerPageVo;
import java.util.List;
@@ -20,4 +23,22 @@
* @return
*/
List<AppBannerVo> listHomeBannerVo();
+
+ /**
+ * @description 修改banner
+ * @author jqs
+ * @date 2023/6/6 14:58
+ * @param mgtBannerEditDto
+ * @return void
+ */
+ void editBanner(MgtBannerEditDto mgtBannerEditDto);
+
+ /**
+ * @description 平台分页获取banner
+ * @author jqs
+ * @date 2023/6/6 15:22
+ * @param page
+ * @return List<MgtBannerPageVo>
+ */
+ List<MgtBannerPageVo> pageMgtBannerVo(Page page);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java
index 80a7d48..6277b7b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java
@@ -1,16 +1,19 @@
package com.ruoyi.system.service.impl.config;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.domain.dto.AppAgreementDto;
+import com.ruoyi.system.domain.dto.MgtAgreementEditDto;
import com.ruoyi.system.domain.pojo.config.Agreement;
import com.ruoyi.system.domain.vo.AppAgreementVo;
import com.ruoyi.system.mapper.config.AgreementMapper;
import com.ruoyi.system.service.config.AgreementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
/**
* <p>
@@ -22,8 +25,11 @@
*/
@Service
public class AgreementServiceImpl extends ServiceImpl<AgreementMapper, Agreement> implements AgreementService {
+
@Resource
private AgreementMapper agreementMapper;
+
+
/**
* 获取各种协议
@@ -38,4 +44,31 @@
}
return appAgreementVo;
}
+
+ /**
+ * @description 修改协议
+ * @author jqs
+ * @date 2023/6/6 14:43
+ * @param mgtAgreementEditDto
+ * @return void
+ */
+ @Override
+ public void editAgreement(MgtAgreementEditDto mgtAgreementEditDto){
+ // 查询指定类型的协议
+ Agreement agreement = this.getOne(new LambdaQueryWrapper<Agreement>()
+ .eq(Agreement::getDelFlag, 0)
+ .eq(Agreement::getAgreementType,mgtAgreementEditDto.getAgreementType()));
+ // 如果不存在，则创建新的协议
+ if(agreement == null){
+ agreement = new Agreement();
+ agreement.setDelFlag(0);
+ }
+ // 更新协议内容和创建者信息
+ agreement.setAgreementType(mgtAgreementEditDto.getAgreementType());
+ agreement.setAgreementContent(mgtAgreementEditDto.getAgreementContent());
+ agreement.setCreateUserId(mgtAgreementEditDto.getUserId());
+ agreement.setCreateTime(new Date());
+ // 保存或更新协议
+ this.saveOrUpdate(agreement);
+ }
}
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 f111117..ce53732 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
@@ -1,13 +1,18 @@
package com.ruoyi.system.service.impl.config;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.system.domain.dto.MgtBannerEditDto;
import com.ruoyi.system.domain.pojo.config.Banner;
import com.ruoyi.system.domain.vo.AppBannerVo;
+import com.ruoyi.system.domain.vo.MgtBannerPageVo;
import com.ruoyi.system.mapper.config.BannerMapper;
import com.ruoyi.system.service.config.BannerService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -33,4 +38,42 @@
return bannerMapper.listHomeBannerVo();
}
+ /**
+ * @description 修改banner
+ * @author jqs
+ * @date 2023/6/6 14:58
+ * @param mgtBannerEditDto
+ * @return void
+ */
+ @Override
+ public void editBanner(MgtBannerEditDto mgtBannerEditDto) {
+ Banner banner;
+ // 如果横幅ID不为空，则根据ID获取横幅信息
+ if (mgtBannerEditDto.getBannerId() != null) {
+ banner = this.getById(mgtBannerEditDto.getBannerId());
+ } else { // 否则新建一个横幅对象，并设置删除标志为0
+ banner = new Banner();
+ banner.setDelFlag(0);
+ }
+ // 将DTO中的属性值复制到横幅对象中
+ BeanUtils.copyProperties(mgtBannerEditDto, banner);
+ // 设置创建用户ID和创建时间
+ banner.setCreateUserId(mgtBannerEditDto.getUserId());
+ banner.setCreateTime(new Date());
+ // 保存或更新横幅信息
+ this.saveOrUpdate(banner);
+ }
+
+ /**
+ * @description 平台分页获取banner
+ * @author jqs
+ * @date 2023/6/6 15:22
+ * @param page
+ * @return List<MgtBannerPageVo>
+ */
+ @Override
+ public List<MgtBannerPageVo> pageMgtBannerVo(Page page){
+ List<MgtBannerPageVo> mgtBannerPageVoList = bannerMapper.pageMgtBannerVo(page);
+ return mgtBannerPageVoList;
+ }
}
--
Gitblit v1.7.1