From b3da9251f8a08cb7ec70ee75b2a7df45423a0f2f Mon Sep 17 00:00:00 2001 From: PQZ Date: Fri, 25 Apr 2025 10:23:36 +0800 Subject: [PATCH 1/3] 1 --- .../member/service/impl/MemberPointsServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java index cf3a3a8..245a9c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.base.domain.BaseCategory; +import com.ruoyi.base.service.IBaseCategoryService; import com.ruoyi.common.config.DlRightsConfig; import com.ruoyi.common.core.domain.DlBaseEntity; import com.ruoyi.member.domain.MemberPoints; @@ -25,6 +27,8 @@ import java.util.List; public class MemberPointsServiceImpl extends ServiceImpl implements IMemberPointsService { @Autowired private MemberPointsMapper memberPointsMapper; + @Autowired + private IBaseCategoryService categoryService; /** @@ -50,6 +54,12 @@ public class MemberPointsServiceImpl extends ServiceImpl categoryList = categoryService.selectByCode(memberPoints.getFromCode()); + BaseCategory category = categoryList.get(0); + memberPoints.setPoints(Integer.parseInt(category.getContent())); + memberPoints.setTitle(category.getTitle()); + } //查询当前用户最近变动记录 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0) @@ -62,7 +72,7 @@ public class MemberPointsServiceImpl extends ServiceImpl Date: Fri, 25 Apr 2025 10:37:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=9A=E5=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BusiNoticeServiceImpl.java | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index c0d895e..8a5b550 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -33,11 +33,10 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.busi.query.BusiNoticeQuery; import com.ruoyi.constant.DictConstants; import com.ruoyi.member.domain.MemberApply; +import com.ruoyi.member.domain.MemberPoints; import com.ruoyi.member.domain.MemberUser; -import com.ruoyi.member.service.IMemberApplyService; -import com.ruoyi.member.service.IMemberCardService; -import com.ruoyi.member.service.IMemberCouponService; -import com.ruoyi.member.service.IMemberUserService; +import com.ruoyi.member.service.*; +import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysUserService; @@ -86,6 +85,10 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryListPage(BusiNoticeQuery query, Page page) { @@ -128,6 +131,16 @@ public class BusiNoticeServiceImpl extends ServiceImpl Date: Fri, 25 Apr 2025 11:35:35 +0800 Subject: [PATCH 3/3] 1 --- .../ruoyi/base/controller/BaseCategoryController.java | 11 +++++++++++ ruoyi-admin/src/main/resources/application.yml | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCategoryController.java index f30c115..1edcb81 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCategoryController.java @@ -95,6 +95,17 @@ public class BaseCategoryController extends BaseController { return success(baseCategoryService.getById(id)); } + /** + * 获取分类树-根据code查询 + */ + @GetMapping(value = "/getByCodeInfo") + public AjaxResult getByCodeInfo(@RequestParam("code") String code) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(BaseCategory::getCode,code); + List list = baseCategoryService.list(queryWrapper); + return success(list.isEmpty()?null:list.get(0)); + } + /** * 新增分类树-各种分类属性结构 */ diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index b96116a..98a2088 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -143,10 +143,10 @@ xss: excludes: /system/notice # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* -# 微信小程序配置----dl +# 微信小程序配置----多点通告 wx-app: - appId: wxd8ef44a8268672e4 - appSecret: 30c18855ceb0ab0f9801407c998199c2 + appId: wxd96fda6510adb6d3 + appSecret: 2d3bf7172d09966bd98e1611117c2cb0 wxpay: #微信公众号appid appId: wx7d10b0fa4886a583