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/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index 34636d8..ac29261 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 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