bug

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

@@ -304,6 +304,7 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userId);
         tpTransaction.setUpdateDate(new Date());
+        tpTransaction.setIsReported("0");
 
         //判断身份是否为业主且状态为已停用
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -86,6 +86,9 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       <if test="type != null" >
         type,
       </if>
+      <if test="isReported != null" >
+        is_reported,
+      </if>
       <if test="createUser != null" >
         create_user,
       </if>
@@ -124,6 +127,9 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       <if test="type != null" >
         #{type,jdbcType=CHAR},
       </if>
+      <if test="isReported != null" >
+        #{isReported,jdbcType=CHAR},
+      </if>
       <if test="createUser != null" >
         #{createUser,jdbcType=INTEGER},
       </if>

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

@@ -79,4 +79,18 @@ public class TransactionController extends BaseController {
 		responseBean = transactionService.getTransactionInfo(id);
 		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/update/{id}",method = RequestMethod.POST)
+	public ResponseBean updateTransaction(@PathVariable(value = "id") Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = transactionService.updateTransactionById(id,userElement.getId());
+		return responseBean;
+	}
 }

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

@@ -23,4 +23,11 @@ public interface ITransactionService extends IService<TpTransaction> {
 	 * @return
 	 */
 	ResponseBean getTransactionInfo(Integer id);
+	
+	/**
+	 * 作废二手交易
+	 * @param id
+	 * @return
+	 */
+	ResponseBean updateTransactionById(Integer id,Integer userId);
 }

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

@@ -17,6 +17,9 @@ import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.xml.crypto.Data;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -73,4 +76,27 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 作废二手交易
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public ResponseBean updateTransactionById(Integer id,Integer userId) {
+		ResponseBean responseBean = new ResponseBean();
+		TpTransaction tpTransaction = new TpTransaction();
+		tpTransaction.setId(id);
+		tpTransaction.setStatus("0");
+		tpTransaction.setUpdateUser(userId);
+		tpTransaction.setUpdateDate(LocalDateTime.now());
+		int count = tpTransactionMapper.updateById(tpTransaction);
+		if (count > 0){
+			responseBean.addSuccess(count);
+			return responseBean;
+		}
+		responseBean.addError("作废出错");
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -20,7 +20,7 @@
             1 = 1
             AND t.community_id = #{tpTransaction.communityId}
         <if test="tpTransaction.id != null and tpTransaction.id != ''">
-            and t.id = #{tpTransaction.id}
+            and t.id like concat('%',#{tpTransaction.id},'%')
         </if>
         <if test="tpTransaction.transactionTitle != null and tpTransaction.transactionTitle != ''">
             and t.transaction_title like concat('%',#{tpTransaction.transactionTitle,jdbcType=VARCHAR},'%')

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

@@ -15,3 +15,11 @@ export function transactionById(id) {
     method: 'get'
   })
 }
+
+// 作废 活动详情
+export function updateTransactionById(id) {
+  return request({
+    url: '/transaction/update/' + id,
+    method: 'post'
+  })
+}

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

@@ -1,4 +1,4 @@
-import { fetchList, transactionById } from '@/api/transaction'
+import { fetchList, transactionById, updateTransactionById } from '@/api/transaction'
 
 const transaction = {
   namespaced: true,
@@ -38,6 +38,15 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    UpdateTransactionById({ commit, state }, id) {
+      return new Promise((resolve, reject) => {
+        updateTransactionById(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -24,11 +24,6 @@
       highlight-current-row
       style="width: 100%; margin-top: 20px;"
       @sort-change="sortChange">
-      <el-table-column
-        label="序号"
-        align="center"
-        type="index"
-        width="50"/>
       <el-table-column label="编号" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.id }}</span>

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

@@ -7,6 +7,7 @@
     <div class="activityContextImg">
       <img v-for="item in ruleForm.contentImg" :src="item" width="700" height="500" >
     </div>
+    <el-button v-if="ruleForm.status === '1'" type="primary" style="width: 130px;margin-left: 250px;" @click="invalid">作废</el-button>
   </div>
 </template>
 
@@ -19,6 +20,7 @@ export default {
       asOfdate: '2018/10/10 23:59:59',
       ruleForm: {
         id: '',
+        status: '',
         transactionTitle: '',
         transactionContent: '', // 交易内容详细
         contentImg: [] // 活动内容配图
@@ -30,17 +32,43 @@ export default {
   },
   methods: {
     ...mapActions('transaction', [
-      'TransactionById'
+      'TransactionById',
+      'UpdateTransactionById'
     ]),
     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.status = resData.status
         this.ruleForm.contentImg = res.data.list
       }).catch(() => {
         console.log('get list error')
       })
+    },
+    invalid(){
+      this.$confirm('确定要作废此帖吗？作废相当于删除帖子, 是否继续?', '作废确认提示', {
+        confirmButtonText: '确定作废',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.UpdateTransactionById(this.$route.params.id).then((res) => {
+          if (res.code === '0') {
+          this.$message({
+            message: "作废成功",
+            type: 'success'
+          })
+          // 切换路由
+          this.$router.push({ name: 'transaction-import' })
+          return
+        }
+        this.$message.error(res.message)
+        }).catch(() => {
+          console.log('update error')
+        })
+      }).catch(() => {
+        console.log("cancel")        
+      });
     }
   }
 }