zoujiajian há 1 ano atrás
pai
commit
4540a117e4

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/views/ClaudeUserView.java

@@ -52,4 +52,9 @@ public class ClaudeUserView {
      * 续费升级订单id
      */
     private Long renewOrderId;
+
+    /**
+     * 续费升级规格
+     */
+    private String renewSpecVal;
 }

+ 6 - 1
netflix-service/src/main/java/com/cyksj/service/claude/impl/ClaudeServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -65,7 +66,7 @@ public class ClaudeServiceImpl implements ClaudeService {
             GroupsTrips groupsTrips = getGroupsTrips(groupsRelation);
             GoodsDonSku goodsDonSku = skuMapper.selectById(groupsTrips.getSkuId());
 
-            return ClaudeUserView.builder()
+            ClaudeUserView view = ClaudeUserView.builder()
                     .skuName(goodsDonSku.getSubTitle())
                     .expireTime(claudeUser.getExpireTime())
                     .limitNum(claudeUser.getLimitNum())
@@ -75,6 +76,10 @@ public class ClaudeServiceImpl implements ClaudeService {
                     .renewOrderId(claudeUser.getRenewOrderId())
                     .use(Math.min(claudeUser.getLimitNum(), getConversationCount(claudeUser.getUserToken(), claudeUser.getLimitTime())))
                     .build();
+            if (view.getRenewSkuId() != null) {
+                Optional.ofNullable(skuMapper.selectById(view.getRenewSkuId())).ifPresent(renewSku -> view.setRenewSpecVal(renewSku.getSpecVal()));
+            }
+            return view;
         } else {
             throw BusinessRuntimeException.getInstance("您还未购买该车票");
         }