Merge remote-tracking branch 'origin/yxz' into yxz

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

@@ -1,15 +1,14 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.start.domain.vo.DrawGraphicsSquareVo;
-import com.xyzc.start.domain.vo.DrawGraphicsVo;
-import com.xyzc.start.domain.vo.DrawModelVo;
+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.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -27,12 +26,14 @@ public class DiscoverPageController {
 
     private final IDiscoverService discoverService;
 
+    private final IDrawAssistantService drawAssistantService;
+
     /**
      * 绘画广场
      */
     @GetMapping("/drawSquare")
-    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId) {
-        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId);
+    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId, String keyword) {
+        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId, keyword);
 
         return Result.ok(drawGraphicsList);
     }
@@ -42,61 +43,66 @@ public class DiscoverPageController {
      * 绘画模型
      */
     @GetMapping("/drawModel")
-    public Result<List<DrawModelVo>> drawModel(Long drawModelId) {
-        List<DrawModelVo> drawModelList = discoverService.queryDrawModelList(drawModelId);
+    public Result<List<DrawModelCollectVo>> drawModel(Long drawModelId, String keyword) {
+        List<DrawModelCollectVo> drawModelList = discoverService.queryDrawModelList(drawModelId, keyword);
 
         return Result.ok(drawModelList);
     }
 
-
     /**
-     * 绘画助手
+     * 分页查询反向提示词
      */
-    @GetMapping("/drawAssistant")
-    public Result<List<Void>> drawAssistant() {
-
+    @GetMapping("/reversePrompt")
+    public Result<List<DrawReversePromptVo>> reversePrompt(Long reversePromptId, String keyword, Integer length) {
+        List<DrawReversePromptVo> reversePromptList = discoverService.queryReversePromptList(reversePromptId, keyword, length);
 
-        return Result.ok();
+        return Result.ok(reversePromptList);
     }
 
     /**
-     * 进入具体绘画模型
+     * 查询所有的绘画助手
      */
-    @GetMapping("/drawModel/{modelId}")
-    public Result<List<Void>> querydrawModel(String modelId) {
+    @GetMapping("/drawAssistantList")
+    public Result<List<DrawAssistantVo>> drawAssistantList() {
+        List<DrawAssistantVo> drawAssistantList = drawAssistantService.queryDrawAssistantList();
 
-        return Result.ok();
+        return Result.ok(drawAssistantList);
     }
 
     /**
-     * 精选应用
+     * 查询具体绘画助手的提示词
      */
-    @GetMapping("/selectedApp")
-    public Result<List<Void>> selectedApp() {
+    @GetMapping("/drawAssistant/{assistantId}")
+    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();
+        return Result.ok(drawPromptConfigList);
     }
 
     /**
-     * 特色应用列表
+     * 进入具体绘画模型
      */
-    @GetMapping("/featureApp")
-    public Result<List<Void>> featureApp() {
+    @GetMapping("/drawModelDetail/{modelId}")
+    public Result<List<Void>> queryDrawModel(@PathVariable String modelId) {
 
         return Result.ok();
     }
 
     /**
-     * 玩转应用列表
+     * 应用精选、特色、玩转
+     *
      */
-    @GetMapping("/playApp")
-    public Result<List<Void>> playApp() {
+    @GetMapping("/selectedApp")
+    public Result<List<BaseUserSelectAppVo>> selectedApp(@Valid AppQuery query) {
+        List<BaseUserSelectAppVo> appPageList = discoverService.queryAppPageList(query);
 
-        return Result.ok();
+        return Result.ok(appPageList);
     }
 
+
     /**
      * 数字人列表
+     *
      */
     @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,9 +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.*;
 import com.xyzc.start.service.IUserInfoService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -54,14 +52,14 @@ public class UserInfoController {
 
     /**
      * 获取会员卡使用详情
+     *
      * @param cardId 会员卡id
-     * @param useDetailId 会员卡使用详情id
      */
     @GetMapping("/cardUseDetail/{cardId}")
-    public Result<BaseUserVo> cardUseDetail(@PathVariable("cardId") Long cardId, Long useDetailId) {
-        BaseUserVo baseUserVo = userInfoService.queryCardUseDetail(cardId);
+    public Result<BaseUserMemberCardVo> cardUseDetail(@PathVariable("cardId") Long cardId) {
+        BaseUserMemberCardVo baseUserMemberCardDetail = userInfoService.queryCardUseDetail(cardId);
 
-        return Result.ok(baseUserVo);
+        return Result.ok(baseUserMemberCardDetail);
     }
 
 

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

@@ -0,0 +1,19 @@
+package com.xyzc.start.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("xy_draw_assistant")
+public class DrawAssistant {
+
+    /**
+     * 绘画助手id
+     */
+    private Long id;
+
+    /**
+     * 绘画助手名称
+     */
+    private String assistant;
+}

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

@@ -43,7 +43,7 @@ public class DrawModel extends BaseEntity {
 
     private String description;
 
-    private Long ossId;
+    private String ossUrl;
 
     @TableLogic
     private String delFlag;

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

@@ -0,0 +1,33 @@
+package com.xyzc.start.domain;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+/**
+ * DrawPromptConfig
+ *
+ *
+ */
+@Data
+public class DrawPromptConfig {
+
+    /**
+     * 提示词id
+     */
+    private Long id;
+
+    /**
+     * 提示词图片地址
+     */
+    private String promptOssUrl;
+
+    /**
+     * 提示词中文
+     */
+    private String prompt;
+
+    /**
+     * 提示词英文
+     */
+    private String promptEn;
+}

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/BaseUserSelectAppVo.java

@@ -1,15 +1,17 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 /**
  * 用户精选应用
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BaseUserSelectAppVo {
 
     /**
-     * 职业id
+     * 职业名称
      */
     private String careerName;
 

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

@@ -0,0 +1,24 @@
+package com.xyzc.start.domain.vo;
+
+import com.xyzc.start.domain.DrawAssistant;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+@AutoMapper(target = DrawAssistant.class)
+public class DrawAssistantVo {
+
+    /**
+     * 助手id
+     */
+    private String id;
+
+    /**
+     * 助手标题
+     */
+    private String assistant;
+
+}

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

@@ -14,7 +14,7 @@ public class DrawModelCollectVo extends DrawModelVo{
     private String collectId;
 
     /**
-     * 是否收藏
+     * 是否收藏， 0：未收藏，1：已收藏
      */
     private Integer isCollect;
 

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

@@ -42,7 +42,7 @@ public class DrawModelVo {
     /**
      * 绘画模型图片
      */
-    private String ossId;
+    private String ossUrl;
 
     /**
      * 使用人数

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

@@ -0,0 +1,32 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+/**
+ * DrawPromptConfigVo
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class DrawPromptConfigVo {
+
+    /**
+     * 提示词id
+     */
+    private Long promptId;
+
+    /**
+     * 提示词图片地址
+     */
+    private String promptOssUrl;
+
+    /**
+     * 提示词中文
+     */
+    private String prompt;
+
+    /**
+     * 提示词英文
+     */
+    private String promptEn;
+}

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/MemberCardUseDetail.java

@@ -0,0 +1,38 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 会员卡使用详情
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class MemberCardUseDetail {
+
+    /**
+     * 模型id
+     */
+    private Long modelId;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 模型使用次数
+     */
+    private Integer useCount;
+
+    /**
+     * 模型使用次数单位, 0-天，1-周，2-月，3-季
+     */
+    private Integer unit;
+
+    /**
+     * 当前模型已使用次数
+     */
+    private Integer alreadyUseCount;
+
+}

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，分页查询应用
@@ -92,7 +92,7 @@ public interface BaseUserCollectMapper extends BaseMapperPlus<BaseUserCollect, B
      *
      * @return
      */
-    List<BaseUserSelectAppVo> queryCarefulSelectAppBy(Long appId, Integer length);
+    List<BaseUserSelectAppVo> queryCarefulSelectAppBy(Long userId, Long appId, Integer length);
 
     /**
      * 查询该用户是否收藏应用
@@ -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

@@ -0,0 +1,31 @@
+package com.xyzc.start.mapper;
+
+
+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;
+
+public interface DrawAssistantMapper extends BaseMapperPlus<DrawAssistant, DrawAssistantVo> {
+
+    /**
+     * 分页查询助手下对应的prompt列表
+     *
+     * @param assistantId
+     * @param promptId
+     * @return
+     */
+    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/DrawGraphicsMapper.java

@@ -17,7 +17,7 @@ public interface DrawGraphicsMapper extends BaseMapperPlus<DrawGraphics, DrawGra
      * @param graphicsId
      * @return
      */
-    List<DrawGraphicsSquareVo> queryGraphics(Long userId, Long graphicsId);
+    List<DrawGraphicsSquareVo> queryGraphics(Long userId, Long graphicsId, String keyword);
 
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.DrawModel;
 import com.xyzc.start.domain.vo.DrawGraphicsVo;
+import com.xyzc.start.domain.vo.DrawModelCollectVo;
 import com.xyzc.start.domain.vo.DrawModelVo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -23,7 +24,7 @@ public interface DrawModelMapper extends BaseMapperPlus<DrawModel, DrawModelVo>
      * @param drawModelId
      * @return
      */
-    List<DrawModelVo> queryDrawModelList(Long drawModelId);
+    List<DrawModelCollectVo> queryDrawModelList(Long userId ,Long drawModelId, String keyword);
 
 
 }

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,8 +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.DrawModelVo;
+import com.xyzc.start.domain.query.AppQuery;
+import com.xyzc.start.domain.vo.*;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@ public interface IDiscoverService {
      * @param graphicsId Long
      * @return List<DrawGraphicsVo>
      */
-    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId);
+    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword);
 
     /**
      * 分页查询绘画模型
@@ -27,7 +26,23 @@ public interface IDiscoverService {
      * @param drawModelId
      * @return
      */
-    List<DrawModelVo> queryDrawModelList(Long drawModelId);
+    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

@@ -0,0 +1,23 @@
+package com.xyzc.start.service;
+
+import com.xyzc.start.domain.vo.DrawAssistantVo;
+import com.xyzc.start.domain.vo.DrawPromptConfigVo;
+
+import java.util.List;
+
+public interface IDrawAssistantService {
+
+    /**
+     * 查询所有的助手列表
+     *
+     * @return
+     */
+    List<DrawAssistantVo> queryDrawAssistantList();
+
+    /**
+     * 根据助手id分页查询提示词
+     * @param assistantId
+     * @return
+     */
+    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
      */
-    BaseUserVo queryCardUseDetail(Long cardId);
+    BaseUserMemberCardVo queryCardUseDetail(Long cardId);
+
 }

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

@@ -1,9 +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.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;
@@ -25,6 +26,9 @@ public class DiscoverServiceImpl implements IDiscoverService {
 
     private final DrawGraphicsMapper drawGraphicsMapper;
 
+    private final AppMapper appMapper;
+    private final DrawAssistantMapper drawAssistantMapper;
+
     /**
      * 根据id返回分页绘画
      *
@@ -32,9 +36,9 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId) {
+    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword) {
 
-        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId);
+        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId, keyword);
     }
 
     /**
@@ -44,10 +48,32 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<DrawModelVo> queryDrawModelList(Long drawModelId) {
+    public List<DrawModelCollectVo> queryDrawModelList(Long drawModelId, String keyword) {
 
-        return drawModelMapper.queryDrawModelList(drawModelId);
+        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

@@ -0,0 +1,41 @@
+package com.xyzc.start.service.impl;
+
+import com.xyzc.start.domain.vo.DrawAssistantVo;
+import com.xyzc.start.domain.vo.DrawPromptConfigVo;
+import com.xyzc.start.mapper.DrawAssistantMapper;
+import com.xyzc.start.service.IDrawAssistantService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class DrawAssistantServiceImpl implements IDrawAssistantService {
+
+
+    private final DrawAssistantMapper drawAssistantMapper;
+
+    /**
+     * 查询抽奖助手列表
+     *
+     * @return
+     */
+    @Override
+    public List<DrawAssistantVo> queryDrawAssistantList() {
+
+        return drawAssistantMapper.selectVoList(null);
+    }
+
+    /**
+     * @param assistantId
+     * @param promptId
+     * @return
+     */
+    @Override
+    public List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length) {
+
+        return drawAssistantMapper.queryDrawPromptList(assistantId, promptId, keyword, length == null ? 10 : length);
+
+    }
+}

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

@@ -41,18 +41,8 @@ public class HomePageServiceImpl implements IHomePageService {
         List<BaseUserCollectAppVo> historyAppList = baseUserCollectMapper.queryHistoryAppBy(SecurityUser.getUserId());
 
         // 获取精选应用 前4个
-        List<BaseUserSelectAppVo> carefulSelectAppList = baseUserCollectMapper.queryCarefulSelectAppBy(null, 4);
-        // 以精选应用id为key,精选应用为value,生成一个map，并且去重
-        Map<Long, BaseUserSelectAppVo> collect = carefulSelectAppList
-                .stream()
-                .collect(Collectors.toMap(BaseUserSelectAppVo::getAppId, Function.identity(), (k1, k2) -> k1));
+        List<BaseUserSelectAppVo> carefulSelectAppList = baseUserCollectMapper.queryCarefulSelectAppBy(SecurityUser.getUserId(), null,4);
 
-        // 将map的id值转换为list
-        List<Long> appIdList = new ArrayList<>(collect.keySet());
-        List<BaseUserCollect> baseUserCollect = baseUserCollectMapper.queryCollectAppByUserIdAndAppId(SecurityUser.getUserId(), appIdList, BaseUserConst.COLLECT_APP);
-        for (BaseUserCollect app : baseUserCollect){
-            collect.get(app.getCollectId()).setIsCollect(app.getIsCollect());
-        }
 
         //生成数据返回给视图
         WebHomePageVo webHomePageVo = new WebHomePageVo();
@@ -72,7 +62,7 @@ public class HomePageServiceImpl implements IHomePageService {
     public List<BaseUserCollectAppVo> getRecentlyUsed(Long appId) {
         // 获取最近使用应用
 
-        return baseUserCollectMapper.queryHistoryAppBy(SecurityUser.getUserId());
+        return baseUserCollectMapper.queryMoreHistoryAppBy(SecurityUser.getUserId());
     }
 
     /**
@@ -107,7 +97,7 @@ public class HomePageServiceImpl implements IHomePageService {
     @Override
     public List<BaseUserSelectAppVo> getMoreSelector(Long appId) {
         // 获取更多精选应用
-        List<BaseUserSelectAppVo> baseUserSelectAppVos = baseUserCollectMapper.queryCarefulSelectAppBy(appId, 10);
+        List<BaseUserSelectAppVo> baseUserSelectAppVos = baseUserCollectMapper.queryCarefulSelectAppBy(null, appId, 10);
 
         // 以精选应用id未key,精选应用为value,生成一个map，并且去重
         Map<Long, BaseUserSelectAppVo> collect = baseUserSelectAppVos.stream().collect(Collectors.toMap(BaseUserSelectAppVo::getAppId, Function.identity(), (k1, k2) -> k1));

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -37,6 +38,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
     private final DrawGraphicsMapper drawGraphicsMapper;
     private final DrawModelMapper drawModelMapper;
     private final BaseUserMemberCardMapper baseUserMemberCardMapper;
+    private final MemberCardMapper memberCardMapper;
 
     /**
      * 获取当前用户信息
@@ -179,11 +181,93 @@ public class UserInfoServiceImpl implements IUserInfoService {
      * @return
      */
     @Override
-    public BaseUserVo queryCardUseDetail(Long cardId) {
-//        List<> baseUserMemberCardMapper.queryCardUseDetail(cardId);
-        return null;
+    public BaseUserMemberCardVo queryCardUseDetail(Long cardId) {
+        // todo: 目前商户是写死的
+        BaseUserMemberCardVo baseUserMemberCardVo = baseUserMemberCardMapper.queryMemberCard(SecurityUser.getUserId(), cardId, 1810310843224322049L);
+
+        List<MemberCardUseDetail> objects = new ArrayList<>();
+
+        MemberCardUseDetail memberCardUseDetail = new MemberCardUseDetail();
+        memberCardUseDetail.setModelId(1242112L);
+        memberCardUseDetail.setUseCount(32);
+        memberCardUseDetail.setUnit(0);
+        memberCardUseDetail.setModelName("GPT 3.5");
+        memberCardUseDetail.setAlreadyUseCount(123);
+
+        MemberCardUseDetail memberCardUseDetail2 = new MemberCardUseDetail();
+        memberCardUseDetail2.setModelId(12421122L);
+        memberCardUseDetail2.setUseCount(32);
+        memberCardUseDetail2.setUnit(1);
+        memberCardUseDetail2.setModelName("GPT 4.o");
+        memberCardUseDetail2.setAlreadyUseCount(1323);
+
+        MemberCardUseDetail memberCardUseDetail3 = new MemberCardUseDetail();
+        memberCardUseDetail3.setModelId(124242112L);
+        memberCardUseDetail3.setUseCount(3432);
+        memberCardUseDetail3.setModelName("SD 2.2");
+        memberCardUseDetail3.setAlreadyUseCount(1223);
+        memberCardUseDetail3.setUnit(3);
+
+        MemberCardUseDetail memberCardUseDetail4 = new MemberCardUseDetail();
+        memberCardUseDetail4.setModelId(1242112L);
+        memberCardUseDetail4.setUseCount(32);
+        memberCardUseDetail4.setModelName("GPT 3.5");
+        memberCardUseDetail4.setUnit(1);
+        memberCardUseDetail4.setAlreadyUseCount(1243);
+
+        MemberCardUseDetail memberCardUseDetail5 = new MemberCardUseDetail();
+        memberCardUseDetail5.setModelId(1242112L);
+        memberCardUseDetail5.setUseCount(32);
+        memberCardUseDetail5.setModelName("GPT 3.5");
+        memberCardUseDetail5.setUnit(2);
+        memberCardUseDetail5.setAlreadyUseCount(1273);
+
+
+        MemberCardUseDetail memberCardUseDetail7 = new MemberCardUseDetail();
+        memberCardUseDetail7.setModelId(1242112L);
+        memberCardUseDetail7.setUseCount(32);
+        memberCardUseDetail7.setModelName("GPT 3.5");
+        memberCardUseDetail7.setAlreadyUseCount(1283);
+        memberCardUseDetail7.setUnit(3);
+
+
+        MemberCardUseDetail memberCardUseDetail8 = new MemberCardUseDetail();
+        memberCardUseDetail8.setModelId(1242112L);
+        memberCardUseDetail8.setUseCount(32);
+        memberCardUseDetail8.setUnit(3);
+        memberCardUseDetail8.setModelName("GPT 3.5");
+        memberCardUseDetail8.setAlreadyUseCount(12833);
+
+        MemberCardUseDetail memberCardUseDetail9 = new MemberCardUseDetail();
+        memberCardUseDetail9.setModelId(1242112L);
+        memberCardUseDetail9.setUseCount(32);
+        memberCardUseDetail9.setUnit(2);
+        memberCardUseDetail9.setModelName("火绒 1.5");
+        memberCardUseDetail9.setAlreadyUseCount(123);
+
+        MemberCardUseDetail memberCardUseDetail10 = new MemberCardUseDetail();
+        memberCardUseDetail10.setModelId(124L);
+        memberCardUseDetail10.setUseCount(32);
+        memberCardUseDetail10.setUnit(1);
+        memberCardUseDetail10.setModelName("火山 3.5");
+        memberCardUseDetail10.setAlreadyUseCount(1203);
+
+
+        objects.add(memberCardUseDetail);
+        objects.add(memberCardUseDetail2);
+        objects.add(memberCardUseDetail3);
+        objects.add(memberCardUseDetail4);
+        objects.add(memberCardUseDetail5);
+        objects.add(memberCardUseDetail7);
+        objects.add(memberCardUseDetail8);
+        objects.add(memberCardUseDetail9);
+        objects.add(memberCardUseDetail10);
+
+        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,28 +119,32 @@
             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">
         SELECT
-            app.id AS app_id,
-            app.app_name AS app_name,
+            app.id          AS app_id,
+            app.app_name    AS app_name,
             app.description AS app_desc,
-            oss.url AS app_icon,
+            oss.url         AS app_icon,
             app.route_path,
-            oss2.url AS ai_model_icon,
+            oss2.url        AS ai_model_icon,
             am.ai_model_name AS ai_model_name,
-            app.use_count AS use_count
-        FROM xy_app app
-        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
-        LEFT JOIN sys_oss oss2 ON am.ai_model_logo_oss_id = oss2.oss_id
-        WHERE   app.is_choiceness = 1
+            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
+            LEFT JOIN sys_oss oss2 ON am.ai_model_logo_oss_id = oss2.oss_id
+        WHERE   xda.discover_app_type = 1
             AND app.del_flag = '0'
-        <if test = "appId != null" >
-            AND app.id > #{appId}
+        <if test = "appId != null">
+            AND app.id &lt; #{appId}
         </if >
         LIMIT #{length}
     </select>
@@ -197,7 +201,6 @@
             </foreach>
         </if>
 
-
     </select>
 
 
@@ -214,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

@@ -18,7 +18,6 @@
                mc.oss_id              as oss_url,
                mc.card_name           as card_name,
                mc.description         as card_descritpion,
-               mc.is_base_card        as is_base_card,
                mc.everyday_use_number as everyday_use_number,
                bumc.expire_time       as expire_time,
                bumc.create_time       as create_time
@@ -35,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/BaseUserPhotoFolderMapper.xml

@@ -27,10 +27,9 @@
                oss.url as photo_oss_id,
                bupf.type,
                bupf.description
-        from xy_base_user_photo_folder bupf,
-             sys_oss oss
+        from xy_base_user_photo_folder bupf
+             left join sys_oss oss on bupf.photo_oss_id = oss.oss_id
         where bupf.base_user_id = #{userId}
-          and oss.oss_id = bupf.photo_oss_id
           and bupf.id = #{id}
           and bupf.del_flag = '0'
     </select>

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xyzc.start.mapper.DrawAssistantMapper">
+
+
+    <select id="queryDrawPromptList" resultType="com.xyzc.start.domain.vo.DrawPromptConfigVo">
+        select
+            xdpc.id     AS prompt_id,
+            xdpc.prompt_oss_url,
+            xdpc.prompt,
+            xdpc.prompt_en
+        from xy_draw_assistant xda
+                 left join xy_draw_prompt_config xdpc on xda.id = xdpc.assistant_id
+        where xda.id = #{assistantId}
+        <if test="promptId != null">
+            and xdpc.id > #{promptId}
+        </if>
+        <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/DrawGraphicsMapper.xml

@@ -21,6 +21,9 @@
         <if test="graphicsId != null">
              AND dg.id &lt; #{graphicsId}
         </if>
+        <if test="keyword != null">
+            AND dg.title LIKE CONCAT('%',#{keyword},'%')
+        </if>
         ORDER BY dg.id DESC
         LIMIT 20
     </select>

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

@@ -5,8 +5,25 @@
 <mapper namespace="com.xyzc.start.mapper.DrawModelMapper">
 
 
-    <select id="queryDrawModelList" resultType="com.xyzc.start.domain.vo.DrawModelVo">
-        select * from xy_draw_model
+    <select id="queryDrawModelList" resultType="com.xyzc.start.domain.vo.DrawModelCollectVo">
+        select xdm.id,
+               xdm.model_name,
+               xdm.oss_url,
+               xdm.description,
+               xuu.id       AS ugc_user_id,
+               xuu.avatar   AS ugc_user_avatar,
+               xuu.ugc_nick AS ugc_user_name,
+               xdm.use_count,
+               xbuc.is_collect
+        from xy_draw_model xdm
+                 left join xy_ugc_user xuu on xdm.ugc_id = xuu.id
+                 left join xy_base_user_collect xbuc on xdm.id = xbuc.collect_id
+            and xbuc.base_user_id = #{userId}
+            and xbuc.type = 1
+        where xdm.del_flag = '0'
+        <if test="keyword != null">
+            and xdm.model_name like concat('%',#{keyword},'%')
+        </if>
     </select>
 
 

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}