From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
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 c795cc2..202703d 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,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.system.api.constant.ConfigEnum;
+import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.poji.config.Activeness;
import com.ruoyi.system.api.domain.vo.AppOtherConfigGetVo;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
@@ -64,6 +66,9 @@
@Resource
private StaffSuggestService staffSuggestService;
+
+ @Resource
+ private RedisService redisService;
/**
* @param key
@@ -257,30 +262,39 @@
customConfig.setCreateTime(updateTime);
customConfig.setUpdateTime(updateTime);
switch (configEnum) {
+ //分享小程序可获得积分
case SHARE_INTEGRAL:
customConfig.setConfigValue(mgtOtherConfigEditDto.getShareIntegral().toString());
this.saveOrUpdate(customConfig);
break;
+ //平台建议可获得积分
case SUGGEST_PLATFORM_INTEGRAL:
customConfig.setConfigValue(mgtOtherConfigEditDto.getSuggestPlatformIntegral().toString());
this.saveOrUpdate(customConfig);
break;
+ //每日签到可获得积分
case SIGN_IN_INTEGRAL:
customConfig.setConfigValue(mgtOtherConfigEditDto.getSignInIntegral().toString());
this.saveOrUpdate(customConfig);
break;
+ //门店建议可获得积分
case SUGGEST_SHOP_INTEGRAL:
customConfig.setConfigValue(mgtOtherConfigEditDto.getSuggestShopIntegral().toString());
this.saveOrUpdate(customConfig);
break;
+ //C端订单自动取消时间
case ORDER_AUTO_CANCEL_TIME:
customConfig.setConfigValue(mgtOtherConfigEditDto.getOrderAutoCancelTime().toString());
+ redisService.setCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME,mgtOtherConfigEditDto.getOrderAutoCancelTime());
this.saveOrUpdate(customConfig);
break;
+ //购物满1元可获得积分
case PAY_MONEY_INTEGRAL:
customConfig.setConfigValue(mgtOtherConfigEditDto.getPayMoneyIntegral().toString());
+ redisService.setCacheObject(SecurityConstant.PAY_MONEY_INTEGRAL,mgtOtherConfigEditDto.getPayMoneyIntegral());
this.saveOrUpdate(customConfig);
break;
+ //首页风格
case HOME_STYLE:
customConfig.setConfigValue(mgtOtherConfigEditDto.getHomeStyle().toString());
this.saveOrUpdate(customConfig);
@@ -325,8 +339,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
case "SHOP_FOLLOW_TYPE":
newValue = mgtShopConfigEditDto.getShopFollowType();
@@ -334,8 +348,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
case "SHOP_CUSTOM_STATUS":
newValue = mgtShopConfigEditDto.getShopCustomStatus();
@@ -343,8 +357,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
case "SHOP_SOURCE_CHANNEL":
newValue = mgtShopConfigEditDto.getShopSourceChannel();
@@ -352,8 +366,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
default:
break;
@@ -403,8 +417,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
case "MEMBER_CHARACTER":
newValue = mgtMemberConfigEditDto.getMemberCharacter();
@@ -412,8 +426,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
case "MEMBER_LEVEL":
newValue = mgtMemberConfigEditDto.getMemberLevel();
@@ -421,8 +435,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
case "MEMBER_TYPE":
newValue = mgtMemberConfigEditDto.getMemberType();
@@ -430,8 +444,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
case "NURSE_PROBLEM":
newValue = mgtMemberConfigEditDto.getNurseProblem();
@@ -439,8 +453,8 @@
customConfig.setUpdateTime(updateTime);
if(oldValue!=null&&!oldValue.isEmpty()){
handleChangeConfig(oldValue, newValue, key);
- updatedCustomConfigs.add(customConfig);
}
+ updatedCustomConfigs.add(customConfig);
break;
default:
break;
@@ -533,6 +547,18 @@
}
/**
+ * @description
+ * @author jqs
+ * @date 2023/7/13 15:52
+ * @param
+ * @return List<String>
+ */
+ @Override
+ public List<String> listOperTitle(){
+ return customConfigMapper.listOperTitle();
+ }
+
+ /**
* @description 获取单个自定义配置
* @author jqs
* @date 2023/6/9 15:40
@@ -568,13 +594,13 @@
MgtBulletinBoardVo mgtBulletinBoardVoCustom = recommendCooperationService.boardMemberTotal();
mgtBulletinBoardVo.setCustomTotal(mgtBulletinBoardVoCustom.getCustomTotal());
mgtBulletinBoardVo.setCustomToday(mgtBulletinBoardVoCustom.getCustomToday());
+ mgtBulletinBoardVo.setFollowUserToday(mgtBulletinBoardVoCustom.getFollowUserToday());
// 获取店铺信息
MgtBulletinBoardVo mgtBulletinBoardVoShop = remoteShopService.boardShopTotal().getData();
mgtBulletinBoardVo.setShopTotal(mgtBulletinBoardVoShop.getShopTotal());
mgtBulletinBoardVo.setAgencyTotal(mgtBulletinBoardVoShop.getAgencyTotal());
mgtBulletinBoardVo.setDealerTotal(mgtBulletinBoardVoShop.getDealerTotal());
mgtBulletinBoardVo.setFollowShopToday(mgtBulletinBoardVoShop.getFollowShopToday());
- mgtBulletinBoardVo.setFollowUserToday(0);
// 获取订单信息
MgtBulletinBoardVo mgtBulletinBoardVoOrder = remoteOrderService.boardOrderTotal().getData();
mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
--
Gitblit v1.7.1