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

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionLike.java

@@ -7,7 +7,7 @@ public class TpTransactionLike {
 
     private Integer communityId;
 
-    private Integer taUserId;
+    private Integer taUserVerifyId;
 
     private Integer transactionId;
 
@@ -32,15 +32,15 @@ public class TpTransactionLike {
     public void setCommunityId(Integer communityId) {
         this.communityId = communityId;
     }
-
-    public Integer getTaUserId() {
-        return taUserId;
+    
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
     }
-
-    public void setTaUserId(Integer taUserId) {
-        this.taUserId = taUserId;
+    
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
     }
-
+    
     public Integer getTransactionId() {
         return transactionId;
     }

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

@@ -603,9 +603,9 @@ public class SocialServiceImpl implements SocialServiceI {
         ResponseBean response = new ResponseBean();
         TpTransactionLike tpTransactionLike = JSONObject.parseObject(paramets, TpTransactionLike.class);
         tpTransactionLike.setCommunityId(userElement.getCommunityId());
-        tpTransactionLike.setTaUserId(userElement.getId());
+        tpTransactionLike.setTaUserVerifyId(userElement.getUserVerifyId());
         tpTransactionLike.setCreateDate(new Date());
-        TpTransactionLike isUser = tpTransactionLikeMapper.getinvitationId(tpTransactionLike.getTransactionId(), userElement.getCommunityId(), userElement.getId());
+        TpTransactionLike isUser = tpTransactionLikeMapper.getinvitationId(tpTransactionLike.getTransactionId(), userElement.getCommunityId(), userElement.getUserVerifyId());
         if (null != isUser) {
             response.addError("您已点赞或踩");
             return response;
@@ -633,7 +633,7 @@ public class SocialServiceImpl implements SocialServiceI {
         //拿到我自己所有的帖子
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpTransaction> pageList = PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getId(), userElement.getCommunityId());
+        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getUserVerifyId(), userElement.getCommunityId());
 
         parameter.put("list", tpTransactionList);
         parameter.put("total", pageList.getTotal());

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

@@ -4,14 +4,14 @@
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransactionLike" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
-    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
     <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
     <result column="like_status" property="likeStatus" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ta_user_id, transaction_id, like_status, create_date, update_date
+    id, community_id, ta_user_verify_id, transaction_id, like_status, create_date, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -24,10 +24,10 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTransactionLike" >
-    insert into tp_transaction_like (id, community_id, ta_user_id, 
+    insert into tp_transaction_like (id, community_id, ta_user_verify_id,
       transaction_id, like_status, create_date, 
       update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER},
       #{transactionId,jdbcType=INTEGER}, #{likeStatus,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateDate,jdbcType=TIMESTAMP})
   </insert>
@@ -40,8 +40,8 @@
       <if test="communityId != null" >
         community_id,
       </if>
-      <if test="taUserId != null" >
-        ta_user_id,
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
       </if>
       <if test="transactionId != null" >
         transaction_id,
@@ -63,8 +63,8 @@
       <if test="communityId != null" >
         #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="taUserId != null" >
-        #{taUserId,jdbcType=INTEGER},
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
       </if>
       <if test="transactionId != null" >
         #{transactionId,jdbcType=INTEGER},
@@ -86,8 +86,8 @@
       <if test="communityId != null" >
         community_id = #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="taUserId != null" >
-        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
       </if>
       <if test="transactionId != null" >
         transaction_id = #{transactionId,jdbcType=INTEGER},
@@ -107,7 +107,7 @@
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTransactionLike" >
     update tp_transaction_like
     set community_id = #{communityId,jdbcType=INTEGER},
-      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
       transaction_id = #{transactionId,jdbcType=INTEGER},
       like_status = #{likeStatus,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},

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

@@ -291,30 +291,13 @@
       #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER},#{createDate,jdbcType=TIMESTAMP})
   </insert>
     <select id="getUserTransactionList" resultMap="BaseResultMap">
-
         SELECT
         <include refid="Base_Column_List"/>
         FROM
         tp_transaction t
-        WHERE t.create_user=#{id,jdbcType=INTEGER}
-        AND t.community_id=#{communityId,jdbcType=INTEGER}
-        UNION ALL
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM
-        tp_transaction t
-        INNER JOIN(SELECT
-        y.transaction_id
-        FROM
-        tp_transaction_reply y
-        LEFT JOIN tp_transaction t ON y.transaction_id = t.id
         WHERE
-        y.ta_user_id = #{id,jdbcType=INTEGER}
-        AND y.community_id = #{communityId,jdbcType=INTEGER}
-        AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND
-        t.community_id = #{communityId,jdbcType=INTEGER} )
-        GROUP BY
-        y.transaction_id) a ON a.transaction_id = t.id
+        t.community_id=#{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{id} and t.uuid_type = 'app'
         order by create_date DESC
     </select>
 </mapper>

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

@@ -171,17 +171,15 @@
 	tr.community_id = #{communityId}
     and tr.transaction_id=#{transactionId}
       <if test="type == 2" >
-        AND tr.uuid_type = "prop"
+        AND (tr.uuid_type = 'prop' or tr.reply_uuid_type = 'prop')
       </if>
       <if test="type == 1" >
         AND (tr.uuid = #{uuid} OR tr.reply_uuid = #{uuid})
-        AND tr.uuid_type =  #{uuidType}
-        AND tr.reply_uuid_type =  #{uuidType}
+        AND (tr.uuid_type =  #{uuidType} or tr.reply_uuid_type =  #{uuidType})
       </if>
       <if test="type == 0" >
         AND (tr.uuid = #{userID} OR tr.reply_uuid = #{userID})
-        AND tr.uuid_type = 'app'
-        AND tr.reply_uuid_type = 'app'
+        AND (tr.uuid_type = 'app' or tr.reply_uuid_type = 'app')
       </if>
    </select>
    <select id="selectUserTransactionReply" resultMap="BaseResultMap">

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

@@ -332,8 +332,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 
 		 // 查询帖子信息
 		TpTransaction tpTransaction= tpTransactionMapper.selectById(id);
-		// 查询评论信息
-		TransactionReply  Reply= transactionReplyMapper.selectById(id);
+		
 		TransactionReply transactionReply= new TransactionReply();
 		// 查询回复的ta_userID
 		 User user= userMapper.selectById(userElement.getId());
@@ -351,6 +350,8 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setCreateDate(LocalDateTime.now());
 		}
 		if (Type!=1) {
+			// 查询评论信息
+			TransactionReply  Reply= transactionReplyMapper.selectById(id);
 			transactionReply.setCommunityId(userElement.getCommunityId())
 					.setTransactionId(Reply.getTransactionId())
 					.setUuid(userElement.getId())
@@ -359,7 +360,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setReplyContent(replyContent)
 					.setReplyUuid(Reply.getUuid())
 					.setReplyUuidType("prop")
-					.setReplyUuidName(Reply.getReplyUuidName())
+					.setReplyUuidName(Reply.getUuidName())
 					.setCreateDate(LocalDateTime.now());
 		}
 		transactionReplyMapper.insert(transactionReply);