app端查询单个订单增加待骑手接单分类；客服聊天未读条数初始化为0；客服聊天取消在线自动设置已读

src/main/java/com/sqx/modules/chats/controller/WebSocket.java

@@ -127,12 +127,14 @@ public class WebSocket {
                 for (WebSocket item : clients.values()) {
                     if ("1".equals(sendType)) { //用户发送
                         if (item.wxUserId.equals(storeId)) {
-                            wxChatContent.setStatus(2); //已读
+//                            wxChatContent.setStatus(2); //已读
+                            wxChatContent.setStatus(1); //不自动设置为已读
                             item.session.getAsyncRemote().sendText(message);
                         }
                     }else {
                         if (item.wxUserId.equals(userId)) {
-                            wxChatContent.setStatus(2); //已读
+//                            wxChatContent.setStatus(2); //已读
+                            wxChatContent.setStatus(1); //不自动设置为已读
                             item.session.getAsyncRemote().sendText(message);
                         }
                     }

src/main/java/com/sqx/modules/chats/service/ChatsServiceImpl.java

@@ -159,11 +159,14 @@ public class ChatsServiceImpl implements ChatsService {
             }
             entity.setChatId(chat.getChatId());
             entity.setCreateTime(chat.getCreateTime());
+            entity.setStoreCount(chat.getStoreCount());
             chat = jpaRepository.save(entity);
             return ResultUtil.success(chat);
         }else {
             //不存在会话，创建会话
             entity.setCreateTime(DateUtil.createTime());
+            //设置商家默认未读条数为0
+            entity.setStoreCount(0);
             Chats save = jpaRepository.save(entity);
             return ResultUtil.success(save);
         }

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1470,6 +1470,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             tbOrder.setShopName(goodsShop.getShopName());
             tbOrder.setShopPhone(goodsShop.getPhone());
         }
+        if(tbOrder.getOrderTypeExtra()==2&&"2".equals(tbOrder.getIndentState())){
+            tbOrder.setStatus(13);
+        }
         List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>().eq("order_id", tbOrder.getOrderId()));
         tbOrder.setOrderGoodsList(orderGoodsList);
         return Result.success().put("data", tbOrder);

src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
             url: jdbc:mysql://172.16.20.108:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
             username: root
             password: chuanghai@2024
-            initial-size: 
+            initial-size: 15
             max-active: 100
             min-idle: 10
             max-wait: 60000
@@ -47,7 +47,7 @@ spring:
                 max-wait: -1
 secure-api:
     # 开启SecureApi功能，如果为false则其余配置项均不生效
-    enabled: true
+    enabled: false
     # 开启加解密日志打印，会打印出接口名、加密模式、算法、明文和密文等信息
     show-log: true
     url-safe: true

src/main/resources/mapper/order/OrderMapper.xml

@@ -375,6 +375,7 @@
                ti.indent_id         as indentId,
                ti.indent_number     as indentNumber,
                ti.rider_user_id     as riderUserId,
+               ti.indent_state     as indentState,
                tu.nick_name         as riderNickName,
                tu.avatar            as riderAvatar,
                tu.phone             as riderPhone,