|
|
@@ -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);
|
|
|
}
|
|
|
|
|
|
/**
|