Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/model/TpTicketRecordComment.java

@@ -84,6 +84,9 @@ public class TpTicketRecordComment implements Serializable {
     @TableField(exist = false)
     private List<TdImages> imgURL;
 
+    @TableField(exist = false)
+    private Integer ticketRecordCommentId;
+
 
 
 }

src/main/java/com/huiju/estateagents/property/service/impl/BillStatementServiceImpl.java

@@ -97,10 +97,10 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
             // 缴费单id集合
             List<Integer> billInvoiceIdCollect = childBillOrderList.stream().map(billOrder -> billOrder.getTpBillInvoiceId()).collect(Collectors.toList());
             // 总金额
-            Long sumPrice = childBillOrderList.stream().map(billOrder -> {
+            Long sumPrice = childBillOrderList.stream().mapToLong(billOrder -> {
                 BillInvoice billInvoice = billInvoiceMapper.selectById(billOrder.getTpBillInvoiceId());
                 return billInvoice.getPayPrice();
-            }).count();
+            }).sum();
 
             e.setBillIdList(billIdCollect);
             e.setBillInvoiceIdList(billInvoiceIdCollect);

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -289,6 +289,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TaUser taUser = taUserMapper.selectById(userID);
 
         TpTicket tpTicket= new TpTicket();
+        tpTicket.setId(ticketId);
         tpTicket.setStatus("3");
         tpTicket.setTpUserId(userID);
         tpTicket.setUpdateDate(LocalDateTime.now());
@@ -877,8 +878,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 //        User taUser = userMapper.selectById(userId);
         TaPerson  taPerson = taPersonMapper.selectById(personId);
 
-        TpTicket  tpTicket= tpTicketMapper.selectById(tpTicketRecordComment.getTicketId());
-        TpTicketRecord ticketRecord= tpTicketRecordMapper.selectTpTicketRecord(tpTicketRecordComment.getTicketId(), Integer.valueOf(tpTicket.getStatus()));
+        TpTicketRecord ticketRecord= tpTicketRecordMapper.selectById(tpTicketRecordComment.getTicketRecordCommentId());
 
         tpTicketRecordComment.setUserName(taPerson.getName());
         tpTicketRecordComment.setParentId(tpTicketRecordComment.getId());