合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -344,8 +344,8 @@ public class SocialController extends BaseController {
         
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.reportTransaction(userId, communityId,paramets);
+        Integer userVerifyId = userElement.getUserVerifyId();
+        ResponseBean response = socialServiceI.reportTransaction(userVerifyId, communityId,paramets);
         return response;
     }
 

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

@@ -502,12 +502,12 @@ public class SocialServiceImpl implements SocialServiceI {
     /**
      * 举报二手交易帖子
      *
-     * @param userId
+     * @param userVerifyUserId
      * @param paramets
      * @return
      */
     @Override
-    public ResponseBean reportTransaction(Integer userId, Integer communityId, String paramets) {
+    public ResponseBean reportTransaction(Integer userVerifyUserId, Integer communityId, String paramets) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         Integer transactionId = jsonObject.getInteger("transactionId");
@@ -519,13 +519,13 @@ public class SocialServiceImpl implements SocialServiceI {
             return responseBean;
         }
         // 举报原因
-        TpTransactionReport tpTransactionReport = tpTransactionReportMapper.selectByCommunityIdAndTransactionId(userId, communityId, tpTransaction.getId());
+        TpTransactionReport tpTransactionReport = tpTransactionReportMapper.selectByCommunityIdAndTransactionId(userVerifyUserId, communityId, tpTransaction.getId());
         if (null != tpTransactionReport) {
             responseBean.addError("您已举报了该帖子!");
             return responseBean;
         }
         //插入举报表
-        tpTransactionMapper.saveReportReason(userId, communityId, transactionId, reportReasonId,new Date());
+        tpTransactionMapper.saveReportReason(userVerifyUserId, communityId, transactionId, reportReasonId,new Date());
         //更新交易表的举报状态为被举报
         TpTransaction record = new TpTransaction();
         record.setId(transactionId);
@@ -534,9 +534,10 @@ public class SocialServiceImpl implements SocialServiceI {
         if (size > 0) {
 
             // 举报人
-            TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+            TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userVerifyUserId);
+            TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
             // 发帖人
-            TaUser createUser = taUserMapper.selectByPrimaryKey(tpTransaction.getCreateUser());
+//            TaUser createUser = taUserMapper.selectByPrimaryKey(tpTransaction.getCreateUser());
 
             // 举报原因
             //TpTransactionReport tpTransactionReport = tpTransactionReportMapper.selectByCommunityIdAndTransactionId(communityId, tpTransaction.getId());
@@ -555,12 +556,12 @@ public class SocialServiceImpl implements SocialServiceI {
             message.setModelType("1");
             message.setUuidType("2");
             message.setSource("1");
-            message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子：{" + tpTransaction.getTransactionTitle() + "}，举报原因：{" + sysReportReason.getReason() + "}，点击责令发布人修改或直接作废帖子");
+            message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + tpTransaction.getUuidName() + "}发布的帖子：{" + tpTransaction.getTransactionTitle() + "}，举报原因：{" + sysReportReason.getReason() + "}，点击责令发布人修改或直接作废帖子");
             message.setStatus("1");
             message.setReadStatus("0");
             message.setTransactionId(transactionId);
             message.setCreateDate(new Date());
-            message.setCreateUser(userId);
+            message.setCreateUser(userVerifyUserId);
             tpMessageMapper.insertSelective(message);
 
 

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

@@ -95,6 +95,9 @@
     select
      <include refid="Base_Column_List"/>
      from tp_transaction_report
-     where reporter_id = #{userId, jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER} and transaction_id = #{transactionId,jdbcType=INTEGER}
+     where
+      reporter_id = #{userId, jdbcType=INTEGER}
+      and community_id = #{communityId,jdbcType=INTEGER}
+      and transaction_id = #{transactionId,jdbcType=INTEGER}
   </select>
 </mapper>