gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java

@@ -51,27 +51,16 @@ public class AppLoginController {
     public R<?> register(@RequestBody RegisterForm registerForm) {
         AppUser appUser = appUserService.selectAppUserByPhone(registerForm.getPhoneNumber());
         AppRegister register = appRegisterService.selectAppRegisterByphone(registerForm.getPhoneNumber());
-
         Assert.notNull(registerForm.getSchoolId(), "学校id不能为空");
         Assert.isNull(appUser, "手机号已注册");
-
+        Assert.isNull(register, "手机号已提交审核，请勿多次提交");
-        if (register != null && register.getStatus() != null) {
+//        if (StringUtils.isNotEmpty(registerForm.getEmail())) {
-
+//
-
+//        }
-                switch (register.getStatus()) {
-                    case 0:
-                        return R.fail(201, "注册失败，您的账号正在审核中！");
-                    case 1:
-                        return R.fail(201, "您的账号已通过");
-                    case 2:
-                        return R.fail(201, "注册失败，您的账号已被驳回！");
-                }
-        }
-
         AppRegister appRegister = setAppRegister(registerForm);
         appRegister.setInvitationCode(registerForm.getInvitationCode());
         int i = appRegisterService.insertAppRegister(appRegister);
-
+//        redisService.deleteObject(registerForm.getPhoneNumber());
         Assert.isTrue(i > 0, "注册失败");
         return R.ok(null,"注册成功,请等待审核结果！");
     }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java

@@ -96,10 +96,10 @@ public class AppRegisterController extends BaseController
         return toAjax(appRegisterService.passAppRegister(id));
     }
 
-    @PostMapping("/reject")
+    @GetMapping("/reject")
-    public AjaxResult reject(@RequestBody AppRegister appRegister)
+    public AjaxResult reject(@RequestParam("id") Long id)
     {
-        return toAjax(appRegisterService.rejectAppRegister(appRegister));
+        return toAjax(appRegisterService.rejectAppRegister(id));
     }
 
 }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java

@@ -41,6 +41,4 @@ public class AppUserDataVo
 
     @Excel(name = "粉丝数量")
     private long fansNum;
-
-    private Long userId;
 }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java

@@ -1,6 +1,5 @@
 package com.ruoyi.app.form;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,7 +34,4 @@ public class RegisterForm {
 
     @ApiModelProperty("学校证明")
     private String prove;
-
-    @JsonIgnore
-    private Integer status;
 }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java

@@ -62,7 +62,7 @@ public interface IAppRegisterService
 
     int passAppRegister(Long id);
 
-    int rejectAppRegister( AppRegister appRegister);
+    int rejectAppRegister(Long id);
 
 
     AppRegister selectAppRegisterByphone(String phoneNumber);

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java

@@ -10,7 +10,6 @@ import com.ruoyi.app.domain.vo.AppRegisterVo;
 import com.ruoyi.app.mapper.AppSchoolMapper;
 import com.ruoyi.app.mapper.AppUserMapper;
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -138,15 +137,12 @@ public class AppRegisterServiceImpl implements IAppRegisterService
     }
 
     @Override
-    public int rejectAppRegister(AppRegister appRegister) {
+    public int rejectAppRegister(Long id) {
-        AppRegister register = appRegisterMapper.selectAppRegisterById(appRegister.getId());
+        AppRegister appRegister = appRegisterMapper.selectAppRegisterById(id);
-        Assert.isTrue(register != null, "该申请不存在");
+        Assert.isTrue(appRegister != null, "该申请不存在");
-        assert register != null;
+        assert appRegister != null;
         Assert.isTrue(appRegister.getStatus() == 0, "该申请已驳回");
-        if (StringUtils.isNotEmpty(appRegister.getRemark())) {
+        appRegister.setStatus(2);
-            register.setStatus(appRegister.getStatus());
-            register.setRemark(appRegister.getRemark());
-        }
         appRegister.setUpdateTime(DateUtils.getNowDate());
         return appRegisterMapper.updateAppRegister(appRegister);
     }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java

@@ -177,9 +177,8 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
 
             AppUserCollect appUserCollect = new AppUserCollect();
             appUserCollect.setDynamicId(id);
-            appUserCollect.setUserId(appUserDynamic.getAppId());
             List<AppUserCollect> appUserCollects = appUserCollectMapper.selectAppUserCollectList(appUserCollect);
-            if (CollectionUtils.isEmpty(appUserCollects)) {
+            if (CollectionUtils.isNotEmpty(appUserCollects)){
                 appUserDynamicVo.setIsCollect(1);
             }
 

gan-ui/src/api/app/dynamic.js

@@ -1,14 +1,5 @@
 import request from '@/utils/request'
 
-
-// 查询App用户动态列表
-export function treeDynamic(query) {
-  return request({
-    url: '/app/comment/treeList',
-    method: 'get',
-    params: query
-  })
-}
 // 查询App用户动态列表
 export function listDynamic(query) {
   return request({

gan-ui/src/api/app/register.js

@@ -17,11 +17,11 @@ export function passRegister(id) {
   })
 }
 
-export function rejectRegister(data) {
+export function rejectRegister(id) {
   return request({
     url: '/app/register/reject',
-    data: data,
+    params: { id: id },
-    method: 'post'
+    method: 'get'
   })
 }
 

gan-ui/src/views/app/dynamic/detail.vue

@@ -1,6 +0,0 @@
-<!-- 动态详情 -->
-<template>
-  <div>
-    这是动态详情页面
-  </div>
-</template>

gan-ui/src/views/app/dynamic/index.vue

@@ -72,36 +72,20 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dynamicList"  @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dynamicList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="id" />
       <el-table-column label="用户名" align="center" prop="username" />
-      <el-table-column label="关联话题" align="center">
+<!--      <el-table-column label="内容" align="center" prop="content" />-->
-        <template slot-scope="scope">
+      <el-table-column label="视频地址" align="center" prop="videoUrl" />
-      <el-tag v-for="(topic, index) in scope.row.appTopicList" :key="index">
+      <el-table-column label="关联话题" align="center" prop="topicId" />
-        {{ topic.name }}
+      <el-table-column label="地区" align="center" prop="address" />
-      </el-tag>
+      <el-table-column label="隐私状态" align="center" prop="privacyStatus" />
-        </template>
+      <el-table-column label="备注" align="center" prop="remark" />
-      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="地区" align="center" prop="cityName" />
+      <el-table-column label="是否置顶" align="center" prop="isTop" />
-      <el-table-column label="置顶" align="center" key="isTop" prop="isTop">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.isTop"
-            active-value="0"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
-            inactive-value="1"
-          ></el-switch>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleDetail(scope.row)"
-          >详情</el-button>
           <el-button
             size="mini"
             type="text"
@@ -162,7 +146,7 @@
 </template>
 
 <script>
-import { listDynamic, getDynamic, delDynamic, addDynamic, updateDynamic , treeDynamic } from "@/api/app/dynamic";
+import { listDynamic, getDynamic, delDynamic, addDynamic, updateDynamic } from "@/api/app/dynamic";
 
 export default {
   name: "Dynamic",
@@ -199,9 +183,6 @@ export default {
         updateBy: null,
         isTop: null
       },
-      treeParam: {
-        dynamicId:''
-      },
       // 表单参数
       form: {},
       // 表单校验
@@ -262,22 +243,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 详情按钮操作  跳转到新页面*/
-    handleDetail(row) {
-      const id = row.id || row.ids;
-
-      this.$router.push({path: '/app/dynamic/detail'});
-      this.queryParams.dynamicId = id;
-      treeDynamic(this.queryParams).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "App用户动态详情";
-      });
-
-
-
-
-     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();

gan-ui/src/views/app/register/index.vue

@@ -139,7 +139,7 @@
       <el-table-column label="地址" align="center" prop="address"/>
       <el-table-column label="学校" align="center" prop="schoolName"/>
       <el-table-column label="邮箱" align="center" prop="email"/>
-      <el-table-column label="操作" align="center" prop="status" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" prop="status">
         <template slot-scope="scope">
 <!--          状态为0时显示 为1时显示已通过，为2时显示已驳回并且不可点击-->
           <el-button
@@ -171,25 +171,18 @@
             size="mini"
             type="error"
             icon="el-icon-finished"
-            @click="handleUpdate(scope.row)"
+            @click="handleReject(scope.row)"
           >驳回
           </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="error"-->
+<!--            icon="el-icon-finished"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
-          <el-form-item label="驳回原因" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入驳回原因" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-    </el-dialog>
-
 
     <pagination
       v-show="total>0"
@@ -249,11 +242,8 @@ export default {
       },
       // 表单参数
       form: {},
-      // 驳回原因
-      rejectForm: {},
       // 表单校验
       rules: {},
-      showDialog: false,
       schoolOptions: []
     };
   },
@@ -335,9 +325,8 @@ export default {
       const id = row.id || this.ids
       getRegister(id).then(response => {
         this.form = response.data;
-        this.form.status  = 2;
         this.open = true;
-        this.title = "驳回审核";
+        this.title = "修改注册审核";
       });
     },
     /** 提交按钮 */