Merge remote-tracking branch 'origin/master'

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<BaseCategory> queryWrapper = new LambdaQueryWrapper<BaseCategory>()
+                .eq(BaseCategory::getCode,code);
+        List<BaseCategory> list = baseCategoryService.list(queryWrapper);
+        return success(list.isEmpty()?null:list.get(0));
+    }
+
     /**
      * 新增分类树-各种分类属性结构
      */

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.*;
-import com.ruoyi.member.service.IMemberCardService;
+import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.member.service.IMemberCouponService;
-import com.ruoyi.member.service.IMemberUserService;
 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<BusiNoticeMapper,BusiNoti
 
     @Autowired
     private IMemberCouponService memberCouponService;
+    @Autowired
+    private IMemberPointsService memberPointsService;
+    @Autowired
+    private ISysConfigService configService;
 
     @Override
     public IPage<BusiNoticeVo> queryListPage(BusiNoticeQuery query, Page<BusiNotice> page) {
@@ -128,6 +131,16 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
                 //删除结尾的最后一个逗号
                 data.setSimilarityIds(data.getSimilarityIds().substring(0, data.getSimilarityIds().length() - 1));
             }
+            if(data.getApprovalStatus().equals("1")){
+                //如果审核通过
+                //从配置表中获取积分
+                MemberPoints memberPoints =new MemberPoints();
+                memberPoints.setUserId(SecurityUtils.getUserId());
+                memberPoints.setType("1");
+                memberPoints.setTitle("用户签到，送积分");
+                memberPoints.setFromCode("fbgg");
+                memberPointsService.savePoints(memberPoints);
+            }
             this.save(data);
         }
         //保存表单数据
@@ -259,6 +272,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
      * @param publishTakeDown 1发布0下架
      */
     @Override
+    @Transactional
     public void publishTakeDown(String noticeId, String publishTakeDown) {
         BusiNotice data = this.getById(noticeId);
         if (publishTakeDown.equals("1")){
@@ -284,6 +298,13 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
                 //删除结尾的最后一个逗号
                 data.setSimilarityIds(data.getSimilarityIds().substring(0, data.getSimilarityIds().length() - 1));
             }
+            //如果审核通过
+            MemberPoints memberPoints =new MemberPoints();
+            memberPoints.setUserId(SecurityUtils.getUserId());
+            memberPoints.setType("1");
+            memberPoints.setTitle("用户签到，送积分");
+            memberPoints.setFromCode("fbgg");
+            memberPointsService.savePoints(memberPoints);
 
         }else {
             //如果是关闭 关闭状态

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<MemberPointsMapper, MemberPoints> implements IMemberPointsService {
     @Autowired
     private MemberPointsMapper memberPointsMapper;
+    @Autowired
+    private IBaseCategoryService categoryService;
 
 
     /**
@@ -50,6 +54,12 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
      **/
     @Override
     public void savePoints(MemberPoints memberPoints) {
+        if(memberPoints.getFromCode() != null){
+            List<BaseCategory> categoryList = categoryService.selectByCode(memberPoints.getFromCode());
+            BaseCategory category = categoryList.get(0);
+            memberPoints.setPoints(Integer.parseInt(category.getContent()));
+            memberPoints.setTitle(category.getTitle());
+        }
         //查询当前用户最近变动记录
         LambdaQueryWrapper<MemberPoints> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0)
@@ -62,7 +72,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
         } else {
             //如果有记录则取最新记录中的剩余值进行计算后得出新值
             Integer oldBalance = list.get(0).getBalance();
-            Integer newBalance;
+            int newBalance;
             if ("1".equals(memberPoints.getType())) {
                 newBalance = oldBalance + memberPoints.getPoints();
             } else {

ruoyi-admin/src/main/resources/application.yml

@@ -143,7 +143,7 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
-# 微信小程序配置----dl
+# 微信小程序配置----多点通告
 wx-app:
   appId: wxd96fda6510adb6d3
   appSecret: 2d3bf7172d09966bd98e1611117c2cb0