修复下单端系统派单

ruoyi-admin/src/main/resources/application-druid-root.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
             master:
-                url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
-#                url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+#                url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+                url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
                 username: root
                 password: Qweruiop@123
             # 从库数据源

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java

@@ -167,6 +167,7 @@ public class AppletOrderController extends BaseController
         AppletOrder order = appletOrderService.getById(id);
         if (order != null){
             AppletOrderItem orderItem = appletOrderItemService.lambdaQuery()
+                    .eq(AppletOrderItem::getStatus, 1)
                     .eq(AppletOrderItem::getOrderId, order.getOrderId()).one();
 
             if (orderItem != null){

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java

@@ -43,8 +43,8 @@ public class AppletOrderItem {
     @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime payTime;
 
-    /** 订单状态类型 在接单大厅使用 */
-    @Excel(name = "订单状态")
+    /** 订单状态类型 在接单大厅使用 2被其他伴宠师接单 */
+    @Excel(name = "订单状态 1已接单 2被其他伴宠师接单 ")
     private Integer status;
 
     /** 派单次数 */
@@ -107,7 +107,7 @@ public class AppletOrderItem {
     @Excel(name = "伴宠师电话")
     private String phone;
 
-    /** 订单状态 0待服务 1进行中 2已完成 */
+    /** 订单状态 0待服务 1进行中 2已完成 3流失 */
     @Excel(name = "订单状态")
     private Integer orderStatus;