|
|
@@ -887,7 +887,7 @@ public class GroupRelationController {
|
|
|
*/
|
|
|
@GetMapping("/get/renew/skus/{relationId}/{skuId}")
|
|
|
public Result<List<RenewUpgradePackageFrontView>> getRenewSkus(@PathVariable Long relationId, @PathVariable Long skuId) {
|
|
|
- long userId = 234191;
|
|
|
+ long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
|
|
|
ChatgptUser chatgptUser = chatgptUserMapper.selectOne(Wrappers.lambdaQuery(ChatgptUser.class)
|
|
|
.eq(ChatgptUser::getRelationId, relationId));
|
|
|
@@ -922,7 +922,7 @@ public class GroupRelationController {
|
|
|
try {
|
|
|
List<RenewUpgradePackageFrontView.RenewSkuView> renewSkuViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, MapUtils.builder()
|
|
|
.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual)
|
|
|
- .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitNum, minNum.get()).op(Operator.GreaterEqual)
|
|
|
+ .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitNum, minNum.get()).op(Operator.GreaterThan)
|
|
|
.field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitTime, minTime.get()).op(LessEqual.class)
|
|
|
.field(RenewUpgradePackageFrontView.RenewSkuView::getSkuId, Jsons.parseList(renew.getUpgradeSkuIds(), Long.class)).op(Operator.InList)
|
|
|
.build());
|