zoujiajian 2 éve
szülő
commit
bcc07fa3e5

+ 2 - 2
netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuInsert.java

@@ -1,7 +1,5 @@
 package com.cyksj.model.manage.request;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.cyksj.model.entity.GoodsDiscountPlusPurchaseRelation;
 import lombok.Getter;
 import lombok.Setter;
@@ -163,6 +161,8 @@ public class ReqGoodsSkuInsert {
          * mj relax次数
          */
         private Integer mjRelaxNum;
+
+        private Integer lumaNum;
     }
 
 }

+ 12 - 0
netflix-dao/src/main/java/com/cyksj/model/views/RenewalView.java

@@ -204,6 +204,12 @@ public class RenewalView {
     @DbField("sku.mj_relax_num")
     private Integer mjRelaxNum;
 
+    /**
+     * luma 次数
+     */
+    @DbField("sku.luma_num")
+    private Integer lumaNUm;
+
     /**
      * mj 套餐包最低单价
      */
@@ -234,6 +240,12 @@ public class RenewalView {
     @DbIgnore
     private Long gptUserLimitTime;
 
+    /**
+     * luma 用户次数
+     */
+    @DbIgnore
+    private Integer lumaUserNum;
+
     @DbIgnore
     private Long use;
 

+ 9 - 1
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -35,6 +35,7 @@ import com.cyksj.redis.RedisService;
 import com.cyksj.service.chatgpt.ChatGptAccountService;
 import com.cyksj.service.chatgpt.ChatGptAuthService;
 import com.cyksj.service.groups.GroupsFuncService;
+import com.cyksj.service.luma.LumaService;
 import com.cyksj.service.mail.CuiQiuMailService;
 import com.cyksj.service.mail.MailService;
 import com.cyksj.service.mange.coupon.CouponCommonService;
@@ -126,7 +127,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private final UpgradePackageMapper upgradePackageMapper;
 
-	private final GoodsDonQaRelateMapper goodsDonQaRelateMapper;
+	private final LumaService lumaService;
 
 	private final GroupsRelationNetflixService groupsRelationNetflixService;
 
@@ -299,6 +300,13 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				}
 				ticket.setIsRenewPackage(userInfo.getIsRenewPackage());
 			}
+			if (ticket.getGoodsId() == Constant.LUMA_GOODS_ID && ticket.getExpiryTime() != null) {
+				try {
+					LumaUser lumaUser = lumaService.getLumaUser(userId, ticket.getRelationId());
+					ticket.setLumaUserNum(lumaUser.getNum());
+				} catch (Exception e) {
+				}
+			}
 			List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
 			ticket.setRelationViews(relationUserViews);
 			if (ticket.getExpiryTime() != null) {