xyzc-common/xyzc-common-core/src/main/java/com/xyzc/common/core/utils/AssertUtils.java

@@ -72,7 +72,7 @@ public class AssertUtils {
      * @param appVos
      * @param err
      */
-    public static void isEmpty(Collection<Object> appVos, ErrorCode err) {
+    public static <T> void isEmpty(List<T> appVos, ErrorCode err) {
         if (appVos == null || appVos.isEmpty()) {
             throw new ServerException(err);
         }

xyzc-start/Dockerfile

@@ -3,14 +3,15 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
 #FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
 #FROM findepi/graalvm:java17-native
 
-LABEL maintainer="Mo Fan"
+LABEL maintainer="xyzc"
 
-RUN mkdir -p /xyzc/server/logs \
-    /xyzc/server/temp \
+RUN mkdir -p /xyzc/web-api/logs \
+    /xyzc/web-api/temp \
+    /xyzc/skywalking/agent
 
 WORKDIR /xyzc/server
 
-ENV SERVER_PORT=8082 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
+ENV SERVER_PORT=10208 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
 
 EXPOSE ${SERVER_PORT}
 

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

@@ -2,6 +2,7 @@ package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
 import com.xyzc.start.domain.query.AppQuery;
+import com.xyzc.start.domain.query.DiscoveryAppQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IDiscoverService;
 import com.xyzc.start.service.IDrawAssistantService;
@@ -78,20 +79,12 @@ public class DiscoverPageController {
         return Result.ok(drawPromptConfigList);
     }
 
-    /**
-     * 进入具体绘画模型
-     */
-    @GetMapping("/drawModelDetail/{modelId}")
-    public Result<List<Void>> queryDrawModel(@PathVariable String modelId) {
-
-        return Result.ok();
-    }
 
     /**
      * 应用精选、特色、玩转
      */
     @GetMapping("/selectedApp")
-    public Result<List<BaseUserSelectAppVo>> selectedApp(@Valid AppQuery query) {
+    public Result<List<BaseUserSelectAppVo>> selectedApp(@Valid DiscoveryAppQuery query) {
         List<BaseUserSelectAppVo> appPageList = discoverService.queryAppPageList(query);
 
         return Result.ok(appPageList);

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

@@ -1,8 +1,10 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
+import com.xyzc.start.domain.query.CollectDrawQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IMyCollectService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,8 +30,8 @@ public class MyCollectController {
      * 收藏的绘画模型
      */
     @GetMapping("/collectDraw")
-    public Result<List<DrawModelCollectVo>> getCollectDrawModel(Long collectId, String name) {
-        List<DrawModelCollectVo> drawModelList = myCollectService.getCollectDrawModel(collectId, name);
+    public Result<List<DrawModelCollectVo>> getCollectDrawModel(@Valid CollectDrawQuery query) {
+        List<DrawModelCollectVo> drawModelList = myCollectService.getCollectDrawModel(query);
 
         return Result.ok(drawModelList);
     }

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

@@ -6,8 +6,10 @@ import com.xyzc.start.domain.bo.BaseUserLoginBo;
 import com.xyzc.start.domain.bo.UserMobileLoginBO;
 import com.xyzc.start.domain.vo.AccessTokenVo;
 import com.xyzc.start.domain.vo.CaptchaVO;
+import com.xyzc.start.domain.vo.XyConfigVo;
 import com.xyzc.start.service.ICaptchaService;
 import com.xyzc.start.service.IUserAuthService;
+import com.xyzc.start.service.IXyConfigService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -22,13 +24,13 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/user")
-//@CrossOrigin(origins = "*")
 @CrossOrigin
 public class UserAuthController {
 
     private final IUserAuthService userAuthService;
     private final ICaptchaService captchaService;
 
+    private final IXyConfigService xyConfigService;
 
     /**
      * 获取验证码
@@ -100,4 +102,33 @@ public class UserAuthController {
         return Result.ok();
     }
 
+    /**
+     * 退出登录
+     */
+    @PostMapping("logout")
+    public Result<String> logout() {
+//        userAuthService.logout();
+        return Result.ok("退出成功");
+    }
+
+
+    /**
+     * 用户协议
+     */
+    @GetMapping("agreement")
+    public Result<XyConfigVo> legal() {
+        XyConfigVo lawVo = xyConfigService.getPrivacyPolicy();
+
+        return Result.ok(lawVo);
+    }
+
+    /**
+     * 隐私政策
+     */
+    @GetMapping("privacy")
+    public Result<XyConfigVo> privacy() {
+        XyConfigVo lawVo = xyConfigService.getUserAgreement();
+
+        return Result.ok(lawVo);
+    }
 }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * DrawGraphics
+ * 绘画广场
  *
  * @author 杨兴卓
  */

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

@@ -25,10 +25,10 @@ public class DrawPrompt {
     /**
      * 提示词中文
      */
-    private String prompt;
+    private String promptName;
 
     /**
      * 提示词英文
      */
-    private String promptEn;
+    private String promptNameEn;
 }

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

@@ -0,0 +1,99 @@
+package com.xyzc.start.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xyzc.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xy_config")
+public class XyConfig extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小易平台配置id
+     */
+    @TableId(value = "id")
+    private Integer id;
+
+    /**
+     * 积分转换比例
+     */
+    private Integer integralTo;
+
+    /**
+     * 权益变更确认天数
+     */
+    private Integer equityChangeDate;
+
+    /**
+     * 积分剩余报警
+     */
+    private Long integralWarn;
+
+    /**
+     * 银行名称
+     */
+    private String bankName;
+
+    /**
+     * 开户银行
+     */
+    private String accountBankName;
+
+    /**
+     * 开户名
+     */
+    private String accountName;
+
+    /**
+     * 开户账号
+     */
+    private String bankAccountNumber;
+
+    /**
+     * 用户协议
+     */
+    private String userAgreement;
+
+    /**
+     * 隐私政策
+     */
+    private String secretPolicy;
+
+    /**
+     * 积分规则
+     */
+    private String integralRule;
+
+    /**
+     * 燃料规则
+     */
+    private String fuelRule;
+
+    /**
+     * 会员协议
+     */
+    private String memberAgreement;
+
+    /**
+     * 会员权益
+     */
+    private String memberEquity;
+
+    /**
+     * 数字人定制模型协议
+     */
+    private String digitalHumanCustomModelAgreement;
+
+    /**
+     * 数字人声音克隆协议
+     */
+    private String digitalHumanVoiceCloneAgreement;
+}

xyzc-start/src/main/java/com/xyzc/start/domain/bo/CreateOrderBo.java

@@ -17,6 +17,11 @@ public class CreateOrderBo {
     private Long id;
 
     /**
+     * 价格id
+     */
+    private Long priceId;
+
+    /**
      * 1-会员卡, 2-燃料包，3-卡密兑换
      */
     @Range(min = 1, max = 3, message = "type参数错误，请输入{min}到{max}之间的值")

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

@@ -17,19 +17,15 @@ 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;
+    @Range(min = 1, max = 100, message = "长度错误，请输入{min}到{max}之间的数")
+    private Integer length = 20;
+
 }

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

@@ -0,0 +1,22 @@
+package com.xyzc.start.domain.query;
+
+import lombok.Data;
+
+@Data
+public class CollectDrawQuery {
+
+    /**
+     * 上一个绘画模型的 收藏id
+     */
+    private Long collectId;
+
+    /**
+     * 绘画模型名称用于模糊查询
+     */
+    private String name;
+
+    /**
+     * 查询长度
+     */
+    private Integer length = 10;
+}

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

@@ -0,0 +1,37 @@
+package com.xyzc.start.domain.query;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+/**
+ * 发现应用查询
+ */
+@Data
+public class DiscoveryAppQuery {
+
+    /**
+     * 上一个应用id
+     */
+    private Long appId;
+
+    /**
+     * 模糊查询关键字
+     */
+    private String keyword;
+
+    /**
+     * 查询类型，1-精选应用，2-特色应用，3-玩转应用
+     */
+    @Range(min = 1, max = 3, message = "类型错误，请输入{min}到{max}之间的数")
+    @NotNull(message = "类型不能为空")
+    private Integer discoveryType;
+
+    /**
+     * 长度
+     */
+    @Range(min = 1, max = 100, message = "长度错误，请输入{min}到{max}之间的数")
+    private Integer length = 20;
+
+
+}

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

@@ -7,6 +7,8 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户订单视图
@@ -26,6 +28,21 @@ public class BaseUserOrderVo implements Serializable {
     private Long id;
 
     /**
+     * 下单时间
+     */
+    private Date createTime;
+
+    /**
+     * 使用时长
+     */
+    private Integer memberCardTime;
+
+    /**
+     * 时间单位，1-天；2-周；3-月；4-季；5-年
+     */
+    private Integer timeUnit;
+
+    /**
      * 基础用户id
      */
     private Long baseUserId;
@@ -51,7 +68,7 @@ public class BaseUserOrderVo implements Serializable {
     private Integer payMethod;
 
     /**
-     * 商品总额
+     * 商品总金额
      */
     private BigDecimal goodsAmount;
 
@@ -66,13 +83,13 @@ public class BaseUserOrderVo implements Serializable {
     private BigDecimal discountAmount;
 
     /**
-     * 逻辑删除
+     * 会员卡订单展示列表
      */
-    private String delFlag;
+    private List<MemberCardOrderVo> memberCardList;
 
     /**
-     * 版本号
+     * 燃料包订单展示列表
      */
-    private Integer version;
+    private List<FuelPackageOrderVo> fuelPackageList;
 
 }

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

@@ -10,6 +10,8 @@ import lombok.Data;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class BaseUserSelectAppVo {
 
+
+
     /**
      * 职业名称
      */

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

@@ -1,5 +1,8 @@
 package com.xyzc.start.domain.vo;
 
+import com.xyzc.start.domain.DrawPrompt;
+import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 /**
@@ -8,6 +11,7 @@ import lombok.Data;
  * @author 杨兴卓
  */
 @Data
+@AutoMapper(target = DrawPrompt.class)
 public class DrawPromptVo {
 
     /**
@@ -23,10 +27,12 @@ public class DrawPromptVo {
     /**
      * 提示词中文
      */
+    @AutoMapping(target = "promptName")
     private String prompt;
 
     /**
      * 提示词英文
      */
+    @AutoMapping(target = "promptNameEn")
     private String promptEn;
 }

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

@@ -0,0 +1,30 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 燃料包订单视图
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class FuelPackageOrderVo {
+
+    /**
+     * 燃料包名称
+     */
+    private String fuelPackageName;
+
+    /**
+     * 燃料包容量
+     */
+    private String fuelNumber;
+
+    /**
+     * 燃料包价格
+     */
+    private BigDecimal price;
+
+}

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

@@ -38,6 +38,11 @@ public class FuelPackageVo implements Serializable {
     private Long schemeId;
 
     /**
+     * 燃料包定价id
+     */
+    private Long fuelPackagePriceId;
+
+    /**
      * 燃料包名称
      */
     private String fuelPackageName;

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

@@ -0,0 +1,42 @@
+package com.xyzc.start.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 会员卡订单展示列表
+ *
+ * @author 杨兴卓
+ */
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MemberCardOrderVo {
+
+    /**
+     * 会员卡名称
+     */
+    private String cardName;
+
+    /**
+     * 会员卡别名
+     */
+    private String cardAlias;
+
+    /**
+     * 会员卡价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 会员卡时长
+     */
+    private Integer memberCardTime;
+
+    /**
+     * 时间单位
+     */
+    private Integer timeUnit;
+
+}

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

@@ -27,6 +27,11 @@ public class MemberCardVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 代理商会员卡定价id
+     */
+    private Long memberCardPriceId;
+
+    /**
      * 会员卡id
      */
     @AutoMapping(target = "id")

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

@@ -68,7 +68,6 @@ public class SchemeVo implements Serializable {
     /**
      * 会员卡整体套餐
      */
-//    private List<List<MemberCardVo>> memberCardList;
     private List<List<MemberCardVo>> memberCardList;
 
     /**

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

@@ -0,0 +1,108 @@
+package com.xyzc.start.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.xyzc.start.domain.XyConfig;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 小易平台配置视图对象 xy_config
+ *
+ * @author yz
+ * @date 2024-07-05
+ */
+@Data
+@AutoMapper(target = XyConfig.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class XyConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小易平台配置id
+     */
+
+    private Integer id;
+
+    /**
+     * 积分转换比例
+     */
+    private Integer integralTo;
+
+    /**
+     * 权益变更确认天数
+     */
+
+    private Integer equityChangeDate;
+
+    /**
+     * 积分剩余报警
+     */
+
+    private Long integralWarn;
+
+    /**
+     * 转账银行
+     */
+    private String bankName;
+
+    /**
+     * 开户银行
+     */
+    private String accountBankName;
+
+    /**
+     * 开户名
+     */
+    private String accountName;
+
+    /**
+     * 开户账号
+     */
+    private String bankAccountNumber;
+
+    /**
+     * 用户协议
+     */
+    private String userAgreement;
+
+    /**
+     * 隐私政策
+     */
+    private String secretPolicy;
+
+    /**
+     * 积分规则
+     */
+    private String integralRule;
+
+    /**
+     * 燃料规则
+     */
+    private String fuelRule;
+
+    /**
+     * 会员协议
+     */
+    private String memberAgreement;
+
+    /**
+     * 会员权益
+     */
+    private String memberEquity;
+
+    /**
+     * 数字人定制模型协议
+     */
+    private String digitalHumanCustomModelAgreement;
+
+    /**
+     * 数字人声音克隆协议
+     */
+    private String digitalHumanVoiceCloneAgreement;
+}

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

@@ -3,6 +3,7 @@ package com.xyzc.start.mapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.App;
 import com.xyzc.start.domain.query.AppQuery;
+import com.xyzc.start.domain.query.DiscoveryAppQuery;
 import com.xyzc.start.domain.vo.AiModelVo;
 import com.xyzc.start.domain.vo.AppVo;
 import com.xyzc.start.domain.vo.BaseUserSelectAppVo;
@@ -34,6 +35,15 @@ public interface AppMapper extends BaseMapperPlus<App, AppVo> {
      * @param appQuery
      * @return
      */
+    List<BaseUserSelectAppVo> queryDiscoveryAppQuery(Long userId, DiscoveryAppQuery appQuery);
+
+    /**
+     * 查询应用列表
+     *
+     * @param userId
+     * @param appQuery
+     * @return
+     */
     List<BaseUserSelectAppVo> queryAppQuery(Long userId, AppQuery appQuery);
 
 }

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

@@ -4,6 +4,7 @@ import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.constant.Const;
 import com.xyzc.start.domain.BaseUserCollect;
 import com.xyzc.start.domain.query.BaseUserCollectQuery;
+import com.xyzc.start.domain.query.CollectDrawQuery;
 import com.xyzc.start.domain.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -48,10 +49,10 @@ public interface BaseUserCollectMapper extends BaseMapperPlus<BaseUserCollect, B
      * 根据上一个id，分页查询绘画模型
      *
      * @param userId
-     * @param collectId
+     * @param query
      * @return
      */
-    List<DrawModelCollectVo> queryDrawModelById(Long userId, Long collectId, String name);
+    List<DrawModelCollectVo> queryDrawModelById(Long userId, CollectDrawQuery query);
 
     /**
      * 根据上一个id，分页查询图像

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

@@ -1,9 +1,15 @@
 package com.xyzc.start.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.FuelPackage;
+import com.xyzc.start.domain.bo.CreateOrderBo;
+import com.xyzc.start.domain.vo.FuelPackageOrderVo;
+import com.xyzc.start.domain.vo.FuelPackageVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 燃料包Mapper接口
  *
@@ -11,6 +17,14 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2024-06-25
  */
 @Mapper
-public interface FuelPackageMapper extends BaseMapper<FuelPackage> {
+public interface FuelPackageMapper extends BaseMapperPlus<FuelPackage, FuelPackageVo> {
+
 
+    /**
+     *
+     * @param bo
+     * @param agentId
+     * @return
+     */
+    List<FuelPackageOrderVo> queryOrderByFuelPackageId(CreateOrderBo bo, long agentId);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.MemberCard;
 import com.xyzc.start.domain.bo.CreateOrderBo;
+import com.xyzc.start.domain.vo.MemberCardOrderVo;
 import com.xyzc.start.domain.vo.MemberCardVo;
 import com.xyzc.start.domain.vo.SchemeVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -25,14 +26,14 @@ public interface MemberCardMapper extends BaseMapperPlus<MemberCard, MemberCardV
      *
      * @param schemeId 方案id
      */
-    List<MemberCardVo> queryVoListBySchemeId(Long schemeId);
+    List<MemberCardVo> queryVoListBySchemeId(Long schemeId, Long agentId);
+
 
     /**
-     * 根据会员卡id查询当前可核销方案
      *
      * @param bo
+     * @param agentId
      * @return
      */
-    SchemeVo queryCurrentVerifyScheme(@Param("bo") CreateOrderBo bo);
-
+    List<MemberCardOrderVo> queryOrderByMemberId(CreateOrderBo bo, long agentId);
 }

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

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.constant.SchemeConst;
 import com.xyzc.start.domain.Scheme;
+import com.xyzc.start.domain.bo.CreateOrderBo;
 import com.xyzc.start.domain.vo.FuelPackageVo;
 import com.xyzc.start.domain.vo.MemberCardVo;
 import com.xyzc.start.domain.vo.SchemeVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -60,4 +62,19 @@ public interface SchemeMapper extends BaseMapperPlus<Scheme, SchemeVo> {
      */
     List<FuelPackageVo> queryFuelPackageById(Long fuelId);
 
+    /**
+     * 判断当前关联的会员卡或者燃料方案是否生效
+     *
+     * @param bo
+     * @return
+     */
+    Scheme querySchemeByMemberId(@Param("bo") CreateOrderBo bo);
+
+    /**
+     * 判断当前关联的会员卡或者燃料方案是否生效
+     *
+     * @param bo
+     * @return
+     */
+    Scheme querySchemeByFuel(@Param("bo") CreateOrderBo bo);
 }

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

@@ -0,0 +1,9 @@
+package com.xyzc.start.mapper;
+
+import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
+import com.xyzc.start.domain.XyConfig;
+import com.xyzc.start.domain.vo.XyConfigVo;
+
+public interface XyConfigMapper extends BaseMapperPlus<XyConfig, XyConfigVo> {
+
+}

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

@@ -1,6 +1,7 @@
 package com.xyzc.start.service;
 
 import com.xyzc.start.domain.query.AppQuery;
+import com.xyzc.start.domain.query.DiscoveryAppQuery;
 import com.xyzc.start.domain.vo.*;
 
 import java.util.List;
@@ -35,7 +36,7 @@ public interface IDiscoverService {
      * @param query
      * @return
      */
-    List<BaseUserSelectAppVo> queryAppPageList(AppQuery query);
+    List<BaseUserSelectAppVo> queryAppPageList(DiscoveryAppQuery query);
 
     /**
      * 分页查询反向关键字

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

@@ -1,5 +1,6 @@
 package com.xyzc.start.service;
 
+import com.xyzc.start.domain.query.CollectDrawQuery;
 import com.xyzc.start.domain.vo.*;
 
 import java.util.List;
@@ -11,11 +12,10 @@ public interface IMyCollectService {
 
     /**
      * 根据上一个id 获取收藏的绘画模型列表
-     * @param collectId Long
-     * @param name String
+     * @param query CollectDrawQuery
      * @return List<DrawModelCollectVo>
      */
-    List<DrawModelCollectVo> getCollectDrawModel(Long collectId, String name);
+    List<DrawModelCollectVo> getCollectDrawModel(CollectDrawQuery query);
 
     /**
      * 根据上一个id 获取收藏的应用列表

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

@@ -0,0 +1,18 @@
+package com.xyzc.start.service;
+
+import com.xyzc.start.domain.vo.XyConfigVo;
+
+public interface IXyConfigService {
+
+    /**
+     * 获取用户协议
+     * @return
+     */
+    XyConfigVo getUserAgreement();
+
+    /**
+     * 获取隐私政策
+     * @return
+     */
+    XyConfigVo getPrivacyPolicy();
+}

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

@@ -125,7 +125,7 @@ public class AppPageServiceImpl implements IAppPageService {
     public WebAppGroupVo queryByTypeId(Long typeId, AppQuery appQuery) {
         List<AppPageVo> appVos = webAppGroupMapper.queryAppById(SecurityUser.getUserId(), typeId, appQuery);
 
-        AssertUtils.isEmpty(Collections.singleton(appVos), ErrorCode.NO_SELECT_DATA);
+        AssertUtils.isEmpty(appVos, ErrorCode.NO_SELECT_DATA);
         // 封装返回
         WebAppGroupVo webAppGroupVo = new WebAppGroupVo();
         webAppGroupVo.setAppPageList(appVos);

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

@@ -2,6 +2,7 @@ package com.xyzc.start.service.impl;
 
 import com.xyzc.common.web.security.user.SecurityUser;
 import com.xyzc.start.domain.query.AppQuery;
+import com.xyzc.start.domain.query.DiscoveryAppQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.mapper.AppMapper;
 import com.xyzc.start.mapper.DrawAssistantMapper;
@@ -59,9 +60,9 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<BaseUserSelectAppVo> queryAppPageList(AppQuery query) {
+    public List<BaseUserSelectAppVo> queryAppPageList(DiscoveryAppQuery query) {
 
-        return appMapper.queryAppQuery(SecurityUser.getUserId(), query);
+        return appMapper.queryDiscoveryAppQuery(SecurityUser.getUserId(), query);
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package com.xyzc.start.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xyzc.start.domain.DrawAssistant;
 import com.xyzc.start.domain.vo.DrawAssistantVo;
 import com.xyzc.start.domain.vo.DrawPromptVo;
 import com.xyzc.start.mapper.DrawAssistantMapper;
@@ -23,8 +25,11 @@ public class DrawAssistantServiceImpl implements IDrawAssistantService {
      */
     @Override
     public List<DrawAssistantVo> queryDrawAssistantList() {
+        List<DrawAssistantVo> drawAssistantVos = drawAssistantMapper.selectVoList(new LambdaQueryWrapper<DrawAssistant>()
+                .eq(DrawAssistant::getAssistantName, "不希望出现")
+        );
 
-        return drawAssistantMapper.selectVoList(null);
+        return drawAssistantVos;
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.xyzc.start.service.impl;
 
 
 import com.xyzc.common.web.security.user.SecurityUser;
+import com.xyzc.start.domain.query.CollectDrawQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.mapper.BaseUserCollectMapper;
 import com.xyzc.start.service.IMyCollectService;
@@ -23,13 +24,13 @@ public class MyCollectServiceImpl implements IMyCollectService {
 
     /**
      *
-     * @param collectId
+     * @param query CollectDrawQuery
      * @return
      */
     @Override
-    public List<DrawModelCollectVo> getCollectDrawModel(Long collectId, String name) {
+    public List<DrawModelCollectVo> getCollectDrawModel(CollectDrawQuery query) {
 
-        return baseUserCollectMapper.queryDrawModelById(SecurityUser.getUserId(), collectId, name);
+        return baseUserCollectMapper.queryDrawModelById(SecurityUser.getUserId(), query);
     }
 
     /**

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

@@ -3,18 +3,18 @@ package com.xyzc.start.service.impl;
 import com.xyzc.common.core.exception.ErrorCode;
 import com.xyzc.common.core.utils.AssertUtils;
 import com.xyzc.common.web.security.user.SecurityUser;
+import com.xyzc.start.constant.SchemeConst;
+import com.xyzc.start.domain.Scheme;
 import com.xyzc.start.domain.bo.CreateOrderBo;
 import com.xyzc.start.domain.vo.*;
-import com.xyzc.start.mapper.AiModelMapper;
-import com.xyzc.start.mapper.EquityMapper;
-import com.xyzc.start.mapper.MemberCardMapper;
-import com.xyzc.start.mapper.SchemeMapper;
+import com.xyzc.start.mapper.*;
 import com.xyzc.start.service.ISchemeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -26,6 +26,8 @@ public class SchemeServiceImpl implements ISchemeService {
     private final EquityMapper equityMapper;
     private final AiModelMapper aiModelMapper;
 
+    private final FuelPackageMapper fuelPackageMapper;
+
     /**
      * 获取当前方案
      *
@@ -37,7 +39,8 @@ public class SchemeServiceImpl implements ISchemeService {
 
         // 有且只有一个会员卡套餐生效
         // 根据套餐查询会员卡
-        List<MemberCardVo> memberCardVos = memberCardMapper.queryVoListBySchemeId(scheme.getId());
+        // TODO 代理商id暂时写死
+        List<MemberCardVo> memberCardVos = memberCardMapper.queryVoListBySchemeId(scheme.getId(), 1810310843224322049L);
         // 让memberCardVos中根据memberId合并成新的List
         List<List<MemberCardVo>> memberList = new ArrayList<>();
         List<MemberCardVo> collect = new ArrayList<>();
@@ -158,12 +161,30 @@ public class SchemeServiceImpl implements ISchemeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BaseUserOrderVo createOrder(CreateOrderBo bo) {
-        // 先查询当前会员卡或者燃料包是否生效
-        SchemeVo schemeVo = memberCardMapper.queryCurrentVerifyScheme(bo);
-        // 没有生效的套餐抛出异常
-        AssertUtils.notNull(schemeVo, ErrorCode.SCHEME_NOT_EXIST);
+        List<MemberCardOrderVo> memberCardOrderList = null;
+        // 或者燃料包
+        List<FuelPackageOrderVo> fuelPackageOrderList = null;
+
+        if (SchemeConst.MEMEBER_TYPE.equals(bo.getType())) {
+            Scheme scheme = schemeMapper.querySchemeByMemberId(bo);
+            // 没有生效的套餐抛出异常
+            AssertUtils.notNull(scheme, ErrorCode.SCHEME_NOT_EXIST);
+
+            memberCardOrderList = memberCardMapper.queryOrderByMemberId(bo, 1810310843224322049L);
+
+        } else if (SchemeConst.FUEL_TYPE.equals(bo.getType())) {
+            Scheme scheme = schemeMapper.querySchemeByFuel(bo);
+            // 没有生效的套餐抛出异常
+            AssertUtils.notNull(scheme, ErrorCode.SCHEME_NOT_EXIST);
+
+            fuelPackageOrderList = fuelPackageMapper.queryOrderByFuelPackageId(bo, 1810310843224322049L);
+        }
+
+        // TODO 生成一个假数据
+        BaseUserOrderVo baseUserOrderVo = new BaseUserOrderVo();
+        baseUserOrderVo.setMemberCardList(memberCardOrderList);
+        baseUserOrderVo.setFuelPackageList(fuelPackageOrderList);
 
-        //
-        return null;
+        return baseUserOrderVo;
     }
 }

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

@@ -0,0 +1,34 @@
+package com.xyzc.start.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xyzc.start.domain.XyConfig;
+import com.xyzc.start.domain.vo.XyConfigVo;
+import com.xyzc.start.mapper.XyConfigMapper;
+import com.xyzc.start.service.IXyConfigService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class XyConfigServiceImple implements IXyConfigService {
+
+    private final XyConfigMapper xyConfigMapper;
+
+    @Override
+    public XyConfigVo getUserAgreement() {
+        return xyConfigMapper.selectVoOne(
+                new LambdaQueryWrapper<XyConfig>()
+                        .select(XyConfig::getUserAgreement)
+                        .eq(XyConfig::getId, 1L)
+        );
+    }
+
+    @Override
+    public XyConfigVo getPrivacyPolicy() {
+        return xyConfigMapper.selectVoOne(
+                new LambdaQueryWrapper<XyConfig>()
+                        .select(XyConfig::getSecretPolicy)
+                        .eq(XyConfig::getId, 1L)
+        );
+    }
+}

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

@@ -16,6 +16,40 @@
     </select>
 
 
+    <select id="queryDiscoveryAppQuery" resultType="com.xyzc.start.domain.vo.BaseUserSelectAppVo">
+        SELECT app.id           AS app_id,
+        app.app_name     AS app_name,
+        app.description  AS app_desc,
+        app.route_path   AS router_path,
+        oss.url          AS app_icon,
+        buc.is_collect   AS is_collect,
+        app.use_count    AS use_count,
+        am.id            AS aiModelId,
+        oss2.url         AS ai_model_icon,
+        am.ai_model_name AS ai_model_name
+        FROM xy_app app
+        LEFT JOIN sys_oss oss ON oss.oss_id = app.oss_id
+        LEFT JOIN xy_ai_model_app ama ON ama.ai_model_id = app.id
+        LEFT JOIN xy_ai_model am ON ama.ai_model_id = am.id
+        LEFT JOIN sys_oss oss2 ON oss2.oss_id = am.ai_model_logo_oss_id
+        LEFT JOIN xy_base_user_collect buc ON app.id = buc.collect_id AND buc.type = 3
+        AND buc.base_user_id = #{userId}
+        LEFT JOIN xy_discover_app xda ON xda.app_id = app.id
+        WHERE app.del_flag = '0'
+        AND xda.discover_app_type = #{appQuery.discoveryType}
+        <if test="appQuery != null and appQuery.keyword != null and appQuery.keyword != ''">
+            AND ( app.app_name LIKE CONCAT('%',#{appQuery.keyword},'%')
+            OR app.description LIKE CONCAT('%',#{appQuery.keyword},'%')
+            )
+        </if>
+        <if test="appQuery != null and appQuery.appId != null">
+            AND app.id > #{appQuery.appId}
+        </if>
+        LIMIT #{appQuery.length}
+    </select>
+
+
+
     <select id="queryAppQuery" resultType="com.xyzc.start.domain.vo.BaseUserSelectAppVo">
         SELECT app.id           AS app_id,
                app.app_name     AS app_name,
@@ -34,14 +68,18 @@
                  LEFT JOIN sys_oss oss2 ON oss2.oss_id = am.ai_model_logo_oss_id
                  LEFT JOIN xy_base_user_collect buc ON app.id = buc.collect_id AND buc.type = 3
             AND buc.base_user_id = #{userId}
+                 LEFT JOIN xy_discover_app xda ON xda.app_id = app.id
         WHERE app.del_flag = '0'
-        <if test="appQuery != null and appQuery.appName != null">
-            AND app.app_name LIKE CONCAT('%',#{appQuery.appName},'%')
+            AND xda.discover_app_type = #{appQuery.discoveryType}
+        <if test="appQuery != null and appQuery.appName != null and appQuery.appName != ''">
+            AND ( app.app_name LIKE CONCAT('%',#{appQuery.appName},'%')
+                OR app.description LIKE CONCAT('%',#{appQuery.appName},'%')
+            )
         </if>
         <if test="appQuery != null and appQuery.appId != null">
             AND app.id > #{appQuery.appId}
         </if>
-        LIMIT 10
+        LIMIT #{appQuery.length}
     </select>
 
 

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

@@ -34,17 +34,17 @@
     </select>
 
     <select id="queryDrawModelById" resultType="com.xyzc.start.domain.vo.DrawModelCollectVo">
-        SELECT xdm.id       AS id,
-               xbuc.id      AS collect_id,
+        SELECT xdm.id           AS id,
+               xbuc.id          AS collect_id,
                xdm.oss_url      AS oss_url,
                xdm.model_name,
                xdm.description,
-               xuu.id       AS ugc_user_id,
-               xuu.nick_name AS ugc_user_name,
-               xua.avatar     AS ugc_user_avatar,
-               xdm.use_count AS use_count,
-               xbuc.is_collect AS is_collect,
-               xbuc.type    AS type
+               xuu.id           AS ugc_user_id,
+               xuu.nick_name    AS ugc_user_name,
+               xua.avatar       AS ugc_user_avatar,
+               xdm.use_count    AS use_count,
+               xbuc.is_collect  AS is_collect,
+               xbuc.type        AS type
         FROM xy_base_user_collect xbuc
                  LEFT JOIN xy_draw_model xdm ON xdm.id = xbuc.collect_id
                  LEFT JOIN xy_ugc_user xuu ON xdm.ugc_user_id = xuu.id
@@ -53,14 +53,15 @@
           AND xbuc.base_user_id = #{userId}
           AND xdm.del_flag = '0'
           AND xbuc.type = 1
-        <if test="name != null">
-            AND xdm.model_name LIKE CONCAT( '%', #{name}, '%')
+          AND xbuc.is_collect = 1
+        <if test="query.name != null">
+            AND xdm.model_name LIKE CONCAT( '%', #{query.name}, '%')
         </if>
-        <if test="collectId != null">
-            AND xbuc.id &lt; #{collectId}
+        <if test="query.collectId != null">
+            AND xbuc.id &lt; #{query.collectId}
         </if>
         ORDER BY xbuc.id DESC
-        LIMIT 10
+        LIMIT #{query.length}
     </select>
 
     <select id="queryAppById" resultType="com.xyzc.start.domain.vo.AppCollectVo">

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

@@ -9,19 +9,17 @@
         select
             xdp.id     AS prompt_id,
             xdp.prompt_oss_url,
-            xdp.prompt_name,
-            xdp.prompt_name_en
+            xdp.prompt_name AS prompt,
+            xdp.prompt_name_en AS prompt_en
         from xy_draw_assistant xda
                  left join xy_draw_prompt xdp on xda.id = xdp.assistant_id
         where xda.id = #{assistantId}
         <if test="promptId != null">
             and xdp.id > #{promptId}
         </if>
-        <if test="keyword != null">
-            and xdp.prompt_name like concat('%',#{keyword},'%')
-        </if>
-        <if test="keyword != null">
-            and xdp.prompt_name_en like concat('%',#{keyword},'%')
+        <if test="keyword != null and keyword != ''">
+            and  (xdp.prompt_name like concat('%',#{keyword},'%')
+            OR xdp.prompt_name_en like concat('%',#{keyword},'%'))
         </if>
         LIMIT #{length}
     </select>

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

@@ -15,24 +15,32 @@
                mcp.time_unit            AS time_unit,
                mcp.give_fuel            AS give_fuel,
                amcp.strikethrough_price AS strikethrough_price,
-               amcp.agent_price         AS price
+               amcp.agent_price         AS price,
+               amcp.id                  AS member_card_price_id
         from xy_member_card mec
                  left join sys_oss oss on mec.oss_id = oss.oss_id
                  left join xy_member_card_price mcp on mec.id = mcp.member_card_id
                  left join xy_agent_member_card_price amcp on mcp.id = amcp.member_card_price_id
-        where mec.scheme_id = #{schemeId}
+        where mec.scheme_id = #{schemeId} AND amcp.agent_mer_id = #{agentId}
 
     </select>
 
 
-    <select id="queryCurrentVerifyScheme" resultType="com.xyzc.start.domain.vo.SchemeVo">
-        select xs.id
-        from xy_scheme xs
-                 LEFT JOIN xy_member_card xmc on xs.id = xmc.scheme_id
-        where xs.scheme_status = 1
-        AND xs.scheme_type = #{bo.type}
-        AND xmc.id = #{bo.id}
+    <select id="queryOrderByMemberId" resultType="com.xyzc.start.domain.vo.MemberCardOrderVo">
+        select xmcan.alias_name      AS card_name,
+               xmcp.member_card_time AS member_card_time,
+               xmcp.time_unit        AS time_unit,
+               amcp.agent_price      AS price
+        from xy_agent_member_card_price amcp
+                 LEFT JOIN xy_member_card_price xmcp ON amcp.member_card_price_id = xmcp.id
+                 LEFT JOIN xy_member_card_alias_name xmcan ON xmcan.member_card_id = #{bo.id}
+            AND xmcan.agent_mer_id = #{agentId}
+        where amcp.id = #{bo.priceId}
+          AND amcp.agent_mer_id = #{agentId}
+          AND xmcan.member_card_id = #{bo.id}
     </select>
 
 
+
+
 </mapper>

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

@@ -25,4 +25,24 @@
     </select>
 
 
+    <select id="querySchemeByMemberId" resultType="com.xyzc.start.domain.Scheme">
+        select xs.id
+        from xy_scheme xs
+                 left JOIN xy_member_card xmc on xs.id = xmc.scheme_id
+        where xmc.id = #{bo.id}
+        and xs.scheme_type = #{bo.type}
+        and xs.scheme_status = 1
+    </select>
+
+
+    <select id="querySchemeByFuel" resultType="com.xyzc.start.domain.Scheme">
+        select xs.id
+        from xy_scheme xs
+                 left JOIN xy_fuel_package xfp on xs.id = xfp.scheme_id
+        where xfp.scheme_id = #{bo.id}
+          and xs.scheme_type = #{bo.type}
+          and xs.scheme_status = 1
+    </select>
+
+
 </mapper>