zoujiajian 9 månader sedan
förälder
incheckning
6010cb887d

+ 0 - 5
netflix-dao/src/main/java/com/cyksj/model/entity/GptTeamUserBindRecord.java

@@ -45,11 +45,6 @@ public class GptTeamUserBindRecord extends BaseEntity {
      */
     private Integer changeNum;
 
-    /**
-     * 此时 加入人数
-     */
-    private Integer count;
-
     /**
      * 加入状态 1.成功 0失败
      * 默认失败

+ 0 - 10
netflix-service/src/main/java/com/cyksj/service/gpt/GptTeamUserBindRecordService.java

@@ -1,6 +1,5 @@
 package com.cyksj.service.gpt;
 
-import com.cyksj.model.entity.GptTeamUserBindRecord;
 import com.cyksj.model.request.GptTeamBindRequest;
 
 /**
@@ -16,15 +15,6 @@ public interface GptTeamUserBindRecordService {
      */
     void bindByOrderId(GptTeamBindRequest request);
 
-    /**
-     * 获取绑定记录
-     *
-     * @param orderId 订单ID
-     * @param userId 用户ID
-     * @return 绑定记录
-     */
-    GptTeamUserBindRecord getBindRecord(Long orderId, Long userId);
-
     /**
      * 换绑邮箱
      *

+ 0 - 7
netflix-service/src/main/java/com/cyksj/service/gpt/impl/GptTeamUserBindRecordServiceImpl.java

@@ -102,13 +102,6 @@ public class GptTeamUserBindRecordServiceImpl implements GptTeamUserBindRecordSe
         //绑定 Team API TODO
     }
 
-    @Override
-    public GptTeamUserBindRecord getBindRecord(Long orderId, Long userId) {
-        List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-        GptTeamUserBindRecord bindRecord = bindRecordMapper.selectOne(Wrappers.lambdaQuery(GptTeamUserBindRecord.class).eq(GptTeamUserBindRecord::getOrderId, orderId).in(GptTeamUserBindRecord::getUserId, userIdList).last("limit 1"));
-        return bindRecord;
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void changeBind(GptTeamBindRequest request) {

+ 18 - 3
netflix-web/src/main/java/com/cyksj/web/controller/gpt/GptTeamUserBindRecordController.java

@@ -5,12 +5,18 @@ import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.GptTeamUserBindRecord;
 import com.cyksj.model.request.GptTeamBindRequest;
 import com.cyksj.service.gpt.GptTeamUserBindRecordService;
+import com.cyksj.service.user.UserBindRelationService;
 import com.cyksj.web.util.StpUserUtil;
+import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.param.Operator;
+import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * server/GPT Team用户绑定记录控制器
  */
@@ -22,6 +28,10 @@ public class GptTeamUserBindRecordController {
 
     private final GptTeamUserBindRecordService gptTeamUserBindRecordService;
 
+    private final UserBindRelationService userBindRelationService;
+
+    private final BeanSearcher beanSearcher;
+
     /**
      * 通过订单ID绑定邮箱
      */
@@ -41,9 +51,14 @@ public class GptTeamUserBindRecordController {
      */
     @GetMapping("/getBindRecord/{orderId}")
     public Result<GptTeamUserBindRecord> getBindRecord(@PathVariable Long orderId) {
-        Long userId = StpUserUtil.getLoginIdAsLong();
-        GptTeamUserBindRecord response = gptTeamUserBindRecordService.getBindRecord(orderId, userId);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(response);
+        long userId = StpUserUtil.getLoginIdAsLong();
+        List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+        GptTeamUserBindRecord bindRecord = beanSearcher.searchFirst(GptTeamUserBindRecord.class, MapUtils.builder()
+                .field(GptTeamUserBindRecord::getOrderId, orderId)
+                .field(GptTeamUserBindRecord::getUserId, userIdList).op(Operator.InList)
+                .onlySelect(GptTeamUserBindRecord::getId, GptTeamUserBindRecord::getOrderId, GptTeamUserBindRecord::getBindEmail, GptTeamUserBindRecord::getBindTime, GptTeamUserBindRecord::getChangeNum, GptTeamUserBindRecord::getStatus)
+                .build());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(bindRecord);
     }
 
     /**