合并

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

@@ -430,4 +430,19 @@ public class SocialController extends BaseController {
         responseBean.addSuccess(reportList);
         return responseBean;
     }
+
+    @ApiOperation(value = "二手帖子对话", notes = "二手帖子对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "transactionId:当前帖子ID,replyContent:回复内容，replyTaUserId：被回复的用户ID"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/addTransactionReply", method = RequestMethod.POST)
+    public ResponseBean addTransactionReply(HttpSession session, @RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.addTransactionReply(paramets,userElement);
+        return response;
+    }
+
+
 }

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

@@ -179,4 +179,12 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	ResponseBean findUsedDetailsReply(Integer activityId, UserElement userElement, String order, Integer pageNum, Integer pageSize);
+	/*
+	 * 二帖子回复
+	 * @param paramets
+	 * @param userElement
+	 * @return
+	 */
+    ResponseBean addTransactionReply(String paramets, UserElement userElement);
+
 }

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

@@ -13,6 +13,7 @@ import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -579,8 +580,23 @@ public class SocialServiceImpl implements SocialServiceI {
         responseBean.addError("举报出错");
         return responseBean;
     }
-    
-    
+
+    @Override
+    public ResponseBean addTransactionReply(String paramets, UserElement userElement) {
+        ResponseBean response= new ResponseBean();
+        TpTransactionReply tpTransactionReply= JSONObject.parseObject(paramets,TpTransactionReply.class);
+        tpTransactionReply.setCommunityId(userElement.getCommunityId());
+        tpTransactionReply.setTaUserId(userElement.getId());
+        tpTransactionReply.setTaUserName(userElement.getUserName());
+        //获取被回复的姓名
+        tpTransactionReply.setReplyTaUserName( taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
+        tpTransactionReply.setCreateDate(new Date());
+        tpTransactionReplyMapper.insert(tpTransactionReply);
+        response.addSuccess("成功");
+        return response;
+    }
+
+
     @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {
         //修改工单内容和评分

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/BillInvoice.java

@@ -159,7 +159,7 @@ public class BillInvoice implements Serializable {
      * 流水账单编号
      */
     @TableField(exist = false)
-    private Integer billStatement;
+    private String billStatement;
 
     /**
      * 创建人姓名

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

@@ -11,7 +11,7 @@
             tboi.building as building,
             tboi.unit as unit,
             tboi.room_no as roomNo,
-            tbs.id as billStatement,
+            tpi.out_trade_no as billStatement,
             (SELECT user_name from tp_user tu WHERE tu.id = tpi.create_user) as createUserName,
             (SELECT user_name from tp_user tu WHERE tu.id = tpi.update_user) as updateUserName
         FROM

VUECODE/smart-property-manage/src/views/bill/info/index.vue

@@ -116,9 +116,9 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="billStatementId"
-        label="流水"
-        align="center"/>
+        prop="outTradeNo"
+        label="订单号"
+        align="center" width="170"/>
       <el-table-column
         prop="billStatus"
         label="缴费状态"

VUECODE/smart-property-manage/src/views/message/messageIndex.vue

@@ -247,12 +247,13 @@ export default {
         return
       }
       this.$store.dispatch('DelectRead', ide).then((res) => {
+        this.dataQuery()  
         this.$message({
           message: '成功',
           type: 'success'
-        });    
+        });
+               
       })
-      this.dataQuery()     
     },
     //点击详情修改当前状态为已读
     already(ide){