青雲慧改造

renren-admin/src/main/java/io/renren/modules/qmgj/controller/MemberInfoController.java

@@ -185,12 +185,12 @@ public class MemberInfoController {
      */
     @RequestMapping("/getCardNo")
     public R getCardNo() {
-        String CARDNO = "WJ" + GetVIPNoTool.getRandomFileName();
+        String CARDNO = "QYH" + GetVIPNoTool.getRandomFileName();
         boolean falg = false;
         while (!falg) {
             MemberInfoEntity memberInfoEntity = memberInfoService.selectByCardNo(CARDNO);
             if (memberInfoEntity != null) {
-                CARDNO = "WJ" + GetVIPNoTool.getRandomFileName();
+                CARDNO = "QYH" + GetVIPNoTool.getRandomFileName();
                 falg = false;
             } else {
                 falg = true;

renren-admin/src/main/java/io/renren/modules/qmjz/entity/bo/TaskManageBo.java

@@ -29,4 +29,10 @@ public class TaskManageBo {
      */
     @ApiModelProperty(value="任务状态（1. 开启 0关闭）",required = false)
     private String taskStatus;
+
+    /**
+     * 任务类型(1单次任务 2每日任务 3不限次任务)
+     */
+    @ApiModelProperty(value="任务类型(1单次任务 2每日任务 3不限次任务)",required = false)
+    private Integer taskType;
 }

renren-admin/src/main/java/io/renren/modules/qmjz/service/TaskManageService.java

@@ -31,4 +31,6 @@ public interface TaskManageService extends IService<TaskManage>{
     R ApiList();
 
     boolean add(TaskManageBo bo);
+
+    TaskManage getByTaskName(String taskName);
 }

renren-admin/src/main/java/io/renren/modules/qmjz/service/impl/TaskManageServiceImpl.java

@@ -2,13 +2,18 @@ package io.renren.modules.qmjz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.renren.common.exception.RRException;
 import io.renren.common.utils.PageUtils;
 import io.renren.common.utils.R;
+import io.renren.modules.qmjz.entity.TaskManage;
 import io.renren.modules.qmjz.entity.bo.TaskManageBo;
+import io.renren.modules.qmjz.mapper.TaskManageMapper;
 import io.renren.modules.qmjz.model.PageQuery;
+import io.renren.modules.qmjz.service.TaskManageService;
 import io.renren.modules.qmjz.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,11 +21,6 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.renren.modules.qmjz.mapper.TaskManageMapper;
-import io.renren.modules.qmjz.entity.TaskManage;
-import io.renren.modules.qmjz.service.TaskManageService;
 @Service
 public class TaskManageServiceImpl extends ServiceImpl<TaskManageMapper, TaskManage> implements TaskManageService{
 
@@ -105,8 +105,25 @@ public class TaskManageServiceImpl extends ServiceImpl<TaskManageMapper, TaskMan
 
     @Override
     public boolean add(TaskManageBo bo) {
+        validateTaskNameExists(bo);
         TaskManage taskManage = new TaskManage();
         BeanUtil.copyProperties(bo,taskManage);
         return taskManageMapper.updateById(taskManage)>0;
     }
+
+    @Override
+    public TaskManage getByTaskName(String taskName) {
+        TaskManage taskManage = taskManageMapper.selectOne(new LambdaQueryWrapper<TaskManage>()
+                .eq(TaskManage::getTaskName, taskName)
+        );
+        return taskManage;
+    }
+
+    private void validateTaskNameExists(TaskManageBo bo) {
+        TaskManage taskManage = this.getByTaskName(bo.getTaskName());
+        if (ObjectUtil.isNotNull(taskManage) && StrUtil.equals(taskManage.getTaskName(), bo.getTaskName())) {
+            throw new RRException("积分任务名称重复");
+        }
+    }
+
 }

renren-admin/src/main/java/io/renren/modules/qyh/entity/NewsEntity.java

@@ -33,7 +33,7 @@ public class NewsEntity implements Serializable {
 	/**
 	 * 发布人
 	 */
-	private Long publishId;
+	private Long publishName;
 
 	/**
 	 * 发布时间

renren-admin/src/main/java/io/renren/modules/qyh/model/dto/NewsDTO.java

@@ -38,7 +38,7 @@ public class NewsDTO implements Serializable {
 	/**
 	 * 发布人
 	 */
-	private Long publishId;
+	private Long publishName;
 
 	/**
 	 * 发布时间

renren-admin/src/main/resources/templates/modules/qmgj/work.html

@@ -291,6 +291,12 @@
                     </select>
                 </div>
             </div>
+            <div class="form-group" v-if="work.isNeedVip===false">
+                <div class="col-sm-2 control-label"><span style="color: red">*</span>非会员所需积分</div>
+                <div class="col-sm-3">
+                    <input type="text" class="form-control" v-model="work.needVipPoints" show-word-limit maxlength="15" placeholder="非会员所需积分"/>
+                </div>
+            </div>
             <div class="form-group">
                 <div class="col-sm-2 control-label"><span style="color: red">*</span>身高要求</div>
                 <div class="col-sm-4">