zoujiajian 2 lat temu
rodzic
commit
ba0a84dc37

+ 7 - 1
netflix-dao/src/main/java/com/cyksj/model/views/RenewUpgradePackageFrontView.java

@@ -44,18 +44,24 @@ public class RenewUpgradePackageFrontView {
 
 	@Getter
 	@Setter
-	@SearchBean(tables = "goods_don_sku", where = "status is true")
+	@SearchBean(tables = "goods_don_sku sku", where = "status is true")
 	public class RenewSkuView {
+		@DbField("sku.id")
 		private Long skuId;
 
+		@DbField("sku.months")
 		private Integer months;
 
+		@DbField("sku.gpt_limit_num")
 		private Integer gptLimitNum;
 
+		@DbField("sku.gpt_limit_time")
 		private Long gptLimitTime;
 
+		@DbField("sku.spec_val")
 		private String specVal;
 
+		@DbField("sku.price")
 		private BigDecimal price;
 	}
 }

+ 4 - 3
netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -894,7 +894,7 @@ public class GroupRelationController {
         Long renewSkuId = chatgptUser.getRenewSkuId();
         GoodsDonSku sku = goodsDonSkuMapper.selectById(skuId);
         AtomicInteger minMonths = new AtomicInteger(sku.getMonths());
-        AtomicInteger minNum = new AtomicInteger(sku.getNum());
+        AtomicInteger minNum = new AtomicInteger(sku.getGptLimitNum());
         if (renewSkuId != null) {
             GoodsDonSku presentRenew = goodsDonSkuMapper.selectById(renewSkuId);
             minMonths.set(presentRenew.getMonths());
@@ -920,11 +920,12 @@ public class GroupRelationController {
         List<RenewUpgradePackageFrontView> renewUpgradePackageFrontViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.class, MapUtils.builder().field(RenewUpgradePackageFrontView::getSkuId, skuId).build());
         renewUpgradePackageFrontViews.forEach(renew -> {
             try {
-                renew.setRenewSkus(beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, MapUtils.builder()
+                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::getSkuId, Jsons.parseList(renew.getUpgradeSkuIds(), Long.class)).op(Operator.InList)
-                        .build()));
+                        .build());
+                renew.setRenewSkus(renewSkuViews);
             } catch (Exception e) {
             }
         });