Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java

@@ -133,15 +133,15 @@ public class ActivityController extends BaseController {
 //            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "编号id"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Boolean.class, name = "sendSMS", value = "true表示发送短信;false表示不发送短信"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "true表示发送短信;false表示不发送短信"),
     })
     @RequestMapping(value = "/signUp/{id}", method = RequestMethod.DELETE)
     public ResponseBean deleteSignUp(@PathVariable("id") Integer id,
-                                     @RequestParam("sendSMS") Boolean sendSMS,
+                                     @RequestBody String parameter,
                                      HttpSession session) {
 
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTpActivitySignUpService.deleteSignUp(id, sendSMS);
+        responseBean = iTpActivitySignUpService.deleteSignUp(id, parameter);
         return responseBean;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpActivitySignUpService.java

@@ -25,9 +25,9 @@ public interface ITpActivitySignUpService extends IService<TpActivitySignUp> {
     /**
      * 删除 活动人员
      * @param id
-     * @param isSend 是否发送短信
+     * @param parameter
      * @return
      */
-    ResponseBean deleteSignUp(Integer id, Boolean isSend);
+    ResponseBean deleteSignUp(Integer id, String parameter);
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivitySignUpServiceImpl.java

@@ -104,9 +104,12 @@ public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMap
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean deleteSignUp(Integer id, Boolean isSend) {
+    public ResponseBean deleteSignUp(Integer id, String parameter) {
         ResponseBean responseBean = new ResponseBean();
 
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        Boolean sendSMS = jsonObject.getBoolean("sendSMS");
+
         TpActivitySignUp tpActivitySignUp = tpActivitySignUpMapper.selectById(id);
         if (null == tpActivitySignUp) {
             responseBean.addError("该记录不存在!");
@@ -123,8 +126,9 @@ public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMap
 
         // 发送短信
         // TODO 删除成功后, 发送短信通知用户
-        if (isSend) {
+        if (sendSMS) {
             // 开始发送
+
         }
 
         responseBean.addSuccess("操作成功!");

VUECODE/smart-property-manage/src/api/activity.js

@@ -85,10 +85,11 @@ export function getSignUp(data) {
 
 // 删除活动报名人
 export function deleteSignUp(data) {
+  console.log(data)
   return request({
     url: '/signUp/' + data.deleteId,
     method: 'delete',
-    param: {
+    data: {
       sendSMS: data.sendSMS
     }
   })

VUECODE/smart-property-manage/src/views/social/signUp/index.vue

@@ -93,7 +93,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogSMSVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="deleteById">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -201,22 +201,30 @@ export default {
       this.dialogContent = remark
       this.dialogTableVisible = true
     },
-    deleteSignUp(id) {
+    deleteSignUp(id) { // 显示 删除报名人员的弹窗
       this.dialogSMSVisible = true
       this.deleteData.sendSMS = false // 默认不发送
       this.deleteData.deleteId = id
     },
-    deleteById() {
+    deleteById() { // 删除报名人员
+      console.log(this.deleteData.sendSMS, this.deleteData.deleteId)
       // 发送请求
       this.$store.dispatch('DeleteSignUp', this.deleteData).then((res) => {
-
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          // 获取密码
+          this.signUpList()
+          this.deleteData.deleteId = ''
+          return
+        }
+        this.$message.error(res.message)
+        this.deleteData.deleteId = ''
       }).catch(() => {
         console.log('error DeleteSignUp')
       })
-
-      this.deleteData.deleteId = ''
-      // 获取密码
-      this.signUpList()
     }
   }
 }