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

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

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpTransactionMapper;
+import com.community.huiju.dao.TpUserMapper;
 import com.community.huiju.model.TpTransaction;
+import com.community.huiju.model.TpUser;
 import com.community.huiju.service.SocialServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -24,6 +26,9 @@ public class TpTicketAndTransactionController {
     @Autowired
     private SocialServiceI socialServiceI;
 
+    @Autowired
+    private TpUserMapper tpUserMapper;
+
     @ApiOperation(value = "app端话题管理", notes = "app端话题管理")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "loginName",value = "电话号码"),
@@ -155,4 +160,18 @@ public class TpTicketAndTransactionController {
         return responseBean;
     }
 
+    @ApiOperation(value = "app端话题管理话题详情", notes = "app端话题管理话题详情")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "loginName", value = "手机号"),
+    })
+    @RequestMapping(value = "/getTransactionManage/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId,@RequestParam("loginName") String loginName) {
+        ResponseBean responseBean = new ResponseBean();
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,communityId);
+        TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId, tpUser.getId());
+        responseBean.addSuccess(activity);
+        return responseBean;
+    }
+
 }

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

@@ -9,7 +9,7 @@ public class TpShopAppraisal {
 
     private Integer shopId;
 
-    private String score;
+    private Integer score;
 
     private String content;
 
@@ -31,6 +31,14 @@ public class TpShopAppraisal {
      */
     private TpShopAppraisalReplay tpShopAppraisalReplay;
 
+    public Integer getScore() {
+        return score;
+    }
+
+    public void setScore(Integer score) {
+        this.score = score;
+    }
+
     public void setTpShopAppraisalReplay(TpShopAppraisalReplay tpShopAppraisalReplay) {
         this.tpShopAppraisalReplay = tpShopAppraisalReplay;
     }
@@ -63,14 +71,6 @@ public class TpShopAppraisal {
         this.shopId = shopId;
     }
 
-    public String getScore() {
-        return score;
-    }
-
-    public void setScore(String score) {
-        this.score = score == null ? null : score.trim();
-    }
-
     public String getContent() {
         return content;
     }

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;
@@ -1132,6 +1136,7 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setViewCount(0);
         tpTransaction.setIsReported("0");
         tpTransaction.setReleaseIdentity("1");
+        tpTransaction.setStatus("1");
         tpTransactionMapper.insertSelective(tpTransaction);
         JSONArray contentImg = jsonobject.getJSONArray("contentImg");
 

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

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="community_id" jdbcType="INTEGER" property="communityId" />
     <result column="shop_id" jdbcType="INTEGER" property="shopId" />
-    <result column="score" jdbcType="VARCHAR" property="score" />
+    <result column="score" jdbcType="INTEGER" property="score" />
     <result column="content" jdbcType="VARCHAR" property="content" />
     <result column="appraisal_people" jdbcType="VARCHAR" property="appraisalPeople" />
     <result column="appraisal_tel" jdbcType="VARCHAR" property="appraisalTel" />
@@ -36,7 +36,7 @@
       status, create_user, create_date
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, 
-      #{score,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{appraisalPeople,jdbcType=VARCHAR}, 
+      #{score,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{appraisalPeople,jdbcType=VARCHAR},
       #{appraisalTel,jdbcType=VARCHAR}, #{appraisalAvatar,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
       #{status,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
       )
@@ -92,7 +92,7 @@
         #{shopId,jdbcType=INTEGER},
       </if>
       <if test="score != null">
-        #{score,jdbcType=VARCHAR},
+        #{score,jdbcType=INTEGER},
       </if>
       <if test="content != null">
         #{content,jdbcType=VARCHAR},
@@ -130,7 +130,7 @@
         shop_id = #{shopId,jdbcType=INTEGER},
       </if>
       <if test="score != null">
-        score = #{score,jdbcType=VARCHAR},
+        score = #{score,jdbcType=INTEGER},
       </if>
       <if test="content != null">
         content = #{content,jdbcType=VARCHAR},
@@ -163,7 +163,7 @@
     update tp_shop_appraisal
     set community_id = #{communityId,jdbcType=INTEGER},
       shop_id = #{shopId,jdbcType=INTEGER},
-      score = #{score,jdbcType=VARCHAR},
+      score = #{score,jdbcType=INTEGER},
       content = #{content,jdbcType=VARCHAR},
       appraisal_people = #{appraisalPeople,jdbcType=VARCHAR},
       appraisal_tel = #{appraisalTel,jdbcType=VARCHAR},

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;