chenbiao %!s(int64=2) %!d(string=hai) anos
pai
achega
e6ff673c45

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/views/ClaudeCarInfoView.java

@@ -59,6 +59,9 @@ public class ClaudeCarInfoView {
     @DbField("cs.isPlus")
     private Integer isPlus;
 
+    @DbField("cs.sort")
+    private Integer sort;
+
 
     @Override
     public boolean equals(Object o) {

+ 9 - 14
netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -254,23 +254,18 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
         GoodsDonSku goodsDonSku = skuMapper.selectById(groupsTrips.getSkuId());
         if (goodsDonSku != null && goodsDonSku.getIsMirror() && goodsDonSku.getIsCar()) {
             ChatgptUser chatgptUser = getChatgptCarUser(userId, relationId, groupsRelation, goodsDonSku);
-
             String DOMAIN = "https://chat.galaxydvd.com";
-            if(goodsDonSku.getId() == 444){
-                DOMAIN = "https://car.galaxydvd.com";
-            }else {
-                try {
-                    SysConfig sysConfig = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class).eq(SysConfig::getSysKey, "mirror_gpt_domain"));
-                    if (sysConfig != null) {
-                        String sysValue = sysConfig.getSysValue();
-                        if (JSONUtil.isJsonArray(sysValue)) {
-                            List<String> domainList = JSONUtil.parseArray(sysValue).toList(String.class);
-                            DOMAIN = domainList.get(RandomUtil.randomInt(domainList.size()));
-                        }
+            try {
+                SysConfig sysConfig = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class).eq(SysConfig::getSysKey, goodsDonSku.getId() == 444 ? "zhihu_gpt_domain" : "mirror_gpt_domain"));
+                if (sysConfig != null) {
+                    String sysValue = sysConfig.getSysValue();
+                    if (JSONUtil.isJsonArray(sysValue)) {
+                        List<String> domainList = JSONUtil.parseArray(sysValue).toList(String.class);
+                        DOMAIN = domainList.get(RandomUtil.randomInt(domainList.size()));
                     }
-                }catch (Exception e){
-                    log.error("随机抽取域名错误. msg:{}", StringUtil.getErrorText(e));
                 }
+            } catch (Exception e) {
+                log.error("随机抽取域名错误. msg:{}", StringUtil.getErrorText(e));
             }
 
             log.info("domain:{},用户:{},所在车次:{},座位id:{},在{}获取跳转GPT镜像的登录url", DOMAIN, userId, groupsTrips.getId(), relationId, DateTime.now());

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -543,7 +543,7 @@ public class MirrorController {
         if (claudeUser == null) {
             throw BusinessRuntimeException.getInstance("您还未购买车票");
         }
-        SearchResult<ClaudeCarInfoView> carInfoList = beanSearcher.search(ClaudeCarInfoView.class, MapUtils.flatBuilder(request.getParameterMap()).field(ClaudeCarInfoView::getStatus, true).build());
+        SearchResult<ClaudeCarInfoView> carInfoList = beanSearcher.search(ClaudeCarInfoView.class, MapUtils.flatBuilder(request.getParameterMap()).field(ClaudeCarInfoView::getStatus, true).orderBy(ClaudeCarInfoView::getSort).desc().orderBy(ClaudeCarInfoView::getScore).asc().build());
         carInfoList.getDataList().forEach((claudeCarInfoView)->{
             Long aLong = claudeService.carLimit(claudeCarInfoView.getCarId());
             if (aLong != 0L) {