Merge branch 'sit' into uat-20260202

alien-dining/src/main/java/shop/alien/dining/controller/DiningController.java

@@ -114,6 +114,7 @@ public class DiningController {
             @ApiParam(value = "桌号ID", required = true) @RequestParam Integer tableId) {
         try {
             CuisineDetailVO vo = diningService.getCuisineDetail(cuisineId, tableId);
+            
             return R.data(vo);
         } catch (Exception e) {
             log.error("获取菜品详情失败: {}", e.getMessage(), e);

alien-gateway/src/main/java/shop/alien/gateway/config/JwtTokenFilter.java

@@ -137,7 +137,7 @@ public class JwtTokenFilter implements GlobalFilter, Ordered {
                             //别问, 问就是约定俗成
                             map.put("code", 666);
                         }
-                    } else if ("user".equals(deviceType)) {
+                    } else if ("user".equals(deviceType) || "miniprogram_user".equals(deviceType)) {
                         //判断程序是否为用户禁用
                         LifeUser lifeUser = lifeUserMapper.selectOne(new LambdaQueryWrapper<LifeUser>().eq(LifeUser::getUserPhone, phone));
                         //注销标记, 0:未注销, 1:已注销
@@ -151,8 +151,7 @@ public class JwtTokenFilter implements GlobalFilter, Ordered {
                             //别问, 问就是约定俗成
                             map.put("code", 666);
                         }
-                    }
-                    else if ("lawyer".equals(deviceType)) {
+                    } else if ("lawyer".equals(deviceType)) {
                         //判断程序是否为用户禁用
                         LawyerUser lawyerUser = lawyerUserMapper.selectOne(new LambdaQueryWrapper<LawyerUser>().eq(LawyerUser::getPhone, phone));
                         //注销标记, 0:未注销, 1:已注销

alien-store/src/main/java/shop/alien/store/controller/AiSearchController.java

@@ -37,6 +37,7 @@ import shop.alien.store.service.CommonRatingService;
 import shop.alien.store.service.StoreBannerService;
 import shop.alien.store.service.StoreImgService;
 import shop.alien.store.service.StoreInfoService;
+import shop.alien.store.util.ai.AiAuthTokenUtil;
 
 import java.time.Instant;
 import java.time.ZoneId;
@@ -72,6 +73,7 @@ public class AiSearchController {
     private final StoreInfoService storeInfoService;
 
     private final LifeBlacklistMapper lifeBlacklistMapper;
+    private final AiAuthTokenUtil aiAuthTokenUtil;
 
     @TrackEvent(
             eventType = "SEARCH",
@@ -86,18 +88,24 @@ public class AiSearchController {
         // 初始化请求体Map
         Map<String, Object> requestBody = new HashMap<>();
         requestBody.put("query", map.get("storeName"));
-        requestBody.put("limit", map.get("pageSize"));
+        requestBody.put("page_size", map.get("pageSize"));
         requestBody.put("user_lat", map.get("lat"));
         requestBody.put("user_lng", map.get("lon"));
         requestBody.put("category", map.get("category"));
         requestBody.put("page", map.get("pageNum"));
         requestBody.put("sort_by", map.get("sortBy"));
+        if("distance".equals(map.get("sortBy"))){
+            requestBody.put("sort_order", "asc");
+        } else {
+            requestBody.put("sort_order", "desc");
+        }
         HttpHeaders aiHeaders = new HttpHeaders();
+        String accessToken = aiAuthTokenUtil.getAccessToken();
         aiHeaders.setContentType(MediaType.APPLICATION_JSON);
-//        aiHeaders.set("Authorization", "Bearer " + accessToken);
+        aiHeaders.set("Authorization", "Bearer " + accessToken);
 //        aiHeaders.set("Authorization", "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1cHN0b3JlQGFkbWluLmNvbSIsImlkIjo2LCJ0aW1lIjoxNzYyOTI1NDAzLjY1MTY5MjZ9.07lz8Ox2cGC28UCmqcKCt5R6Rfwtgs-Eiu0ttgWRxws");
 
-        HttpEntity<Map<String, Object>> request = new HttpEntity<>(requestBody, null);
+        HttpEntity<Map<String, Object>> request = new HttpEntity<>(requestBody, aiHeaders);
         try {
             log.info("调用AI检索店铺列表最上面根据店铺名查询  接口入参------{}", requestBody);
             ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(aiSearchExactUrl, request, String.class);
@@ -151,16 +159,23 @@ public class AiSearchController {
         // 初始化请求体Map
         Map<String, Object> requestBody = new HashMap<>();
         requestBody.put("query", map.get("storeName"));
-        requestBody.put("limit", map.get("pageSize"));
+        requestBody.put("page_size", map.get("pageSize"));
         requestBody.put("user_lat", map.get("lat"));
         requestBody.put("user_lng", map.get("lon"));
         requestBody.put("category", map.get("category"));
         requestBody.put("page", map.get("pageNum"));
         requestBody.put("sort_by", map.get("sortBy"));
+        if("distance".equals(map.get("sortBy"))){
+            requestBody.put("sort_order", "asc");
+        } else {
+            requestBody.put("sort_order", "desc");
+        }
         HttpHeaders aiHeaders = new HttpHeaders();
+        String accessToken = aiAuthTokenUtil.getAccessToken();
         aiHeaders.setContentType(MediaType.APPLICATION_JSON);
+        aiHeaders.set("Authorization", "Bearer " + accessToken);
 
-        HttpEntity<Map<String, Object>> request = new HttpEntity<>(requestBody, null);
+        HttpEntity<Map<String, Object>> request = new HttpEntity<>(requestBody, aiHeaders);
         try {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS").withZone(ZoneId.systemDefault());
             log.info("调用AI首页店铺列表搜索接口 请求参数------{} AI开始时间: {}", requestBody, formatter.format(Instant.now()));

alien-store/src/main/java/shop/alien/store/service/impl/StoreStaffConfigServiceImpl.java

@@ -1594,7 +1594,24 @@ public class StoreStaffConfigServiceImpl implements StoreStaffConfigService {
                         titleStaffList.add(staff);
                     }
                 }
-                titleStaffList.sort((x,y)->y.getTopTime().compareTo(x.getTopTime()));
+                titleStaffList.sort((x, y) -> {
+                            // 获取两个对象的topTime
+                            Date xTime = x.getTopTime();
+                            Date yTime = y.getTopTime();
+
+                            // 处理null值的情况
+                            if (xTime == null && yTime == null) {
+                                return 0; // 两个都为null，视为相等
+                            }
+                            if (xTime == null) {
+                                return 1; // x为null，排到后面（y在前）
+                            }
+                            if (yTime == null) {
+                                return -1; // y为null，排到后面（x在前）
+                            }
+
+                            // 都不为null时，正常比较（按时间降序）
+                            return yTime.compareTo(xTime);});
                 groupVo.setStaffList(titleStaffList);
                 result.add(groupVo);
             }

alien-store/src/main/java/shop/alien/store/service/impl/WeChatMiniProgramQrCodeServiceImpl.java

@@ -295,6 +295,6 @@ public class WeChatMiniProgramQrCodeServiceImpl implements WeChatMiniProgramQrCo
                 storeId, tableId, System.currentTimeMillis());
 
         // 生成二维码并上传，扫码后打开指定页面
-        return generateQrCodeAndUpload(scene, "pages/index/index", 430, ossPath);
+        return generateQrCodeAndUpload(scene, "pages/launch/index", 430, ossPath);
     }
 }