fix 修复套餐展示问题

xyzc-start/src/main/java/com/xyzc/start/controller/DiscoverPageController.java

@@ -2,9 +2,11 @@ package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
 import com.xyzc.start.domain.DrawAssistant;
+import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IDiscoverService;
 import com.xyzc.start.service.IDrawAssistantService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -48,6 +50,16 @@ public class DiscoverPageController {
     }
 
     /**
+     * 分页查询反向提示词
+     */
+    @GetMapping("/reversePrompt")
+    public Result<List<DrawReversePromptVo>> reversePrompt(Long reversePromptId, String keyword, Integer length) {
+        List<DrawReversePromptVo> reversePromptList = discoverService.queryReversePromptList(reversePromptId, keyword, length);
+
+        return Result.ok(reversePromptList);
+    }
+
+    /**
      * 查询所有的绘画助手
      */
     @GetMapping("/drawAssistantList")
@@ -61,8 +73,8 @@ public class DiscoverPageController {
      * 查询具体绘画助手的提示词
      */
     @GetMapping("/drawAssistant/{assistantId}")
-    public Result<List<DrawPromptConfigVo>> drawAssistant(@PathVariable Integer assistantId, Long promptId, String keyword) {
-        List<DrawPromptConfigVo> drawPromptConfigList = drawAssistantService.queryDrawPromptConfigList(assistantId, promptId, keyword);
+    public Result<List<DrawPromptConfigVo>> drawAssistant(@PathVariable Integer assistantId, Long promptId, String keyword, Integer length) {
+        List<DrawPromptConfigVo> drawPromptConfigList = drawAssistantService.queryDrawPromptConfigList(assistantId, promptId, keyword, length);
 
         return Result.ok(drawPromptConfigList);
     }
@@ -77,34 +89,20 @@ public class DiscoverPageController {
     }
 
     /**
-     * 精选应用
+     * 应用精选、特色、玩转
+     *
      */
     @GetMapping("/selectedApp")
-    public Result<List<Void>> selectedApp() {
+    public Result<List<BaseUserSelectAppVo>> selectedApp(@Valid AppQuery query) {
+        List<BaseUserSelectAppVo> appPageList = discoverService.queryAppPageList(query);
 
-        return Result.ok();
+        return Result.ok(appPageList);
     }
 
-    /**
-     * 特色应用列表
-     */
-    @GetMapping("/featureApp")
-    public Result<List<Void>> featureApp() {
-
-        return Result.ok();
-    }
-
-    /**
-     * 玩转应用列表
-     */
-    @GetMapping("/playApp")
-    public Result<List<Void>> playApp() {
-
-        return Result.ok();
-    }
 
     /**
      * 数字人列表
+     *
      */
     @GetMapping("/digitalHuman")
     public Result<List<Void>> digitalHuman() {

xyzc-start/src/main/java/com/xyzc/start/controller/SchemeController.java

@@ -51,15 +51,15 @@ public class SchemeController {
         return Result.ok(scheme);
     }
 
-    /**
-     * id查询燃料包详细权益
-     */
-    @GetMapping("/currentFuel/{fuelId}")
-    public Result<FuelPackageVo> currentFuelById(@PathVariable Long fuelId) {
-        FuelPackageVo fuelPackage = schemeService.queryCurrentFuelById(fuelId);
-
-        return Result.ok(fuelPackage);
-    }
+//    /**
+//     * id查询燃料包详细权益
+//     */
+//    @GetMapping("/currentFuel/{fuelId}")
+//    public Result<FuelPackageVo> currentFuelById(@PathVariable Long fuelId) {
+//        List<FuelPackageVo> fuelPackage = schemeService.queryCurrentFuelById(fuelId);
+//
+//        return Result.ok(fuelPackage);
+//    }
 
     /**
      * 燃料规则

xyzc-start/src/main/java/com/xyzc/start/controller/UserInfoController.java

@@ -6,10 +6,7 @@ import com.xyzc.start.constant.FuelDeduct;
 import com.xyzc.start.domain.bo.AgentCardSecretBo;
 import com.xyzc.start.domain.bo.BaseUserCollectBo;
 import com.xyzc.start.domain.bo.HobbyBo;
-import com.xyzc.start.domain.vo.BaseUserFuelFlowVo;
-import com.xyzc.start.domain.vo.BaseUserVo;
-import com.xyzc.start.domain.vo.IndustryVo;
-import com.xyzc.start.domain.vo.MemberCardUseDetail;
+import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IUserInfoService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -55,14 +52,14 @@ public class UserInfoController {
 
     /**
      * 获取会员卡使用详情
+     *
      * @param cardId 会员卡id
-     * @param useDetailId 会员卡使用详情id
      */
     @GetMapping("/cardUseDetail/{cardId}")
-    public Result< List<MemberCardUseDetail>> cardUseDetail(@PathVariable("cardId") Long cardId, Long useDetailId) {
-        List<MemberCardUseDetail> cardUseDetails = userInfoService.queryCardUseDetail(cardId, useDetailId);
+    public Result<BaseUserMemberCardVo> cardUseDetail(@PathVariable("cardId") Long cardId) {
+        BaseUserMemberCardVo baseUserMemberCardDetail = userInfoService.queryCardUseDetail(cardId);
 
-        return Result.ok(cardUseDetails);
+        return Result.ok(baseUserMemberCardDetail);
     }
 
 

xyzc-start/src/main/java/com/xyzc/start/domain/DrawReversePrompt.java

@@ -0,0 +1,24 @@
+package com.xyzc.start.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("xy_draw_reverse_prompt")
+public class DrawReversePrompt {
+
+    /**
+     * 反向提示词id
+     */
+    private Integer id;
+
+    /**
+     * 反向提示词内容
+     */
+    private String reversePrompt;
+
+    /**
+     * 英文反向提示词
+     */
+    private String reversePromptEn;
+}

xyzc-start/src/main/java/com/xyzc/start/domain/query/AppQuery.java

@@ -17,9 +17,19 @@ public class AppQuery {
     private String appName;
 
     /**
+     * 模糊查询关键字
+     */
+    private String keyword;
+
+    /**
      * 是否按收藏量查询，0-按使用量查询， 1-按收藏量查询
      */
     @Range(min = 0, max = 1, message = "类型错误，请输入{min}到{max}之间的数")
     private String selectType;
 
+    /**
+     * 查询类型，1-精选应用，2-特色应用，3-玩转应用
+     */
+    @Range(min = 1, max = 3, message = "类型错误，请输入{min}到{max}之间的数")
+    private Integer discoveryType;
 }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/BaseUserMemberCardVo.java

@@ -1,10 +1,12 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 基础用户会员卡大致信息
@@ -12,6 +14,7 @@ import java.util.Date;
  * @author 杨兴卓
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BaseUserMemberCardVo implements Serializable {
 
 
@@ -44,10 +47,25 @@ public class BaseUserMemberCardVo implements Serializable {
     private String cardAliasName;
 
     /**
+     * 会员卡创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 会员卡状态，0-生效，1-过期，2-冻结
+     */
+    private Integer status;
+
+    /**
      * 到期时间
      */
     private Date expireTime;
 
+    /**
+     * 会员卡使用详情
+     */
+    private List<MemberCardUseDetail> memberCardUseDetail;
+
 }
 
 

xyzc-start/src/main/java/com/xyzc/start/domain/vo/DrawReversePromptVo.java

@@ -0,0 +1,30 @@
+package com.xyzc.start.domain.vo;
+
+import com.xyzc.start.domain.DrawReversePrompt;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+@AutoMapper(target = DrawReversePrompt.class)
+public class DrawReversePromptVo {
+
+    /**
+     * 反向提示词id
+     */
+    private Integer id;
+
+    /**
+     * 反向提示词名称
+     */
+    private String reversePrompt;
+
+    /**
+     * 反向提示词引文名称
+     */
+    private String reversePromptEn;
+
+
+}

xyzc-start/src/main/java/com/xyzc/start/domain/vo/FuelPackageVo.java

@@ -1,8 +1,11 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.FuelPackage;
 import io.github.linpeilie.annotations.AutoMapper;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -15,14 +18,17 @@ import java.math.BigDecimal;
  * @author 杨兴卓
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 @AutoMapper(target = FuelPackage.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class FuelPackageVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-     * 燃料包id
+     * 代理商燃料包定价id
      */
     private Long id;
 
@@ -37,6 +43,11 @@ public class FuelPackageVo implements Serializable {
     private String fuelPackageName;
 
     /**
+     * 燃料包别名
+     */
+    private String fuelPackageAliasName;
+
+    /**
      * 出厂价格（积分）
      */
     private BigDecimal initialPrice;
@@ -51,5 +62,30 @@ public class FuelPackageVo implements Serializable {
      */
     private String description;
 
+    /**
+     * 划线价
+     */
+    private BigDecimal strikethroughPrice;
+    ;
+
+    /**
+     * 燃料包定价
+     */
+    private BigDecimal price;
+
+    /**
+     * 立省价格
+     */
+    private BigDecimal savePrice;
+
+
+    /**
+     * 覆盖
+     * @param savePrice
+     */
+    public void setSavePrice(BigDecimal savePrice) {
+
+        this.savePrice = strikethroughPrice.subtract(price);
+    }
 
 }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/MemberCardVo.java

@@ -102,5 +102,8 @@ public class MemberCardVo implements Serializable {
      */
     private List<EquityVo> equityList;
 
-
+    /**
+     * 权益数组
+     */
+    private List<MemberEquityVo> memberEquityList;
 }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/MemberEquityVo.java

@@ -0,0 +1,27 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 会员卡权益
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class MemberEquityVo {
+
+    /**
+     * 会员卡权益名称id
+     */
+    private Integer memberEquityid;
+
+    /**
+     * 会员卡权益名称
+     */
+    private String memberEquityName;
+
+    /**
+     * 会员卡权益总数
+     */
+    private Integer memberEquityCount;
+}

xyzc-start/src/main/java/com/xyzc/start/mapper/BaseUserCollectMapper.java

@@ -60,7 +60,7 @@ public interface BaseUserCollectMapper extends BaseMapperPlus<BaseUserCollect, B
      * @param collectId
      * @return
      */
-    List<DrawGraphicsCollectVo> queryDrawGraphicsById(Long userId, Long collectId, String name);
+    List<DrawGraphicsCollectVo> queryDrawGraphicsById(Long userId, Long collectId, String name, Integer length);
 
     /**
      * 根据上一个id，分页查询应用
@@ -111,4 +111,12 @@ public interface BaseUserCollectMapper extends BaseMapperPlus<BaseUserCollect, B
      * @param type
      */
     BaseUserCollect queryCollectByIdAndCollectId(Long userId, Long collectId, Integer type);
+
+    /**
+     * 查询该用户使用历史app
+     *
+     * @param userId
+     * @return
+     */
+    List<BaseUserCollectAppVo> queryMoreHistoryAppBy(Long userId);
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/BaseUserMemberCardMapper.java

@@ -1,10 +1,19 @@
 package com.xyzc.start.mapper;
 
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
+import com.xyzc.start.domain.MemberCard;
+import com.xyzc.start.domain.vo.BaseUserMemberCardDetailVo;
 import com.xyzc.start.domain.vo.BaseUserMemberCardVo;
 
-public interface BaseUserMemberCardMapper  extends BaseMapperPlus<BaseUserMemberCardMapper, BaseUserMemberCardVo> {
+public interface BaseUserMemberCardMapper extends BaseMapperPlus<BaseUserMemberCardMapper, BaseUserMemberCardVo> {
 
 
+    /**
+     * 会员卡id查询详细信息
+     *
+     * @param userId
+     * @param cardId
+     */
+    BaseUserMemberCardVo queryMemberCard(Long userId, Long cardId,Long agentId);
 
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/DrawAssistantMapper.java

@@ -5,6 +5,7 @@ import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.DrawAssistant;
 import com.xyzc.start.domain.vo.DrawAssistantVo;
 import com.xyzc.start.domain.vo.DrawPromptConfigVo;
+import com.xyzc.start.domain.vo.DrawReversePromptVo;
 
 import java.util.List;
 
@@ -12,9 +13,19 @@ public interface DrawAssistantMapper extends BaseMapperPlus<DrawAssistant, DrawA
 
     /**
      * 分页查询助手下对应的prompt列表
+     *
      * @param assistantId
      * @param promptId
      * @return
      */
-    List<DrawPromptConfigVo> queryDrawPromptList(Integer assistantId, Long promptId, String keyword);
+    List<DrawPromptConfigVo> queryDrawPromptList(Integer assistantId, Long promptId, String keyword, Integer length);
+
+    /**
+     * 分页查询反向prompt列表
+     *
+     * @param reversePromptId
+     * @param keyword
+     * @return
+     */
+    List<DrawReversePromptVo> queryDrawReservePrompt(Long reversePromptId, String keyword, Integer length);
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/SchemeMapper.java

@@ -54,10 +54,10 @@ public interface SchemeMapper extends BaseMapperPlus<Scheme, SchemeVo> {
 
     /**
      * 根据燃料id查询方案
-     * @param userId
+     *
      * @param fuelId
      * @return
      */
-    FuelPackageVo queryFuelPackageById(Long userId, Long fuelId);
+    List<FuelPackageVo> queryFuelPackageById(Long fuelId);
 
 }

xyzc-start/src/main/java/com/xyzc/start/service/IDiscoverService.java

@@ -1,9 +1,7 @@
 package com.xyzc.start.service;
 
-import com.xyzc.start.domain.vo.DrawGraphicsSquareVo;
-import com.xyzc.start.domain.vo.DrawGraphicsVo;
-import com.xyzc.start.domain.vo.DrawModelCollectVo;
-import com.xyzc.start.domain.vo.DrawModelVo;
+import com.xyzc.start.domain.query.AppQuery;
+import com.xyzc.start.domain.vo.*;
 
 import java.util.List;
 
@@ -31,4 +29,20 @@ public interface IDiscoverService {
     List<DrawModelCollectVo> queryDrawModelList(Long drawModelId, String keyword);
 
 
+    /**
+     * 分页查询app列表
+     *
+     * @param query
+     * @return
+     */
+    List<BaseUserSelectAppVo> queryAppPageList(AppQuery query);
+
+    /**
+     * 分页查询反向关键字
+     *
+     * @param reversePromptId
+     * @param keyword
+     * @return
+     */
+    List<DrawReversePromptVo> queryReversePromptList(Long reversePromptId, String keyword, Integer length);
 }

xyzc-start/src/main/java/com/xyzc/start/service/IDrawAssistantService.java

@@ -19,5 +19,5 @@ public interface IDrawAssistantService {
      * @param assistantId
      * @return
      */
-    List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword);
+    List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length);
 }

xyzc-start/src/main/java/com/xyzc/start/service/ISchemeService.java

@@ -25,10 +25,11 @@ public interface ISchemeService {
 
     /**
      * 获取具体的燃料信息
+     *
      * @param fuelId
      * @return
      */
-    FuelPackageVo queryCurrentFuelById(Long fuelId);
+    List<FuelPackageVo> queryCurrentFuelById(Long fuelId);
 
     /**
      * 获取具体的会员卡信息
@@ -39,7 +40,7 @@ public interface ISchemeService {
     MemberCardVo queryCurrentMemberById(Long memberId);
 
     /**
-     * 燃料规则详情列表详情
+     * 分页查询燃料规则详情
      *
      * @param modelId 模型id
      * @return

xyzc-start/src/main/java/com/xyzc/start/service/IUserInfoService.java

@@ -99,8 +99,10 @@ public interface IUserInfoService {
 
     /**
      * 获取会员卡使用详情
+     *
      * @param cardId
      * @return
      */
-    List<MemberCardUseDetail> queryCardUseDetail(Long cardId, Long useDetailId);
+    BaseUserMemberCardVo queryCardUseDetail(Long cardId);
+
 }

xyzc-start/src/main/java/com/xyzc/start/service/impl/DiscoverServiceImpl.java

@@ -1,10 +1,10 @@
 package com.xyzc.start.service.impl;
 
 import com.xyzc.common.web.security.user.SecurityUser;
-import com.xyzc.start.domain.vo.DrawGraphicsSquareVo;
-import com.xyzc.start.domain.vo.DrawGraphicsVo;
-import com.xyzc.start.domain.vo.DrawModelCollectVo;
-import com.xyzc.start.domain.vo.DrawModelVo;
+import com.xyzc.start.domain.query.AppQuery;
+import com.xyzc.start.domain.vo.*;
+import com.xyzc.start.mapper.AppMapper;
+import com.xyzc.start.mapper.DrawAssistantMapper;
 import com.xyzc.start.mapper.DrawGraphicsMapper;
 import com.xyzc.start.mapper.DrawModelMapper;
 import com.xyzc.start.service.IDiscoverService;
@@ -26,6 +26,9 @@ public class DiscoverServiceImpl implements IDiscoverService {
 
     private final DrawGraphicsMapper drawGraphicsMapper;
 
+    private final AppMapper appMapper;
+    private final DrawAssistantMapper drawAssistantMapper;
+
     /**
      * 根据id返回分页绘画
      *
@@ -50,5 +53,27 @@ public class DiscoverServiceImpl implements IDiscoverService {
         return drawModelMapper.queryDrawModelList(SecurityUser.getUserId(), drawModelId, keyword);
     }
 
+    /**
+     * 分页查询所有app
+     *
+     * @return
+     */
+    @Override
+    public List<BaseUserSelectAppVo> queryAppPageList(AppQuery query) {
+
+        return appMapper.queryAppQuery(SecurityUser.getUserId(), query);
+    }
 
+    /**
+     * 根据promptId查询反向提示词列表
+     *
+     * @param reversePromptId
+     * @param keyword
+     * @return
+     */
+    @Override
+    public List<DrawReversePromptVo> queryReversePromptList(Long reversePromptId, String keyword, Integer length) {
+
+        return drawAssistantMapper.queryDrawReservePrompt(reversePromptId, keyword, length == null ? 10 : length);
+    }
 }

xyzc-start/src/main/java/com/xyzc/start/service/impl/DrawAssistantServiceImpl.java

@@ -33,9 +33,9 @@ public class DrawAssistantServiceImpl implements IDrawAssistantService {
      * @return
      */
     @Override
-    public List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword) {
+    public List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length) {
 
-        return drawAssistantMapper.queryDrawPromptList(assistantId, promptId, keyword);
+        return drawAssistantMapper.queryDrawPromptList(assistantId, promptId, keyword, length == null ? 10 : length);
 
     }
 }

xyzc-start/src/main/java/com/xyzc/start/service/impl/HomePageServiceImpl.java

@@ -62,7 +62,7 @@ public class HomePageServiceImpl implements IHomePageService {
     public List<BaseUserCollectAppVo> getRecentlyUsed(Long appId) {
         // 获取最近使用应用
 
-        return baseUserCollectMapper.queryHistoryAppBy(SecurityUser.getUserId());
+        return baseUserCollectMapper.queryMoreHistoryAppBy(SecurityUser.getUserId());
     }
 
     /**

xyzc-start/src/main/java/com/xyzc/start/service/impl/MyCollectServiceImpl.java

@@ -53,7 +53,7 @@ public class MyCollectServiceImpl implements IMyCollectService {
     @Override
     public List<DrawGraphicsCollectVo> getCollectImage(Long collectId, String name) {
 
-        return baseUserCollectMapper.queryDrawGraphicsById(SecurityUser.getUserId(), collectId, name);
+        return baseUserCollectMapper.queryDrawGraphicsById(SecurityUser.getUserId(), collectId, name, 10);
     }
 
 

xyzc-start/src/main/java/com/xyzc/start/service/impl/SchemeServiceImpl.java

@@ -2,10 +2,7 @@ package com.xyzc.start.service.impl;
 
 import com.xyzc.common.core.exception.ErrorCode;
 import com.xyzc.common.core.utils.AssertUtils;
-import com.xyzc.common.core.utils.Result;
 import com.xyzc.common.web.security.user.SecurityUser;
-import com.xyzc.start.domain.MemberCard;
-import com.xyzc.start.domain.Scheme;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.mapper.AiModelMapper;
 import com.xyzc.start.mapper.EquityMapper;
@@ -14,12 +11,9 @@ import com.xyzc.start.mapper.SchemeMapper;
 import com.xyzc.start.service.ISchemeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.xbill.DNS.dnssec.R;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -45,17 +39,17 @@ public class SchemeServiceImpl implements ISchemeService {
         // 让memberCardVos中根据memberId合并成新的List
         List<List<MemberCardVo>> memberList = new ArrayList<>();
         List<MemberCardVo> collect = new ArrayList<>();
-        //TODO ： 添加立省金额
         for (MemberCardVo memberCardVo : memberCardVos) {
             // collect不为空并且memberCardId不一致时新建一个list
-            if (!collect.isEmpty() &&
-                    !collect.get(0).getMemberCardId().equals(memberCardVo.getMemberCardId())) {
+            if (!collect.isEmpty() && !collect.get(0).getMemberCardId().equals(memberCardVo.getMemberCardId())) {
                 memberList.add(collect);
                 collect = new ArrayList<>();
             }
             // 对当前值进行处理
             memberCardVo.setSaveMoney(memberCardVo.getPrice().subtract(memberCardVo.getStrikethroughPrice()));
             collect.add(memberCardVo);
+            memberCardVo.setMemberEquityList(grouth());
+
         }
         memberList.add(collect);
 
@@ -65,6 +59,37 @@ public class SchemeServiceImpl implements ISchemeService {
         return scheme;
     }
 
+    private static List<MemberEquityVo> grouth() {
+        ArrayList<MemberEquityVo> objects = new ArrayList<>();
+
+        MemberEquityVo memberCardVo = new MemberEquityVo();
+        memberCardVo.setMemberEquityid(1);
+        memberCardVo.setMemberEquityName("应用权益");
+        memberCardVo.setMemberEquityCount(230);
+
+        MemberEquityVo memberCardVo2 = new MemberEquityVo();
+        memberCardVo2.setMemberEquityid(2);
+        memberCardVo2.setMemberEquityName("AI绘画");
+        memberCardVo2.setMemberEquityCount(2320);
+
+        MemberEquityVo memberCardVo3 = new MemberEquityVo();
+        memberCardVo3.setMemberEquityid(2);
+        memberCardVo3.setMemberEquityName("AI绘画");
+        memberCardVo3.setMemberEquityCount(2320);
+
+        MemberEquityVo memberCardVo4 = new MemberEquityVo();
+        memberCardVo4.setMemberEquityid(2);
+        memberCardVo4.setMemberEquityName("AI绘画");
+        memberCardVo4.setMemberEquityCount(2320);
+
+        MemberEquityVo memberCardVo5= new MemberEquityVo();
+        memberCardVo5.setMemberEquityid(2);
+        memberCardVo5.setMemberEquityName("AI绘画");
+        memberCardVo5.setMemberEquityCount(2320);
+
+        return objects;
+    }
+
     /**
      * 根据id获取燃料信息
      *
@@ -72,13 +97,13 @@ public class SchemeServiceImpl implements ISchemeService {
      * @return
      */
     @Override
-    public FuelPackageVo queryCurrentFuelById(Long fuelId) {
+    public List<FuelPackageVo> queryCurrentFuelById(Long fuelId) {
 
-        return schemeMapper.queryFuelPackageById(SecurityUser.getUserId(), fuelId);
+        return schemeMapper.queryFuelPackageById(fuelId);
     }
 
     /**
-     * 获取
+     * 分页查询燃料规则详情
      *
      * @param modelId 模型id
      * @return
@@ -112,8 +137,14 @@ public class SchemeServiceImpl implements ISchemeService {
         List<SchemeVo> currentFuel = schemeMapper.getCurrentFuel();
         // 有且只有一个会员卡套餐生效
         AssertUtils.isUnique(currentFuel, ErrorCode.SCHEME_NOT_UNIQUE);
+        SchemeVo scheme = currentFuel.get(0);
 
-        return currentFuel.get(0);
+        // 根据套餐查询燃料
+        List<FuelPackageVo> fuelPackageVo = schemeMapper.queryFuelPackageById(scheme.getId());
+
+        scheme.setFuelPackageList(fuelPackageVo);
+
+        return scheme;
     }
 
 }

xyzc-start/src/main/java/com/xyzc/start/service/impl/UserInfoServiceImpl.java

@@ -38,6 +38,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
     private final DrawGraphicsMapper drawGraphicsMapper;
     private final DrawModelMapper drawModelMapper;
     private final BaseUserMemberCardMapper baseUserMemberCardMapper;
+    private final MemberCardMapper memberCardMapper;
 
     /**
      * 获取当前用户信息
@@ -180,12 +181,11 @@ public class UserInfoServiceImpl implements IUserInfoService {
      * @return
      */
     @Override
-    public List<MemberCardUseDetail> queryCardUseDetail(Long cardId, Long useDetailId) {
-        List<MemberCardUseDetail> objects = new ArrayList<>();
+    public BaseUserMemberCardVo queryCardUseDetail(Long cardId) {
+        // todo: 目前商户是写死的
+        BaseUserMemberCardVo baseUserMemberCardVo = baseUserMemberCardMapper.queryMemberCard(SecurityUser.getUserId(), cardId, 1810310843224322049L);
 
-        if (useDetailId != null && useDetailId < 124L) {
-            return null;
-        }
+        List<MemberCardUseDetail> objects = new ArrayList<>();
 
         MemberCardUseDetail memberCardUseDetail = new MemberCardUseDetail();
         memberCardUseDetail.setModelId(1242112L);
@@ -262,7 +262,9 @@ public class UserInfoServiceImpl implements IUserInfoService {
         objects.add(memberCardUseDetail8);
         objects.add(memberCardUseDetail9);
         objects.add(memberCardUseDetail10);
-        return objects;
+
+        baseUserMemberCardVo.setMemberCardUseDetail(objects);
+        return baseUserMemberCardVo;
     }
 
 

xyzc-start/src/main/resources/mapper/WebStart/AgentConfigMapper.xml

@@ -5,5 +5,19 @@
 <mapper namespace="com.xyzc.start.mapper.BaseUserMemberCardMapper">
 
 
+    <select id="queryMemberCard" resultType="com.xyzc.start.domain.vo.BaseUserMemberCardVo">
+        select bumc.id,
+               xmcan.alias_name AS card_name,
+               bumc.create_time,
+               bumc.expire_time,
+               bumc.status
+        from xy_base_user_member_card bumc
+                 LEFT JOIN xy_member_card_alias_name xmcan
+                           ON xmcan.id = bumc.member_card_alias_id and xmcan.agent_mer_id = #{agentId}
+        where bumc.base_user_id = #{userId}
+          AND bumc.memeber_id = #{cardId}
+          AND bumc.del_flag = '0'
+    </select>
+
 
 </mapper>

xyzc-start/src/main/resources/mapper/WebStart/BaseUserCollectMapper.xml

@@ -119,7 +119,7 @@
             and xbuc.collect_id < #{collectId}
         </if>
         ORDER BY xbuc.id DESC
-        LIMIT 10
+        LIMIT #{length}
     </select>
 
     <select id="queryCarefulSelectAppBy" resultType="com.xyzc.start.domain.vo.BaseUserSelectAppVo">
@@ -134,6 +134,9 @@
             app.use_count   AS use_count
         FROM xy_discover_app xda
             LEFT JOIN xy_app app ON xda.app_id = app.id
+            LEFT JOIN xy_base_user_collect xbuc ON app.id = xbuc.collect_id
+                    AND xbuc.type = 3
+                    AND xbuc.base_user_id = #{userId}
             LEFT JOIN sys_oss oss ON app.oss_id = oss.oss_id
             LEFT JOIN xy_ai_model_app ama ON ama.app_id = app.id
             LEFT JOIN xy_ai_model am ON ama.ai_model_id = am.id
@@ -198,7 +201,6 @@
             </foreach>
         </if>
 
-
     </select>
 
 
@@ -215,5 +217,7 @@
 
     </select>
 
+    <select id="queryMoreHistoryAppBy" resultType="com.xyzc.start.domain.vo.BaseUserCollectAppVo"></select>
+
 
 </mapper>

xyzc-start/src/main/resources/mapper/WebStart/BaseUserMapper.xml

@@ -34,6 +34,7 @@
                mcan.alias_name  as card_alias_name,
                mc.card_level    as card_level,
                oss.url          as oss_url,
+               bumc.create_time as create_time,
                bumc.expire_time as expire_time
         from xy_base_user bu
                  left join xy_base_user_member_card bumc on bu.id = bumc.base_user_id

xyzc-start/src/main/resources/mapper/WebStart/DrawAssistantMapper.xml

@@ -20,8 +20,21 @@
         <if test="keyword != null">
             and xdpc.prompt like concat('%',#{keyword},'%')
         </if>
+        LIMIT #{length}
     </select>
 
+    <select id="queryDrawReservePrompt" resultType="com.xyzc.start.domain.vo.DrawReversePromptVo">
+        select
+        *
+        from xy_draw_reverse_prompt
+        <where>
+            <if test="keyword != null">
+                AND reverse_prompt like concat('%',#{keyword},'%')
+                OR reverse_prompt_en like concat('%',#{keyword},'%')
+            </if>
+        </where>
+        limit #{length}
+    </select>
 
 
 </mapper>

xyzc-start/src/main/resources/mapper/WebStart/SchemeMapper.xml

@@ -7,9 +7,20 @@
 
 
     <select id="queryFuelPackageById" resultType="com.xyzc.start.domain.vo.FuelPackageVo">
-        select * from xy_fuel_package where id = #{id}
+        select xafpp.id,
+               xfp.fuel_package_name    AS fuelPackageName,
+               xfp.description,
+               xafpp.strikethrough_price,
+              xafpp.agent_price         AS price
+        from xy_fuel_package xfp
+                 LEFT join xy_agent_fuel_package_price xafpp on xfp.id = xafpp.fuel_package_id
+        where xfp.scheme_id = #{fuelId}
     </select>
 
 
+    <select id="queryMemberCardByMemberId" resultType="com.xyzc.start.domain.vo.MemberCardVo">
+
+    </select>
+
 
 </mapper>

xyzc-start/src/main/resources/mapper/WebStart/WebAppGroupMapper.xml

@@ -17,7 +17,7 @@
                 oss2.url AS ai_model_icon,
                 app.use_count,
                 buc.is_collect AS is_collect,
-                app.is_choiceness
+                xda.discover_app_type AS is_choiceness
         FROM xy_web_app_group wag
         LEFT JOIN xy_web_app_group_app waga ON wag.id = waga.web_app_group_id
         LEFT JOIN xy_app app ON app.id = waga.app_id
@@ -26,6 +26,7 @@
         LEFT JOIN xy_ai_model xam ON xam.id = xama.ai_model_id
         LEFT JOIN sys_oss oss2 ON xam.ai_model_logo_oss_id = oss2.oss_id
         LEFT JOIN xy_base_user_collect buc ON buc.collect_id = app.id
+        LEFT JOIN xy_discover_app xda ON xda.app_id = app.id
         AND buc.type = 3
         AND buc.base_user_id = #{userId}
         WHERE wag.id = #{typeId}