修复下单端系统派单

CatmDogd-Mall-Front-test/.env.production

@@ -5,6 +5,6 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/api'
-# VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = '/prod-api'
 VUE_APP_JUDGE_STAR = 0

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
             # 从库数据源
@@ -167,4 +167,4 @@ tencent:
   secretKey: cz96D9rPluvjKitrc9VfWSEqHWbUAh2D
 
 
-payMangeDev: true
+payMangeDev: false

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

@@ -20,7 +20,7 @@ ruoyi:
 # 开发环境配置.0
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8002
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java

@@ -105,8 +105,11 @@ public class IMallOrderServiceImpl implements IMallOrderService {
             appletOrder.setOrderSn(h5OrderVO.getOrderSn());
             appletOrder.setOrderId(h5OrderVO.getOrderId());
             appletOrder.setCompanionLevel(h5OrderVO.getCompanionLevel());
-            appletOrder.setLongitude(Double.valueOf(h5OrderVO.getLongitude()));
-            appletOrder.setLatitude(Double.valueOf(h5OrderVO.getLatitude()));
+
+            if (h5OrderVO.getLongitude() != null && h5OrderVO.getLatitude() != null){
+                appletOrder.setLongitude(Double.valueOf(h5OrderVO.getLongitude()));
+                appletOrder.setLatitude(Double.valueOf(h5OrderVO.getLatitude()));
+            }
 
             appletOrder.setCreateType(appletOrder.getType());//开始接单类型
             appletOrder.setNewOrderTime(LocalDateTime.now());//最新派单时间
@@ -181,8 +184,11 @@ public class IMallOrderServiceImpl implements IMallOrderService {
         appletOrder.setOrderSn(h5OrderVO.getOrderSn());
         appletOrder.setOrderId(h5OrderVO.getOrderId());
         appletOrder.setCompanionLevel(h5OrderVO.getCompanionLevel());
-        appletOrder.setLongitude(Double.valueOf(h5OrderVO.getLongitude()));
-        appletOrder.setLatitude(Double.valueOf(h5OrderVO.getLatitude()));
+
+        if (h5OrderVO.getLongitude() != null && h5OrderVO.getLatitude() != null){
+            appletOrder.setLongitude(Double.valueOf(h5OrderVO.getLongitude()));
+            appletOrder.setLatitude(Double.valueOf(h5OrderVO.getLatitude()));
+        }
 
         appletOrder.setCreateType(appletOrder.getType());//开始接单类型
         appletOrder.setNewOrderTime(LocalDateTime.now());//最新派单时间

ruoyi-catdog/src/main/java/com/ruoyi/applet/tencent/TaskConsumer.java

@@ -127,19 +127,23 @@ public class TaskConsumer implements QueueConsumer {
                     log.info("派单订单逻辑处理方法--------lzx");
                     log.info("派单类型："+model.getOrder().getTeacherId());
                     H5OrderVO h5OrderVO = h5OrderService.orderDetail(model.getOrder().getId());
-                    //如果为空则为系统派单
-                    if (model.getOrder().getTeacherId() == null) {
-                        //系统派单
-                        log.info("系统派单======================================");
 
-                        mallOrderService.acceptDispatchAll(h5OrderVO);
+                    try {
+                        //如果为空则为系统派单
+                        if (model.getOrder().getTeacherId() == null) {
+                            //系统派单
+                            log.info("系统派单======================================");
 
-                    }else if (model.getOrder().getTeacherId() != null) {
-                        //指定派单
-                        log.info("指定派单---------------------------------------");
-                        mallOrderService.acceptDispatch(model.getOrder().getTeacherId(), h5OrderVO);
-                    }
+                            mallOrderService.acceptDispatchAll(h5OrderVO);
 
+                        }else if (model.getOrder().getTeacherId() != null) {
+                            //指定派单
+                            log.info("指定派单---------------------------------------");
+                            mallOrderService.acceptDispatch(model.getOrder().getTeacherId(), h5OrderVO);
+                        }
+                    }catch (Exception e){
+                        log.error(e.getMessage());
+                    }
 
 
                     //进行派单操作

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderServiceImpl.java

@@ -335,6 +335,11 @@ public class AppletOrderServiceImpl extends ServiceImpl<AppletOrderMapper, Apple
             if ("0".equals(appletOrder.getType())) { // 系统派单
                 // 使用新的筛选逻辑
 
+                if (appletOrder.getLatitude() == null ||
+                        appletOrder.getLongitude() == null){
+                    continue;
+                }
+
                 qualifiedTechnicians = appUsersService
                         .filterQualifiedUsers(filterQualifiedUsersVo.builder()
                                 .orderId(appletOrder.getOrderId())