合并

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

@@ -638,8 +638,8 @@ public class SocialServiceImpl implements SocialServiceI {
                 tdImagesMapper.insert(tdImages);
             }
         }
-        // 推消
-        TpMessage  tpMessage = new TpMessage(null,userElement.getCommunityId(),"6","1","1", tpTransactionReply.getUuid(),"1","2",  userElement.getUserName()+":"+tpTransactionReply.getReplyContent(),
+        // 推消息
+        TpMessage  tpMessage = new TpMessage(null,userElement.getCommunityId(),"6","1","1", tpTransactionReply.getReplyId(),"1","2",  userElement.getUserName()+":"+tpTransactionReply.getReplyContent(),
                                           "1",null,null,"0",userElement.getUserVerifyId(),new Date(),null,null,null,null,null,tpTransactionReply.getTransactionId());
         tpMessageMapper.insertSelective(tpMessage);
         response.addSuccess("成功");
@@ -1103,8 +1103,12 @@ public class SocialServiceImpl implements SocialServiceI {
 
         JSONArray tpTransactionIdId = parseObject.getJSONArray("id");
         Integer[] tpTransactionReportArray = tpTransactionIdId.toArray(new Integer[]{});
-        for (Integer TpTransactionReport:tpTransactionReportArray){
-            tpTransactionReportMapper.deleteTransactionReport(TpTransactionReport,tpUser.getCommunityId());
+        for (Integer tpTransactionReportID:tpTransactionReportArray){
+            tpTransactionReportMapper.deleteTransactionReport(tpTransactionReportID,tpUser.getCommunityId());
+            TpTransaction tpTransaction= new TpTransaction();
+            tpTransaction.setId(tpTransactionReportID);
+            tpTransaction.setIsReported("0");
+            tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
         }
         response.addSuccess("成功");
         return response;

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

@@ -9,7 +9,7 @@
     <result column="reporter_id" property="reporterId" jdbcType="INTEGER" />
     <result column="reportName" property="reportName" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
-    <result column="reportStringName" property="reportUserName" jdbcType="VARCHAR" />
+    <result column="reportUserName" property="reportUserName" jdbcType="VARCHAR" />
 
   </resultMap>
   <sql id="Base_Column_List" >

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

@@ -396,8 +396,8 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 			tdImages.setCreateUser(userElement.getId());
 			tdImagesMapper.insert(tdImages);
 		}
-		Message  tpMessage=new Message(null,userElement.getCommunityId(),"9","1","1", tpTransaction.getUuid(),"1","2",  userElement.getUserName()+":"+ replyContent,
-				"1",null,null,"0",userElement.getUserVerifyId(),LocalDateTime.now(),null,null,null,null,null,tpTransaction.getId());
+		Message  tpMessage=new Message(null,userElement.getCommunityId(),"6","1","1", transactionReply.getReplyUuid(),"1","2",  userElement.getUserName()+":"+ replyContent,
+				"1",null,null,"0",userElement.getUserVerifyId(),LocalDateTime.now(),null,null,null,null,null,transactionReply.getTransactionId());
 		tpMessageMapper.insert(tpMessage);
 		response.addSuccess("成功");
 		return response;