修复Bug

safe-campus-moment/src/main/resources/mapper/BbsMomentCommentMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 c.parent_id IS NULL
             </if>
             <if test="comment.momentContent != null and comment.momentContent != ''">
-                AND m.content LIKE CONCAT('%', #{comment.momentContent}, '%')
+                AND c.content LIKE CONCAT('%', #{comment.momentContent}, '%')
             </if>
             <if test="comment.nickName != null and comment.nickName != ''">
                 AND c.nick_name LIKE CONCAT('%', #{comment.nickName}, '%')

safe-campus-moment/src/main/resources/mapper/BbsMomentMapper.xml

@@ -20,10 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 m.content LIKE CONCAT('%', #{moment.content}, '%')
             </if>
             <if test="moment.params.startTime != null and moment.params.startTime != ''">
-                AND DATE_FORMAT(create_time, '%Y-%m-%d') >= #{moment.params.startTime}
+                AND DATE_FORMAT(m.create_time, '%Y-%m-%d') >= #{moment.params.startTime}
             </if>
             <if test="moment.params.endTime != null and moment.params.endTime != ''">
-                AND DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{moment.params.endTime}
+                AND DATE_FORMAT(m.create_time, '%Y-%m-%d') &lt;= #{moment.params.endTime}
             </if>
         </where>
         ORDER BY

safe-campus-points/src/main/java/com/tangguo/controller/BbsPointsSettingController.java

@@ -5,6 +5,7 @@ import com.tangguo.common.core.controller.BaseController;
 import com.tangguo.common.core.domain.AjaxResult;
 import com.tangguo.common.enums.BusinessType;
 import com.tangguo.domain.BbsPointsSetting;
+import com.tangguo.enums.PointsSettingType;
 import com.tangguo.service.IBbsPointsSettingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +13,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -72,13 +74,32 @@ public class BbsPointsSettingController extends BaseController {
 	@ApiOperation("修改积分规则配置")
 	@PreAuthorize("@ss.hasPermi('points:points:edit')")
 	@Log(title = "积分规则配置", businessType = BusinessType.UPDATE)
-	@PutMapping("/status")
+	@PutMapping
 	public AjaxResult edit(@RequestBody BbsPointsSetting setting) {
 		this.bbsPointsSettingService.editSetting(setting);
 		return AjaxResult.success();
 	}
 
 
+	/**
+	 * 修改积分规则配置
+	 */
+	@ApiOperation("修改积分规则配置")
+	@PreAuthorize("@ss.hasPermi('points:points:edit')")
+	@Log(title = "积分规则配置", businessType = BusinessType.UPDATE)
+	@PutMapping("/batch")
+	public AjaxResult batchEdit(@RequestBody Map<String, List<BbsPointsSetting>> pointMap) {
+		List<BbsPointsSetting> adds = pointMap.get(PointsSettingType.ADD.name());
+		List<BbsPointsSetting> decs = pointMap.get(PointsSettingType.DEC.name());
+		List<BbsPointsSetting> upds = new ArrayList<>(15);
+		upds.addAll(adds);
+		upds.addAll(decs);
+		this.bbsPointsSettingService.batchEditSetting(upds);
+		return AjaxResult.success();
+	}
+
+
+
 	/**
 	 * 删除积分规则配置
 	 */

safe-campus-points/src/main/java/com/tangguo/domain/BbsUserPoints.java

@@ -98,4 +98,10 @@ public class BbsUserPoints extends BaseEntity {
 	@TableField(exist = false)
 	private Integer incrOrDecrPoints;
 
+	/**
+	 * 备注
+	 */
+	@TableField(exist = false)
+	private String remarks;
+
 }

safe-campus-points/src/main/java/com/tangguo/service/IBbsPointsSettingService.java

@@ -56,6 +56,14 @@ public interface IBbsPointsSettingService extends IService<BbsPointsSetting> {
     void editSetting(BbsPointsSetting setting);
 
 
+    /**
+     * 修改积分配置
+     *
+     * @param settings 积分配置
+     */
+    void batchEditSetting(List<BbsPointsSetting> settings);
+
+
     /**
      * 删除积分配置
      *

safe-campus-points/src/main/java/com/tangguo/service/impl/BbsPointsSettingServiceImpl.java

@@ -14,6 +14,7 @@ import com.tangguo.service.IBbsPointsSettingService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -158,6 +159,28 @@ public class BbsPointsSettingServiceImpl extends ServiceImpl<BbsPointsSettingMap
     }
 
 
+    /**
+     * 修改积分配置
+     *
+     * @param settings 积分配置
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void batchEditSetting(List<BbsPointsSetting> settings) {
+         List<BbsPointsSetting> updSettings = new ArrayList<>(settings.size());
+        for (BbsPointsSetting setting : settings) {
+            BbsPointsSetting updSetting = new BbsPointsSetting();
+            updSetting.setId(setting.getId());
+            updSetting.setOperatePoints(setting.getOperatePoints());
+            updSetting.setLimitCount(setting.getLimitCount());
+            updSetting.setEnableStatus(setting.getEnableStatus());
+            updSettings.add(updSetting);
+        }
+        this.updateBatchById(updSettings);
+        this.initCachePointsSetting();
+    }
+
+
     /**
      * 删除积分配置
      *

safe-campus-points/src/main/java/com/tangguo/service/impl/BbsUserPointsServiceImpl.java

@@ -128,7 +128,8 @@ public class BbsUserPointsServiceImpl extends ServiceImpl<BbsUserPointsMapper, B
         detail.setUserName(userName);
         detail.setDetailPoints(points.getIncrOrDecrPoints());
         detail.setDetailName("后台手动增加");
-        detail.setDescription(String.format("管理员【%s】后台手动增加用户【%s】积分", SecurityUtils.getUsername(), userName));
+        // detail.setDescription(String.format("管理员【%s】后台手动增加用户【%s】积分", SecurityUtils.getUsername(), userName));
+        detail.setDescription(points.getRemarks());
         this.incrUserPoints(detail);
     }
 
@@ -146,7 +147,8 @@ public class BbsUserPointsServiceImpl extends ServiceImpl<BbsUserPointsMapper, B
         detail.setUserName(userName);
         detail.setDetailPoints(points.getIncrOrDecrPoints());
         detail.setDetailName("后台手动扣减");
-        detail.setDescription(String.format("管理员【%s】后台手动扣减用户【%s】积分", SecurityUtils.getUsername(), userName));
+        // detail.setDescription(String.format("管理员【%s】后台手动扣减用户【%s】积分", SecurityUtils.getUsername(), userName));
+        detail.setDescription(points.getRemarks());
         this.decrUserPoints(detail);
     }