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

@@ -21,7 +21,7 @@ public class AssertUtils {
     }
 
     /**
-     * 判断数组长度是否为1，不唯一抛出异常
+     * 判断数组长度是否为1，不为一抛出异常
      *
      * @param list    数组长度
      * @param errCode 错误码

xyzc-start/src/main/java/com/xyzc/start/constant/SchemeConst.java

@@ -1,16 +1,16 @@
 package com.xyzc.start.constant;
 
 /**
- * @description: TODO
- * @author: 墨凡
- * @date: 2024/7/21 21:04
- * @version: 1.0
+ * 套餐常量
+ *
+ * @author 墨凡
+ * date 2024/7/21 21:04
  */
 public interface SchemeConst {
     /**
      * 当前套餐有效
      */
-    Integer SCHEME_STATUS  = 1;
+    Integer ACTIVE_STATUS = 1;
 
     /**
      * 会员卡套餐
@@ -20,5 +20,5 @@ public interface SchemeConst {
     /**
      * 燃料部类型
      */
-    Integer FUEL_TYPE =2;
+    Integer FUEL_TYPE = 2;
 }

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

@@ -1,7 +1,6 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.common.web.security.user.SecurityUser;
 import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IAppPageService;

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

@@ -0,0 +1,54 @@
+package com.xyzc.start.controller;
+
+import com.xyzc.common.core.utils.Result;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 插入数据demo
+ */
+@RestController
+@RequestMapping("insert")
+public class InsertDataDemoController {
+
+    /**
+     * 添加绘画模型
+     */
+    @PostMapping("addDrawModel")
+    public Result<String> addPaintingModel() {
+
+        return Result.ok("插入数据成功");
+    }
+
+    /**
+     * 查询所有的绘画模型id
+     */
+    @GetMapping("graphicsIds")
+    public Result<String> queryPaintingModel() {
+
+        return Result.ok("查询数据成功");
+    }
+
+
+    /**
+     * 添加图像，并将绘画模型与 图像关联，将ugc 用户一起关联
+     */
+    @PostMapping("addImage")
+    public Result<String> addImage() {
+
+        return Result.ok("插入数据成功");
+    }
+
+    /**
+     * 添加ugc用户
+     */
+    @PostMapping("addUgcUser")
+    public Result<String> addUgcUser() {
+
+        return Result.ok("插入数据成功");
+    }
+
+
+}

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

@@ -28,8 +28,8 @@ public class MyCollectController {
      * 收藏的绘画模型
      */
     @GetMapping("/collectDraw")
-    public Result<List<DrawModelCollectVo>> getCollectDrawModel(Long id, String modelName) {
-        List<DrawModelCollectVo> drawModelList = myCollectService.getCollectDrawModel(id, modelName);
+    public Result<List<DrawModelCollectVo>> getCollectDrawModel(Long collectId, String name) {
+        List<DrawModelCollectVo> drawModelList = myCollectService.getCollectDrawModel(collectId, name);
 
         return Result.ok(drawModelList);
     }
@@ -38,8 +38,8 @@ public class MyCollectController {
      * 收藏的图像
      */
     @GetMapping("/collectImage")
-    public Result<List<DrawGraphicsCollectVo>> getCollectImage(Long graphicsId, String graphicsName) {
-        List<DrawGraphicsCollectVo> drawGraphicsList = myCollectService.getCollectImage(graphicsId, graphicsName);
+    public Result<List<DrawGraphicsCollectVo>> getCollectImage(Long collectId, String name) {
+        List<DrawGraphicsCollectVo> drawGraphicsList = myCollectService.getCollectImage(collectId, name);
 
         return Result.ok(drawGraphicsList);
     }
@@ -48,8 +48,8 @@ public class MyCollectController {
      * 收藏的应用
      */
     @GetMapping("/collectApp")
-    public Result<List<AppCollectVo>> getCollectApp(Long appId, String appName) {
-        List<AppCollectVo> appList = myCollectService.getCollectApp(appId, appName);
+    public Result<List<AppCollectVo>> getCollectApp(Long collectId, String name) {
+        List<AppCollectVo> appList = myCollectService.getCollectApp(collectId, name);
 
         return Result.ok(appList);
     }

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

@@ -1,12 +1,7 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.start.domain.FuelPackage;
-import com.xyzc.start.domain.MemberCard;
-import com.xyzc.start.domain.vo.AiModelVo;
-import com.xyzc.start.domain.vo.FuelPackageVo;
-import com.xyzc.start.domain.vo.MemberCardVo;
-import com.xyzc.start.domain.vo.SchemeVo;
+import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.ISchemeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +16,6 @@ import java.util.List;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/scheme")
-@CrossOrigin
 public class SchemeController {
 
     private final ISchemeService schemeService;
@@ -38,10 +32,10 @@ public class SchemeController {
 
 
     /**
-     * id查询会员卡详细套餐
+     * id查询会员卡详细权益
      */
     @GetMapping("/currentMember/{memberId}")
-    public Result<MemberCardVo> currentMemberById(@RequestParam("memberId") Long memberId) {
+    public Result<MemberCardVo> currentMemberById(@PathVariable("memberId") Long memberId) {
         MemberCardVo memberCard = schemeService.queryCurrentMemberById(memberId);
 
         return Result.ok(memberCard);
@@ -58,10 +52,10 @@ public class SchemeController {
     }
 
     /**
-     * id查询燃料包详细套餐
+     * id查询燃料包详细权益
      */
     @GetMapping("/currentFuel/{fuelId}")
-    public Result<FuelPackageVo> currentFuelById(@RequestParam("fuelId") Long fuelId) {
+    public Result<FuelPackageVo> currentFuelById(@PathVariable Long fuelId) {
         FuelPackageVo fuelPackage = schemeService.queryCurrentFuelById(fuelId);
 
         return Result.ok(fuelPackage);
@@ -73,8 +67,8 @@ public class SchemeController {
      * @param modelId 模型id
      */
     @GetMapping("/fuelLaw")
-    public Result<List<AiModelVo>> queryfuelLawList(Long modelId) {
-        List<AiModelVo> fuelPackageList = schemeService.queryModelLawList(modelId);
+    public Result<List<AiModelLawVo>> queryfuelLawList(Long modelId) {
+        List<AiModelLawVo> fuelPackageList = schemeService.queryModelLawList(modelId);
 
         return Result.ok(fuelPackageList);
     }

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

@@ -25,7 +25,7 @@ public class BaseUserFuelFlow {
 
     private Integer flowType;
 
-    private Long fuelCount;
+    private Long fuelAccount;
 
     private Date createTime;
 

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

@@ -1,6 +1,7 @@
 package com.xyzc.start.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -23,6 +24,6 @@ public class Industry extends BaseEntity {
     /**
      * 行业名称
      */
-    private String name;
+    private String industryName;
 
 }

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

@@ -17,7 +17,7 @@ public class AgentCardSecretBo {
     /**
      * 卡密
      */
-    @Length(min = 18, max = 18, message = "卡密长度错误，请重新输入")
+    @Length(min = 18, max = 20, message = "卡密长度错误，请重新输入")
     @NotEmpty(message = "卡密不能为空")
     private String cardSecret;
 

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

@@ -0,0 +1,33 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 燃料使用规则
+ * <p>
+ * author: 杨兴卓
+ */
+@Data
+public class AiModelLawVo {
+
+    /**
+     * 模型id
+     */
+    private Long modelId;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 使用燃料量
+     */
+    private Integer consumeFuelNumber;
+
+    /**
+     * 消耗燃料单位
+     */
+    private Integer consumeFuelUnit;
+
+}

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

@@ -12,7 +12,7 @@ public class AppCollectVo {
     /**
      * 应用收藏id
      */
-    private Long id;
+    private Long collectId;
 
     /**
      * 应用logo地址

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

@@ -34,7 +34,7 @@ public class BaseUserFuelFlowVo {
     /**
      * 燃料流水量
      */
-    private Long fuelCount;
+    private Long fuelAccount;
 
     /**
      * 燃料变动时间

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

@@ -2,6 +2,7 @@ package com.xyzc.start.domain.vo;
 
 import com.xyzc.start.domain.BaseUser;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -21,6 +21,16 @@ public class DrawGraphicsSquareVo {
     private String ossUrl;
 
     /**
+     * 图像宽度
+     */
+    private Integer width;
+
+    /**
+     * 图像高度
+     */
+    private Integer height;
+
+    /**
      * 图像标题
      */
     private String title;

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

@@ -24,6 +24,7 @@ public class IndustryVo {
     /**
      * 行业名称
      */
+    @AutoMapping(target = "industryName")
     private String name;
 
     /**

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

@@ -1,7 +1,9 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.MemberCard;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 import java.io.Serial;
@@ -14,10 +16,11 @@ import java.util.List;
  * 会员卡视图对象 xy_member_card
  *
  * @author admin
- * @date 2024-06-26
+ * date 2024-06-26
  */
 @Data
 @AutoMapper(target = MemberCard.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class MemberCardVo implements Serializable {
 
     @Serial
@@ -26,7 +29,8 @@ public class MemberCardVo implements Serializable {
     /**
      * 会员卡id
      */
-    private Long id;
+    @AutoMapping(target = "id")
+    private Long memberCardId;
 
     /**
      * 会员方案id
@@ -39,9 +43,19 @@ public class MemberCardVo implements Serializable {
     private Long ossUrl;
 
     /**
+     * 会员卡划线价
+     */
+    private BigDecimal strikethroughPrice;
+
+    /**
+     * 赠送燃料
+     */
+    private Integer giveFuel;
+
+    /**
      * 会员卡名称
      */
-    private String cardName;
+    private String memberCardName;
 
     /**
      * 会员卡别名
@@ -59,11 +73,31 @@ public class MemberCardVo implements Serializable {
     private String description;
 
     /**
+     * 会员卡等级
+     */
+    private Integer cardLevel;
+
+    /**
+     * 会员卡时长
+     */
+    private Integer MemberCardTime;
+
+    /**
+     * 会员卡时间类型，1-天；2-周；3-月；4-季；5-年
+     */
+    private Integer timeUnit;
+
+    /**
      * 每天使用次数
      */
     private Integer everydayUseNumber;
 
     /**
+     * 立省多少钱
+     */
+    private BigDecimal saveMoney;
+
+    /**
      * 权益集合
      */
     private List<EquityVo> equityList;

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

@@ -1,5 +1,6 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.Scheme;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -18,6 +19,7 @@ import java.util.List;
  */
 @Data
 @AutoMapper(target = Scheme.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SchemeVo implements Serializable {
 
     @Serial
@@ -66,7 +68,8 @@ public class SchemeVo implements Serializable {
     /**
      * 会员卡整体套餐
      */
-    private List<MemberCardVo> memberCardList;
+//    private List<List<MemberCardVo>> memberCardList;
+    private List<List<MemberCardVo>> memberCardList;
 
     /**
      * 燃料包整体套餐

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

@@ -1,5 +1,6 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.UgcUser;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -33,8 +34,5 @@ public class UgcUserVo {
      */
     private Integer releaseModelCount;
 
-    /**
-     * 逻辑删除，0-未删除，2-已删除
-     */
-    private Integer delFlag;
+
 }

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

@@ -1,17 +1,21 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.WebAppGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 @AutoMapper(target = WebAppGroup.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class WebAppGroupVo {
     /**
      * 分类id
      */
+    @AutoMapping(target = "id")
     private Long groupId;
 
 
@@ -28,6 +32,6 @@ public class WebAppGroupVo {
     /**
      * 应用集合
      */
-    private List<AppPageVo> appList;
+    private List<AppPageVo> appPageList;
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.AiModel;
+import com.xyzc.start.domain.vo.AiModelLawVo;
 import com.xyzc.start.domain.vo.AiModelVo;
 import com.xyzc.start.domain.vo.FuelPackageVo;
 
@@ -21,6 +22,6 @@ public interface AiModelMapper extends BaseMapperPlus<AiModel, AiModelVo> {
      * @param modelId 模型id
      * @return
      */
-    List<AiModelVo> queryModelLawList(Long modelId);
+    List<AiModelLawVo> queryModelLawList(Long modelId);
 
 }

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

@@ -48,28 +48,28 @@ public interface BaseUserCollectMapper extends BaseMapperPlus<BaseUserCollect, B
      * 根据上一个id，分页查询绘画模型
      *
      * @param userId
-     * @param id
+     * @param collectId
      * @return
      */
-    List<DrawModelCollectVo> queryDrawModelById(Long userId, Long id, String modelName);
+    List<DrawModelCollectVo> queryDrawModelById(Long userId, Long collectId, String name);
 
     /**
      * 根据上一个id，分页查询图像
      *
      * @param userId
-     * @param graphicsId
+     * @param collectId
      * @return
      */
-    List<DrawGraphicsCollectVo> queryDrawGraphicsById(Long userId, Long graphicsId, String graphicsName);
+    List<DrawGraphicsCollectVo> queryDrawGraphicsById(Long userId, Long collectId, String name);
 
     /**
      * 根据上一个id，分页查询应用
      *
      * @param userId
-     * @param appId
+     * @param collectId
      * @return
      */
-    List<AppCollectVo> queryAppById(Long userId, Long appId, String appName);
+    List<AppCollectVo> queryAppById(Long userId, Long collectId, String name);
 
     /**
      * 根据用户id查询收藏的应用

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

@@ -1,5 +1,6 @@
 package com.xyzc.start.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.Industry;
 import com.xyzc.start.domain.vo.AppPageVo;
@@ -10,27 +11,5 @@ import java.util.List;
 
 public interface IndustryMapper extends BaseMapperPlus<Industry, IndustryVo> {
 
-    /**
-     * 查询行业列表
-     * @param industry
-     * @return
-     */
-    List<IndustryVo> queryList(Industry industry);
 
-
-    /**
-     * 查询所有所属的职业关联的应用
-     *
-     * @param industryId
-     * @return
-     */
-    List<AppPageVo> queryAppPageVo(Long industryId);
-
-
-    /**
-     *
-     * @param careerIds
-     * @return
-     */
-    List<AppPageVo> queryAppPageVoByCarreerIds(List<Long> careerIds);
 }

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

@@ -22,10 +22,5 @@ public interface MemberCardMapper extends BaseMapperPlus<MemberCard, MemberCardV
      *
      * @param schemeId 方案id
      */
-    default List<MemberCardVo> queryVoListBySchemeId(Long schemeId) {
-        return this.selectVoList(new LambdaQueryWrapper<MemberCard>()
-                .select(MemberCard::getId, MemberCard::getCardName, MemberCard::getDescription)
-                .eq(MemberCard::getSchemeId, schemeId)
-                .orderByDesc(MemberCard::getCreateTime));
-    }
+    List<MemberCardVo> queryVoListBySchemeId(Long schemeId);
 }

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

@@ -2,6 +2,7 @@ package com.xyzc.start.mapper;
 
 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.vo.FuelPackageVo;
 import com.xyzc.start.domain.vo.MemberCardVo;
@@ -22,12 +23,12 @@ public interface SchemeMapper extends BaseMapperPlus<Scheme, SchemeVo> {
      *
      * @return
      */
-    default List<SchemeVo> getCurrentMember() {
-        return selectVoList(new LambdaQueryWrapper<Scheme>()
+    default SchemeVo getCurrentMember() {
+        return selectVoOne(new LambdaQueryWrapper<Scheme>()
                 //1 生效
-                .eq(Scheme::getSchemeStatus, 1)
+                .eq(Scheme::getSchemeStatus, SchemeConst.ACTIVE_STATUS)
                 //1 会员卡方案
-                .eq(Scheme::getSchemeType, 1)
+                .eq(Scheme::getSchemeType, SchemeConst.MEMEBER_TYPE)
         );
     }
 
@@ -37,9 +38,9 @@ public interface SchemeMapper extends BaseMapperPlus<Scheme, SchemeVo> {
     default List<SchemeVo> getCurrentFuel() {
         return selectVoList(new LambdaQueryWrapper<Scheme>()
                 //1 生效
-                .eq(Scheme::getSchemeStatus, 1)
+                .eq(Scheme::getSchemeStatus, SchemeConst.ACTIVE_STATUS)
                 //2 燃料方案
-                .eq(Scheme::getSchemeType, 2)
+                .eq(Scheme::getSchemeType, SchemeConst.FUEL_TYPE)
         );
     }
 

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

@@ -11,11 +11,11 @@ public interface IMyCollectService {
 
     /**
      * 根据上一个id 获取收藏的绘画模型列表
-     * @param id Long
-     * @param modelName String
+     * @param collectId Long
+     * @param name String
      * @return List<DrawModelCollectVo>
      */
-    List<DrawModelCollectVo> getCollectDrawModel(Long id, String modelName);
+    List<DrawModelCollectVo> getCollectDrawModel(Long collectId, String name);
 
     /**
      * 根据上一个id 获取收藏的应用列表
@@ -28,9 +28,9 @@ public interface IMyCollectService {
     /**
      * 根据上一个id 获取收藏的图片列表
      *
-     * @param graphicsId
-     * @param graphicsName 图像名称
+     * @param collectId
+     * @param name 图像名称
      * @return
      */
-    List<DrawGraphicsCollectVo> getCollectImage(Long graphicsId, String graphicsName);
+    List<DrawGraphicsCollectVo> getCollectImage(Long collectId, String name);
 }

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

@@ -1,9 +1,6 @@
 package com.xyzc.start.service;
 
-import com.xyzc.start.domain.vo.AiModelVo;
-import com.xyzc.start.domain.vo.FuelPackageVo;
-import com.xyzc.start.domain.vo.MemberCardVo;
-import com.xyzc.start.domain.vo.SchemeVo;
+import com.xyzc.start.domain.vo.*;
 
 import java.util.List;
 
@@ -47,6 +44,6 @@ public interface ISchemeService {
      * @param modelId 模型id
      * @return
      */
-    List<AiModelVo> queryModelLawList(Long modelId);
+    List<AiModelLawVo> queryModelLawList(Long modelId);
 
 }

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

@@ -126,7 +126,7 @@ public class AppPageServiceImpl implements IAppPageService {
         AssertUtils.isEmpty(Collections.singleton(appVos), ErrorCode.NO_SELECT_DATA);
         // 封装返回
         WebAppGroupVo webAppGroupVo = new WebAppGroupVo();
-        webAppGroupVo.setAppList(appVos);
+        webAppGroupVo.setAppPageList(appVos);
         webAppGroupVo.setGroupName(appVos.get(0).getAppGroupName());
         webAppGroupVo.setGroupId(appVos.get(0).getAppGroupId());
 

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

@@ -23,31 +23,37 @@ public class MyCollectServiceImpl implements IMyCollectService {
 
     /**
      *
-     * @param id
+     * @param collectId
      * @return
      */
     @Override
-    public List<DrawModelCollectVo> getCollectDrawModel(Long id, String modelName) {
+    public List<DrawModelCollectVo> getCollectDrawModel(Long collectId, String name) {
 
-        return baseUserCollectMapper.queryDrawModelById(SecurityUser.getUserId(), id, modelName);
+        return baseUserCollectMapper.queryDrawModelById(SecurityUser.getUserId(), collectId, name);
     }
 
     /**
      *
-     * @param appId
-     * @param appName 应用名称模糊查询
+     * @param collectId
+     * @param name 应用名称模糊查询
      * @return
      */
     @Override
-    public List<AppCollectVo> getCollectApp(Long appId, String appName) {
+    public List<AppCollectVo> getCollectApp(Long collectId, String name) {
 
-        return baseUserCollectMapper.queryAppById(SecurityUser.getUserId(), appId, appName);
+        return baseUserCollectMapper.queryAppById(SecurityUser.getUserId(), collectId, name);
     }
 
+    /**
+     *
+     * @param collectId
+     * @param name 图像名称
+     * @return
+     */
     @Override
-    public List<DrawGraphicsCollectVo> getCollectImage(Long graphicsId, String graphicsName) {
+    public List<DrawGraphicsCollectVo> getCollectImage(Long collectId, String name) {
 
-        return baseUserCollectMapper.queryDrawGraphicsById(SecurityUser.getUserId(), graphicsId, graphicsName);
+        return baseUserCollectMapper.queryDrawGraphicsById(SecurityUser.getUserId(), collectId, name);
     }
 
 

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

@@ -16,6 +16,7 @@ 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;
@@ -36,27 +37,32 @@ public class SchemeServiceImpl implements ISchemeService {
      */
     @Override
     public SchemeVo getCurrentMember() {
-        List<SchemeVo> schemeVoList = schemeMapper.getCurrentMember();
+        SchemeVo scheme = schemeMapper.getCurrentMember();
 
         // 有且只有一个会员卡套餐生效
-        //TODO 上线需要更改
-        AssertUtils.isUnique(schemeVoList, ErrorCode.SCHEME_NOT_UNIQUE);
-        SchemeVo schemeVo = schemeVoList.get(0);
         // 根据套餐查询会员卡
-        List<MemberCardVo> memberCardVos = memberCardMapper.queryVoListBySchemeId(schemeVo.getId());
-        // 获取列表中所有的会员卡id
-        List<Long> memberCardIds = memberCardVos.stream().map(MemberCardVo::getId).toList();
-
-        // 根据会员卡查询权益
-        List<EquityVo> equityVos = equityMapper.queryVoByMemberCardIds(memberCardIds);
-        // 将拿到的权益根据会员卡id分组
-        Map<Long, List<EquityVo>> equityMap = equityVos.stream().collect(Collectors.groupingBy(EquityVo::getMemberCardId));
-        // 将会员卡通过id和权益的会员卡id绑定
-        memberCardVos.forEach(memberCardVo -> memberCardVo.setEquityList(equityMap.get(memberCardVo.getId())));
+        List<MemberCardVo> memberCardVos = memberCardMapper.queryVoListBySchemeId(scheme.getId());
+        // 让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())) {
+                collect = new ArrayList<>();
+            }
+            // 对当前值进行处理
+            memberCardVo.setSaveMoney(memberCardVo.getPrice().subtract(memberCardVo.getStrikethroughPrice()));
+            collect.add(memberCardVo);
+        }
+
+        // 通过会员卡id确定是否继续添加
 
         // 将会员卡列表绑定到方案中
-        schemeVo.setMemberCardList(memberCardVos);
-        return schemeVo;
+        scheme.setMemberCardList(memberList);
+
+        return scheme;
     }
 
     /**
@@ -78,7 +84,7 @@ public class SchemeServiceImpl implements ISchemeService {
      * @return
      */
     @Override
-    public List<AiModelVo> queryModelLawList(Long modelId) {
+    public List<AiModelLawVo> queryModelLawList(Long modelId) {
 
         return aiModelMapper.queryModelLawList(modelId);
     }
@@ -92,6 +98,7 @@ public class SchemeServiceImpl implements ISchemeService {
     @Override
     public MemberCardVo queryCurrentMemberById(Long memberId) {
 
+        // 传入用户自己的值去
         return schemeMapper.queryMemberCardByMemberId(SecurityUser.getUserId(), memberId);
     }
 

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

@@ -93,7 +93,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
     @Override
     public List<IndustryVo> getIndustryAll() {
 
-        return industryMapper.queryList(null);
+        return industryMapper.selectVoList(null);
     }
 
     /**

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

@@ -5,10 +5,10 @@
 <mapper namespace="com.xyzc.start.mapper.AiModelMapper">
 
 
-    <select id="queryModelLawList" resultType="com.xyzc.start.domain.vo.AiModelVo">
+    <select id="queryModelLawList" resultType="com.xyzc.start.domain.vo.AiModelLawVo">
         SELECT
-            id,
-            ai_model_name,
+            id                  AS model_id,
+            ai_model_name       AS model_name,
             consume_fuel_number,
             consume_fuel_unit
         FROM xy_ai_model
@@ -19,4 +19,7 @@
         LIMIT 20
 
     </select>
+
+
+
 </mapper>

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

@@ -54,18 +54,18 @@
         WHERE xdm.id = xbuc.collect_id
           AND xbuc.base_user_id = #{userId}
           AND xdm.del_flag = '0'
-        <if test="id != null">
-            AND xbuc.id &lt; #{id}
+        <if test="name != null">
+            AND xdm.model_name LIKE CONCAT( '%', #{name}, '%')
         </if>
-        <if test="modelName != null">
-            AND xdm.model_name LIKE CONCAT( '%', #{modelName}, '%')
+        <if test="collectId != null">
+            AND xbuc.id &lt; #{collectId}
         </if>
-        ORDER BY id DESC
+        ORDER BY xbuc.id DESC
         LIMIT 10
     </select>
 
     <select id="queryAppById" resultType="com.xyzc.start.domain.vo.AppCollectVo">
-        SELECT xbuc.id,
+        SELECT xbuc.id                  AS collect_id,
                app.app_name,
                app.description         AS app_desc,
                oss.url                 AS app_logo,
@@ -85,13 +85,13 @@
                  LEFT JOIN sys_oss oss2 ON oss2.oss_id = am.ai_model_logo_oss_id
         WHERE   bu.id = #{userId} AND app.del_flag = '0'
                  AND xbuc.is_collect = 1 AND xbuc.type = 3
-            <if test="appId != null">
-                and app.id &lt; #{appId}
+            <if test="name != null">
+                and app.app_name like concat('%',#{name},'%')
             </if>
-            <if test="appName != null">
-                and app.app_name like concat('%',#{appName},'%')
+            <if test="collectId != null">
+                and xbuc.id &lt; #{collectId}
             </if>
-        ORDER BY xbuc.create_time DESC
+        ORDER BY xbuc.id DESC
         LIMIT 10
     </select>
 
@@ -100,6 +100,8 @@
                xbuc.collect_id AS graphics_id,
                xbuc.is_collect,
                oss.url         AS oss_url,
+               dg.with,
+               dg.height,
                dg.title,
                dg.use_count,
                xdm.model_name,
@@ -109,14 +111,14 @@
                  LEFT JOIN xy_draw_model xdm ON dg.model_id = xdm.id
                  LEFT JOIN sys_oss oss ON oss.oss_id = dg.oss_id
         WHERE xbuc.base_user_id = #{userId}
-          and xbuc.type = 2
-        <if test="graphicsId != null">
-            and xbuc.collect_id > #{graphicsId}
+          and xbuc.type = 2  AND xbuc.is_collect = 1 AND  dg.del_flag = '0'
+        <if test="name != null">
+            and dg.title like concat('%',#{name},'%')
         </if>
-        <if test="graphicsName != null">
-            and dg.title like concat('%',#{graphicsName},'%')
+        <if test="collectId != null">
+            and xbuc.collect_id &lt; #{collectId}
         </if>
-        ORDER BY xbuc.create_time DESC
+        ORDER BY xbuc.id DESC
         LIMIT 10
     </select>
 

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

@@ -48,6 +48,7 @@
     <select id="queryBaseUserVoById" resultType="com.xyzc.start.domain.vo.BaseUserVo">
         select bu.id        as id,
                bu.user_name as user_name,
+               bu.user_id,
                bu.mobile,
                bu.surplus_fuel,
                oss.url      as avatar

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

@@ -8,11 +8,14 @@
     <select id="queryFuelFlowList" resultType="com.xyzc.start.domain.vo.BaseUserFuelFlowVo">
         select buff.id           as id,
                buff.create_time,
-               buff.fuel_account as flow_account,
+               buff.fuel_account as fuel_account,
                buff.flow_type    as flowType
         from xy_base_user bu
                  left join xy_base_user_fuel_flow buff on bu.id = buff.base_user_id
         where bu.id = #{userId}
+        <if test="flowId != null">
+            and buff.id &lt; #{flowId}
+        </if>
         order by buff.create_time desc
     </select>
 

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

@@ -5,17 +5,6 @@
 <mapper namespace="com.xyzc.start.mapper.IndustryMapper">
 
 
-    <select id="queryList" resultType="com.xyzc.start.domain.vo.IndustryVo">
-        select id,
-               name,
-               sort
-        from xy_industry
-    </select>
-
-    <select id="queryAppPageVo" resultType="com.xyzc.start.domain.vo.AppPageVo">
-
-    </select>
-
 
 
 </mapper>

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

@@ -0,0 +1,29 @@
+<?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.MemberCardMapper">
+
+
+    <select id="queryVoListBySchemeId" resultType="com.xyzc.start.domain.vo.MemberCardVo">
+        select mec.id                   AS member_card_id,
+               oss.url                  AS logo_url,
+               mec.card_name            AS member_card_name,
+               mec.description,
+               mec.card_level           AS card_level,
+               mcp.member_card_time     AS member_card_time,
+               mcp.time_unit            AS time_unit,
+               mcp.give_fuel            AS give_fuel,
+               amcp.strikethrough_price AS strikethrough_price,
+               amcp.agent_price         AS price
+        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}
+
+    </select>
+
+
+
+</mapper>