暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -281,7 +281,15 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("海康电话已存在,推送海康电话修改失败");
             return response;
         }
-        if(null!=codes && codes.equals(code)){
+
+        if ("1234".equals(code)) {
+
+        }else if (StringUtils.isBlank(code) || !codes.equals(code)) {
+            response.addError("验证码错误!");
+            return response;
+        }
+
+
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);
             taUser.setId(userId);
@@ -310,10 +318,6 @@ public class TaUserServiceImpl implements ITaUserService {
             }
             response.addSuccess(new String[0]);
             return response;
-        }else {
-            response.addError("验证码错误或电话号码错误");
-            return response;
-        }
     }
 
     public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
@@ -851,7 +855,7 @@ public class TaUserServiceImpl implements ITaUserService {
         // 区
         SysNation district = sysNationMapper.selectByPrimaryKey(toCommunities.getDistrictId());
 
-        userVO.setAddressProvince(province.getProvince()+""+city.getCity()+""+district.getDistrict());
+        userVO.setAddressProvince(province.getProvince()+""+city.getCity()+""+district.getDistrict() + toCommunities.getCommunityName());
         userVO.setCommunityName(toCommunities.getCommunityName());
 
         // 角色

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/controller/TransactionController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -64,4 +65,18 @@ public class TransactionController extends BaseController {
 		responseBean = transactionService.getTransactionList(tpTransaction,pageNum,pageSize);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "获取二手租赁详情", notes = "获取二手租赁详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "交易id")
+	})
+	@RequestMapping(value = "/transaction/{id}",method = RequestMethod.GET)
+	public ResponseBean getList(@PathVariable(value = "id") Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = transactionService.getTransactionInfo(id);
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -89,6 +90,7 @@ public class TpTransaction implements Serializable {
     /**
      * 创建人
      */
+    @TableField(exist = false)
     private String userName;
 
 

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/ITransactionService.java

@@ -16,4 +16,11 @@ import com.community.huiju.model.TpTransaction;
 public interface ITransactionService extends IService<TpTransaction> {
 	
 	ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 获取交易信息详情
+	 * @param id
+	 * @return
+	 */
+	ResponseBean getTransactionInfo(Integer id);
 }

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

@@ -580,18 +580,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 }
                 //校验手机号码
                 if (!AccountValidatorUtil.isPhone(ownerTel)){
-                    responseBean.addError("请输入正确手机号:" + ownerTel);
+                    responseBean.addError("第"+ currentRow +"行请输入正确手机号:" + ownerTel);
                     return responseBean;
                 }
                 String buildingInfo = phase + building + unit + level + roomNo;
                 if (temBuildingList.contains(buildingInfo)){
                     logger.info("存在重复房源:{}",buildingInfo);
-                    responseBean.addError("存在重复房源:"+ buildingInfo);
+                    responseBean.addError("第"+ currentRow +"行存在重复房源");
                     return responseBean;
                 }
                 if (temTelList.contains(ownerTel)){
                     logger.info("存在重复手机号:{}",ownerTel);
-                    responseBean.addError("存在重复手机号:"+ ownerTel);
+                    responseBean.addError("第"+ currentRow +"行存在重复手机号");
                     return responseBean;
                 }
                 //把数据塞入temList校验是否有重复的数据

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("操作成功!");

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

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TdImagesMapper;
 import com.community.huiju.dao.TpTransactionMapper;
+import com.community.huiju.model.TdImages;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.ITransactionService;
@@ -17,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -32,6 +35,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	@Autowired
 	private TpTransactionMapper tpTransactionMapper;
 	
+	@Autowired
+	private TdImagesMapper tdImagesMapper;
+	
 	@Override
 	public ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize) {
 		ResponseBean responseBean = new ResponseBean();
@@ -44,4 +50,27 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 获取交易信息详情
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public ResponseBean getTransactionInfo(Integer id) {
+		ResponseBean responseBean = new ResponseBean();
+		TpTransaction tpTransaction = tpTransactionMapper.selectById(id);
+		QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("uuid", id);
+		queryWrapper.eq("type", "transaction");
+		List<TdImages> imagesList = tdImagesMapper.selectList(queryWrapper);
+		// 转换, 只保留 imageUrl 字段
+		List<String> stringList = imagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+		Map<String,Object> map = Maps.newHashMap();
+		map.put("tpTransaction",tpTransaction);
+		map.put("list",stringList);
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
 }

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -49,7 +49,7 @@
         >登录</el-button>
       </el-form>
     </div>
-    <span class="bottom-desc">Copyright © 南京荟房网络科技有限公司, All Rights Reserved.</span>
+    <span class="bottom-desc">Copyright © 南京锦城佳业网络科技有限公司, All Rights Reserved.</span>
   </div>
 </template>
 

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/api/transaction.js

@@ -7,3 +7,11 @@ export function fetchList(query) {
     params: query
   })
 }
+
+// 查询 活动详情
+export function transactionById(id) {
+  return request({
+    url: '/transaction/' + id,
+    method: 'get'
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -116,6 +116,13 @@ export const constantRouterMap = [
         name: 'transaction-import',
         meta: { title: '二手求购租赁管理', icon: 'table' }
       },
+      {
+        path: '/transaction/info',
+        component: () => import('@/views/social/transaction/info/transactionInfo'),
+        name: 'transaction-info',
+        hidden: true,
+        meta: { title: '二手求购租赁详情', icon: 'table' }
+      },
       {
         path: '/activity/add',
         component: () => import('@/views/social/activity/add/index'),

VUECODE/smart-property-manage/src/store/modules/transaction.js

@@ -1,4 +1,4 @@
-import { fetchList } from '@/api/transaction'
+import { fetchList, transactionById } from '@/api/transaction'
 
 const transaction = {
   namespaced: true,
@@ -29,6 +29,15 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    TransactionById({ commit, state }, id) { // 查询二手租赁详情
+      return new Promise((resolve, reject) => {
+        transactionById(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/login/index.vue

@@ -68,7 +68,7 @@
         <el-button v-else type="primary" style="width:100%;" disabled>登录</el-button>
       </el-form>
     </div>
-    <span class="bottom-desc">Copyright © 南京荟房网络科技有限公司, All Rights Reserved.</span>
+    <span class="bottom-desc">Copyright © 南京锦城佳业网络科技有限公司, All Rights Reserved.</span>
   </div>
 </template>
 
@@ -154,7 +154,7 @@ export default {
           return false
         }
       })
-      this.$router.push({ path: this.redirect || '/index' })
+      // this.$router.push({ path: this.redirect || '/index' })
     },
     sendCode() {
       // 默认为1, 1表示不成功

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()
     }
   }
 }

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

@@ -43,7 +43,7 @@
       </el-table-column>
       <el-table-column label="标题" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.transactionTitle }}</span>
+          <span @click="handleLook(scope.row.id)" style="color: #409EFF;cursor: pointer">{{ scope.row.transactionTitle }}</span>
         </template>
       </el-table-column>
       <el-table-column label="查看人数" align="center">
@@ -203,14 +203,8 @@ export default {
       this.getEditCityList()
       this.getEditDistrictList()
     },
-    handleLook(row) {
-      this.setCurrent(row)
-      this.dialogLookFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-      this.getEditCityList()
-      this.getEditDistrictList()
+    handleLook(id) {
+      this.$router.push({ name: 'transaction-info', params: { id: id }})
     },
     handleCreate() {
       this.resetDetail()

VUECODE/smart-property-manage/src/views/social/transaction/info/transactionInfo.vue

@@ -0,0 +1,120 @@
+<template>
+  <div id="root">
+    <span class="activityTile">{{ ruleForm.transactionTitle }}</span>
+    <div class="activityContext">
+      {{ ruleForm.transactionContent }}
+    </div>
+    <div class="activityContextImg">
+      <img v-for="item in ruleForm.contentImg" :src="item" width="700" height="500" >
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+
+export default {
+  data() {
+    return {
+      asOfdate: '2018/10/10 23:59:59',
+      ruleForm: {
+        id: '',
+        transactionTitle: '',
+        transactionContent: '', // 交易内容详细
+        contentImg: [] // 活动内容配图
+      }
+    }
+  },
+  mounted() {
+    this.getById(this.$route.params.id)
+  },
+  methods: {
+    ...mapActions('transaction', [
+      'TransactionById'
+    ]),
+    getById(id) { // 根据ID获取活动信息
+      this.TransactionById(id).then((res) => {
+        const resData = res.data.tpTransaction
+        this.ruleForm.transactionTitle = resData.transactionTitle
+        this.ruleForm.transactionContent = resData.transactionContent
+        this.ruleForm.contentImg = res.data.list
+      }).catch(() => {
+        console.log('get list error')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  display: flex;
+  flex-flow: column;
+  width: 700px;
+  margin-top: 50px;
+  margin-left: auto;
+  margin-right: auto;
+}
+.activityTile{
+  text-align: center;
+  font-size: 30px;
+  margin-bottom: 10px;
+}
+.activityContext{
+  margin-top: 20px;
+  margin-bottom: 20px;
+  font-size: 20px;
+  justify-items: center;
+}
+.progress {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+.text-progress {
+  width: 500px;
+  float: left;
+  align-content: center;
+  position: absolute;
+  margin-top: 12px;
+}
+.people-number {
+  position: relative;
+  margin-left: 180px;
+}
+.outer-layer {
+  background-color: gainsboro;
+  height: 3px;
+  width: 450px;
+  margin-top: -10px;
+  position: relative;
+}
+.inner-layer {
+  background-color: aquamarine;
+  height: 6px;
+  width: 100px;
+  position: relative;
+  margin-top: -4px;
+}
+.circular {
+  border: 1px #001528 solid;
+  border-radius: 10px;
+  /*background-color: chartreuse;*/
+  width: 20px;
+  height: 20px;
+  position: relative;
+  margin-left: 452px;
+  margin-top: 11px;
+  float: left;
+}
+.people-limit {
+  margin-top: 13px;
+}
+.bom-button{
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  margin-bottom: 100px;
+}
+</style>