leromro-core/src/main/java/com/leromro/core/facade/ConversationRecordFacade.java

@@ -127,6 +127,7 @@ public class ConversationRecordFacade {
                 .build();
         LambdaUpdateWrapper<ConversationRecord> wrapper = new LambdaUpdateWrapper<ConversationRecord>()
                 .eq(ConversationRecord::getConversationRecordId, dto.getConversationRecordId())
+                .set(ConversationRecord::getMsgType, dto.getMsgType())
                 .set(ConversationRecord::getNewestMsgTime, conversationMsgRecord.getMsgSendTime())
                 .set(ConversationRecord::getNewestMsgContent, conversationMsgRecord.getMsgContent());
         //接收人

leromro-core/src/main/java/com/leromro/core/service/impl/ConversationRecordServiceImpl.java

@@ -106,6 +106,7 @@ public class ConversationRecordServiceImpl extends ServiceImpl<ConversationRecor
                 .build();
         //会话的修改条件
         LambdaUpdateWrapper<ConversationRecord> updateWrapper =  new LambdaUpdateWrapper<ConversationRecord>()
+                .set(ConversationRecord::getMsgType, "1")
                 .set(ConversationRecord::getNewestMsgTime, conversationMsgRecord.getMsgSendTime())
                 .set(ConversationRecord::getNewestMsgContent, conversationMsgRecord.getMsgContent());
         //接收人
@@ -133,6 +134,7 @@ public class ConversationRecordServiceImpl extends ServiceImpl<ConversationRecor
             //不存在则创建会话,并保存
             conversationRecord = ConversationRecord.builder()
                     .conversationType("1")
+                    .msgType("1")
                     .newestMsgTime(conversationMsgRecord.getMsgSendTime())
                     .newestMsgContent(conversationMsgRecord.getMsgContent())
                     .build();

leromro-core/src/main/java/com/leromro/core/service/impl/OrderRefundServiceImpl.java

@@ -199,9 +199,9 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             orderRefund.setStatus("0");
             orderRefund.setRefundAmount(mainOrders.getServiceOnePrice().multiply(BigDecimal.valueOf(mainOrders.getSingleQuantity())).multiply(new BigDecimal(mainOrders.getTotalTimes() - secondOrderList.size())));
             this.save(orderRefund);
-            UpdateWrapper<MainOrders> mainOrderUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", secondOrderIdList).set("order_status", "5");
+            UpdateWrapper<MainOrders> mainOrderUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", mainOrderId).set("order_status", "5");
             mainOrdersMapper.update(null, mainOrderUpdateWrapper);
-            UpdateWrapper<SecondOrder> secondOrderUpdateWrapper = new UpdateWrapper<SecondOrder>().in("second_order_id", mainOrderId).set("order_status", "5");
+            UpdateWrapper<SecondOrder> secondOrderUpdateWrapper = new UpdateWrapper<SecondOrder>().in("second_order_id", secondOrderIdList).set("order_status", "5");
             secondOrdersMapper.update(null, secondOrderUpdateWrapper);
             return AjaxResult.success("已提交申请");
         } else if (mainOrders.getOrderStatus().equals("4") || mainOrders.getOrderStatus().equals("8")) {