From 47c6851ee8f2e42a7effe48b22b4d1e5dc848e0e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 07 六月 2023 17:47:45 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java | 16 ++-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 23 ++++-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtAdvertEditDto.java | 38 +++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java | 7 -
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java | 28 +++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtActivenessEditDto.java | 29 +++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AdvertServiceImpl.java | 37 +++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AdvertService.java | 11 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/Activeness.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java | 6 -
10 files changed, 177 insertions(+), 22 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/Activeness.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/Activeness.java
index 9ae4877..2f810e2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/Activeness.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/Activeness.java
@@ -63,7 +63,7 @@
* 创建用户id
*/
@TableField("create_user_id")
- private Integer createUserId;
+ private Long createUserId;
/**
* 更新时间
*/
@@ -73,7 +73,7 @@
* 更新用户id
*/
@TableField("update_user_id")
- private Integer updateUserId;
+ private Long updateUserId;
@Override
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 2524734..e8e8fdf 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
@@ -48,6 +48,11 @@
@Resource
private QuickEntryService quickEntryService;
+ @Resource
+ private AdvertService advertService;
+
+ @Resource
+ private ActivenessService activenessService;
@RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
@ApiOperation(value = "修改申请合作")
@@ -214,10 +219,20 @@
return R.ok();
}
- @RequestMapping(value = "/editMemberConfig", method = RequestMethod.POST)
- @ApiOperation(value = "修改会员配置")
- public R editMemberConfig(@RequestBody MgtMemberConfigEditDto mgtMemberConfigEditDto) {
- customConfigService.editMemberConfig(mgtMemberConfigEditDto);
+ @RequestMapping(value = "/editAdvert", method = RequestMethod.POST)
+ @ApiOperation(value = "修改广告配置")
+ public R editAdvert(@RequestBody MgtAdvertEditDto mgtAdvertEditDto) {
+ mgtAdvertEditDto.setUserId(SecurityUtils.getUserId());
+ advertService.editMgtAdvert(mgtAdvertEditDto);
return R.ok();
}
+
+ @RequestMapping(value = "/editActiveness", method = RequestMethod.POST)
+ @ApiOperation(value = "修改广告配置")
+ public R editActiveness(@RequestBody MgtActivenessEditDto mgtActivenessEditDto) {
+ mgtActivenessEditDto.setUserId(SecurityUtils.getUserId());
+ activenessService.editMgtActiveness(mgtActivenessEditDto);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtActivenessEditDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtActivenessEditDto.java
new file mode 100644
index 0000000..3065972
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtActivenessEditDto.java
@@ -0,0 +1,29 @@
+package com.ruoyi.system.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MgtBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName MgtActivenessEditDto
+ * @Description TODO
+ * @Author jqs
+ * @Date 2023/6/7 17:40
+ * @Version 1.0
+ */
+@Data
+public class MgtActivenessEditDto extends MgtBaseDto {
+
+ @ApiModelProperty(value = "活跃度id 新增不传")
+ private Long activenessId;
+
+ @ApiModelProperty(value = "活跃度名称")
+ private String activenessName;
+
+ @ApiModelProperty(value = "开始天数")
+ private Integer startDay;
+
+ @ApiModelProperty(value = "结束天数")
+ private Integer endDay;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtAdvertEditDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtAdvertEditDto.java
new file mode 100644
index 0000000..24e8a4a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtAdvertEditDto.java
@@ -0,0 +1,38 @@
+package com.ruoyi.system.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MgtBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName MgtAdvertEditDto
+ * @Description TODO
+ * @Author jqs
+ * @Date 2023/6/7 17:21
+ * @Version 1.0
+ */
+@Data
+public class MgtAdvertEditDto extends MgtBaseDto {
+
+ @ApiModelProperty(value = "首页广告语")
+ private String homeSlogan;
+
+ @ApiModelProperty(value = "首页logo")
+ private String homeLogo;
+
+ @ApiModelProperty(value = "广告图片")
+ private String adUrl;
+
+ @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
+ private Integer targetType;
+
+ @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/service/config/ActivenessService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java
index 5b29db4..580e48f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java
@@ -1,8 +1,8 @@
package com.ruoyi.system.service.config;
-import com.ruoyi.system.api.domain.poji.config.Activeness;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.domain.vo.MgtActivenessVo;
+import com.ruoyi.system.api.domain.poji.config.Activeness;
+import com.ruoyi.system.domain.dto.MgtActivenessEditDto;
import java.util.List;
@@ -22,12 +22,14 @@
*/
List<Activeness> listActiveness();
+
/**
- * @description
+ * @description 修改活跃度
* @author jqs
- * @date 2023/6/7 16:04
- * @param
- * @return List<MgtActivenessVo>
+ * @date 2023/6/7 17:43
+ * @param mgtActivenessEditDto
+ * @return void
*/
- List<MgtActivenessVo> listVo();
+ void editMgtActiveness(MgtActivenessEditDto mgtActivenessEditDto);
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AdvertService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AdvertService.java
index 9eab98f..2494fa2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AdvertService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/AdvertService.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.config;
+import com.ruoyi.system.domain.dto.MgtAdvertEditDto;
import com.ruoyi.system.domain.pojo.config.Advert;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.vo.AppAdvertVo;
@@ -28,4 +29,14 @@
* @return Advert
*/
Advert getAdvert();
+
+
+ /**
+ * @description 修改广告配置
+ * @author jqs
+ * @date \ 17:23
+ * @param mgtAdvertEditDto
+ * @return void
+ */
+ void editMgtAdvert(MgtAdvertEditDto mgtAdvertEditDto);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java
index d87f9a1..2ecccb4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java
@@ -1,10 +1,7 @@
package com.ruoyi.system.service.config;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.domain.dto.MgtMemberConfigEditDto;
-import com.ruoyi.system.domain.dto.MgtOtherConfigEditDto;
-import com.ruoyi.system.domain.dto.MgtServiceMobileEditDto;
-import com.ruoyi.system.domain.dto.MgtShopConfigEditDto;
+import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.pojo.config.CustomConfig;
import com.ruoyi.system.domain.vo.MgtCustomConfigVo;
@@ -71,4 +68,6 @@
* @return void
*/
void editMemberConfig(MgtMemberConfigEditDto mgtMemberConfigEditDto);
+
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
index f2b9040..154aa74 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
@@ -2,12 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.system.api.domain.poji.config.Activeness;
+import com.ruoyi.system.domain.dto.MgtActivenessEditDto;
import com.ruoyi.system.mapper.config.ActivenessMapper;
import com.ruoyi.system.service.config.ActivenessService;
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;
/**
@@ -34,4 +36,30 @@
return activenessList;
}
+ /**
+ * @description 修改活跃度
+ * @author jqs
+ * @date 2023/6/7 17:43
+ * @param mgtActivenessEditDto
+ * @return void
+ */
+ @Override
+ public void editMgtActiveness(MgtActivenessEditDto mgtActivenessEditDto){
+ Activeness activeness;
+ Date updateTime = new Date();
+ if(mgtActivenessEditDto.getActivenessId()!=null){
+ activeness = this.getById(mgtActivenessEditDto.getActivenessId());
+ }else{
+ activeness = new Activeness();
+ activeness.setDelFlag(0);
+ activeness.setCreateUserId(mgtActivenessEditDto.getUserId());
+ activeness.setCreateTime(updateTime);
+ activeness.setUpdateUserId(mgtActivenessEditDto.getUserId());
+ activeness.setUpdateTime(updateTime);
+ }
+ activeness.setActivenessName(mgtActivenessEditDto.getActivenessName());
+ activeness.setStartDay(mgtActivenessEditDto.getStartDay());
+ activeness.setEndDay(mgtActivenessEditDto.getEndDay());
+ this.saveOrUpdate(activeness);
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AdvertServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AdvertServiceImpl.java
index a4b8ae0..4e1b022 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AdvertServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AdvertServiceImpl.java
@@ -1,14 +1,16 @@
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.system.domain.dto.MgtAdvertEditDto;
import com.ruoyi.system.domain.pojo.config.Advert;
import com.ruoyi.system.domain.vo.AppAdvertVo;
import com.ruoyi.system.mapper.config.AdvertMapper;
import com.ruoyi.system.service.config.AdvertService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
/**
* <p>
@@ -45,4 +47,37 @@
Advert advert = this.getOne(new LambdaQueryWrapper<Advert>().eq(Advert::getDelFlag,0),false);
return advert;
}
+
+ /**
+ * @description 修改广告配置
+ * @author jqs
+ * @date \ 17:23
+ * @param mgtAdvertEditDto
+ * @return void
+ */
+ @Override
+ public void editMgtAdvert(MgtAdvertEditDto mgtAdvertEditDto){
+ //删除旧广告配置
+ Advert advert = this.getOne(new LambdaQueryWrapper<Advert>()
+ .eq(Advert::getDelFlag, 0)
+ .orderByDesc(Advert::getAdId)
+ .last("LIMIT 1"), false);
+ if (advert != null) {
+ advert.setDelFlag(1);
+ this.updateById(advert);
+ }
+ //创建新广告配置
+ advert = new Advert();
+ advert.setDelFlag(0);
+ advert.setAdUrl(mgtAdvertEditDto.getAdUrl());
+ advert.setAdContent(mgtAdvertEditDto.getHomeSlogan());
+ advert.setTargetType(mgtAdvertEditDto.getTargetType());
+ advert.setLinkUrl(mgtAdvertEditDto.getLinkUrl());
+ advert.setJumpType(mgtAdvertEditDto.getJumpType());
+ advert.setJumpId(mgtAdvertEditDto.getJumpId());
+ advert.setLogoUrl(mgtAdvertEditDto.getHomeLogo());
+ advert.setCreateTime(new Date());
+ advert.setCreateUserId(mgtAdvertEditDto.getUserId());
+ this.save(advert);
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
index 30c6560..172e252 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
@@ -4,10 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.constant.ConfigEnum;
import com.ruoyi.system.api.domain.poji.config.Activeness;
-import com.ruoyi.system.domain.dto.MgtMemberConfigEditDto;
-import com.ruoyi.system.domain.dto.MgtOtherConfigEditDto;
-import com.ruoyi.system.domain.dto.MgtServiceMobileEditDto;
-import com.ruoyi.system.domain.dto.MgtShopConfigEditDto;
+import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.pojo.config.Advert;
import com.ruoyi.system.domain.pojo.config.CustomConfig;
import com.ruoyi.system.domain.vo.MgtActivenessVo;
@@ -448,4 +445,5 @@
}
+
}
--
Gitblit v1.7.1