From bb58e108a9da48d84b84d30b73c01106dd642550 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期三, 02 八月 2023 19:58:49 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 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 f25a3be..303589a 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 @@ -110,6 +110,33 @@ } /** + * @description 修改客服二维码 + * @author jqs + * @date 2023/7/25 16:17 + * @param mgtServiceCodeEditDto + * @return void + */ + @Override + public void editServiceCode(MgtServiceCodeEditDto mgtServiceCodeEditDto){ + // 获取平台服务电话的配置 + CustomConfig customConfig = getByKey(ConfigEnum.PLATFORM_SERVICE_CODE.getKey()); + // 如果配置不存在,则创建一个新的配置 + if (customConfig == null) { + customConfig = new CustomConfig(); + customConfig.setCreateTime(new Date()); + customConfig.setDelFlag(0); + } + // 设置配置的类型、键、名称、值和更新时间 + customConfig.setConfigType(ConfigEnum.PLATFORM_SERVICE_CODE.getKeyType()); + customConfig.setConfigKey(ConfigEnum.PLATFORM_SERVICE_CODE.getKey()); + customConfig.setConfigName(ConfigEnum.PLATFORM_SERVICE_CODE.getKeyName()); + customConfig.setConfigValue(mgtServiceCodeEditDto.getServiceCodeUrl()); + customConfig.setUpdateTime(new Date()); + // 保存或更新配置 + this.saveOrUpdate(customConfig); + } + + /** * @param * @return MgtCustomConfigVo * @description 平台获取自定义配置 @@ -186,6 +213,7 @@ mgtAllCustomConfigVo.setHomeLogo(advert.getLogoUrl()); mgtAllCustomConfigVo.setAdUrl(advert.getAdUrl()); mgtAllCustomConfigVo.setTargetType(advert.getTargetType()); + mgtAllCustomConfigVo.setLinkType(advert.getLinkType()); mgtAllCustomConfigVo.setLinkUrl(advert.getLinkUrl()); mgtAllCustomConfigVo.setJumpType(advert.getJumpType()); mgtAllCustomConfigVo.setJumpId(advert.getJumpId()); @@ -339,8 +367,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(); @@ -348,8 +376,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(); @@ -357,8 +385,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(); @@ -366,8 +394,8 @@ customConfig.setUpdateTime(updateTime); if(oldValue!=null&&!oldValue.isEmpty()){ handleChangeConfig(oldValue, newValue, key); - updatedCustomConfigs.add(customConfig); } + updatedCustomConfigs.add(customConfig); break; default: break; @@ -417,8 +445,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(); @@ -426,8 +454,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(); @@ -435,8 +463,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(); @@ -444,8 +472,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(); @@ -453,8 +481,8 @@ customConfig.setUpdateTime(updateTime); if(oldValue!=null&&!oldValue.isEmpty()){ handleChangeConfig(oldValue, newValue, key); - updatedCustomConfigs.add(customConfig); } + updatedCustomConfigs.add(customConfig); break; default: break; @@ -547,6 +575,18 @@ } /** + * @description 删除日志 + * @author jqs + * @date 2023/8/1 19:39 + * @param + * @return void + */ + @Override + public void deleteOperlog(){ + customConfigMapper.deleteOperlog(); + } + + /** * @description * @author jqs * @date 2023/7/13 15:52 @@ -594,13 +634,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