pom.xml

@@ -91,6 +91,7 @@
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>xyzcadmin123</nacos.password>
                 <logstash.address>127.0.0.1:4560</logstash.address>
+                <jar.ip>121.15.198.153</jar.ip>
             </properties>
         </profile>
         <profile>
@@ -104,6 +105,7 @@
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>xyzcadmin123</nacos.password>
                 <logstash.address>127.0.0.1:4560</logstash.address>
+                <jar.ip>127.0.0.1</jar.ip>
             </properties>
             <activation>
                 <!-- 默认环境 -->

xyzc-common/xyzc-common-core/src/main/java/com/xyzc/common/core/exception/ErrorCode.java

@@ -47,6 +47,8 @@ public enum ErrorCode {
     ORDER_NO_EXIST(2007, "此订单号不存在"),
     DISCOUNT_NO_CONFIG(2008, "折扣未配置"),
     NO_SELECT_DATA(2009, "未查询到数据"),
+    SCHEME_NOT_EXIST(2050, "方案不存在"),
+
 
     // 用户燃料不足
     SURPLUS_FUEL_NOT_ENOUGH(2300, "燃料不足"),
@@ -71,14 +73,10 @@ public enum ErrorCode {
     COMFYUI_MINIO_CONFIG(11011, "请先配置minio信息"),
 
     // 数字人报错信息
-    NUMERSON_NO(11012, "无效请求"),
+    NUMERSON_NO(11012, "无效请求");
+
 
     // 5000自定义编码
-    /**
-     * 5000  表示法人姓名和身份证的错误码  -认证
-     * 5001  表示业务人员姓名和身份证的错误码 -认证
-     */
-    ;
     private final int code;
     private final String msg;
 }

xyzc-common/xyzc-common-web/src/main/java/com/xyzc/common/web/security/filter/AuthenticationTokenFilter.java

@@ -47,6 +47,7 @@ public class AuthenticationTokenFilter extends OncePerRequestFilter {
             return;
         }
 
+        //TODO： 单独写一个接口让前端刷新TOKEN
         //如果user不为空，刷新token的过期时间
         tokenStoreCache.refreshExpire(accessToken);
 

xyzc-common/xyzc-common-web/src/main/java/com/xyzc/common/web/security/mobile/MobileAuthenticationProvider.java

@@ -34,33 +34,24 @@ public class MobileAuthenticationProvider implements AuthenticationProvider, Ini
 
     @Override
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        Assert.isInstanceOf(MobileAuthenticationToken.class, authentication,
-                () -> messages.getMessage(
-                        "MobileAuthenticationProvider.onlySupports",
-                        "Only MobileAuthenticationProvider is supported"));
 
         MobileAuthenticationToken authenticationToken = (MobileAuthenticationToken) authentication;
         String mobile = authenticationToken.getName();
         String code = (String) authenticationToken.getCredentials();
 
-        try {
+
+        // 测试用，跳过短信验证
+        if ("17600010020".equals(mobile)) {
+            UserDetails userDetails = mobileUserDetailsService.loadUserByMobile(mobile);
+            return createSuccessAuthentication(authentication, userDetails);
+        }
+        // 短信验证码效验
+        if (mobileVerifyCodeService.verifyCode(mobile, code)) {
             UserDetails userDetails = mobileUserDetailsService.loadUserByMobile(mobile);
-            if (userDetails == null) {
-                throw new BadCredentialsException("Bad credentials");
-            }
-            // 测试用，跳过短信验证
-            if("17600010020".equals(mobile)){
-                return createSuccessAuthentication(authentication, userDetails);
-            }
-            // 短信验证码效验
-            if (mobileVerifyCodeService.verifyCode(mobile, code)) {
-                return createSuccessAuthentication(authentication, userDetails);
-            } else {
-                throw new BadCredentialsException("mobile code is not matched");
-            }
-        } catch (UsernameNotFoundException ex) {
-            throw new BadCredentialsException(this.messages
-                    .getMessage("MobileAuthenticationProvider.badCredentials", "Bad credentials"));
+
+            return createSuccessAuthentication(authentication, userDetails);
+        } else {
+            throw new BadCredentialsException("mobile code is not matched");
         }
 
     }

xyzc-common/xyzc-common-web/src/main/java/com/xyzc/common/web/security/mobile/MobileUserDetailsService.java

@@ -16,7 +16,6 @@ public interface MobileUserDetailsService {
      *
      * @param mobile 手机号
      * @return 用户信息
-     * @throws UsernameNotFoundException 不存在异常
      */
-    UserDetails loadUserByMobile(String mobile) throws UsernameNotFoundException;
+    UserDetails loadUserByMobile(String mobile);
 }

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

@@ -1,7 +1,6 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.start.domain.DrawAssistant;
 import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IDiscoverService;
@@ -32,8 +31,8 @@ public class DiscoverPageController {
      * 绘画广场
      */
     @GetMapping("/drawSquare")
-    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId, String keyword) {
-        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId, keyword);
+    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId, String keyword, Long length) {
+        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId, keyword, length);
 
         return Result.ok(drawGraphicsList);
     }
@@ -43,8 +42,8 @@ public class DiscoverPageController {
      * 绘画模型
      */
     @GetMapping("/drawModel")
-    public Result<List<DrawModelCollectVo>> drawModel(Long drawModelId, String keyword) {
-        List<DrawModelCollectVo> drawModelList = discoverService.queryDrawModelList(drawModelId, keyword);
+    public Result<List<DrawModelCollectVo>> drawModel(Long drawModelId, String keyword, Long length) {
+        List<DrawModelCollectVo> drawModelList = discoverService.queryDrawModelList(drawModelId, keyword, length);
 
         return Result.ok(drawModelList);
     }
@@ -73,8 +72,8 @@ public class DiscoverPageController {
      * 查询具体绘画助手的提示词
      */
     @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);
+    public Result<List<DrawPromptVo>> drawAssistant(@PathVariable Integer assistantId, Long promptId, String keyword, Integer length) {
+        List<DrawPromptVo> drawPromptConfigList = drawAssistantService.queryDrawPromptConfigList(assistantId, promptId, keyword, length);
 
         return Result.ok(drawPromptConfigList);
     }
@@ -90,7 +89,6 @@ public class DiscoverPageController {
 
     /**
      * 应用精选、特色、玩转
-     *
      */
     @GetMapping("/selectedApp")
     public Result<List<BaseUserSelectAppVo>> selectedApp(@Valid AppQuery query) {
@@ -102,7 +100,6 @@ public class DiscoverPageController {
 
     /**
      * 数字人列表
-     *
      */
     @GetMapping("/digitalHuman")
     public Result<List<Void>> digitalHuman() {

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

@@ -28,8 +28,9 @@ public class MyPhotoFolderController {
      * @return 画夹
      */
     @GetMapping("/photoFolder")
-    public Result<List<BaseUserPhotoFolderVo>> photoFolder(Long id) {
-        List<BaseUserPhotoFolderVo> photoFolder = userInfoService.photoFolder(id);
+    public Result<List<BaseUserPhotoFolderVo>> photoFolder(Long id, Long length) {
+        List<BaseUserPhotoFolderVo> photoFolder = userInfoService.photoFolder(id, length);
+
         return Result.ok(photoFolder);
     }
 

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

@@ -1,8 +1,10 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
+import com.xyzc.start.domain.bo.CreateOrderBo;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.ISchemeService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,17 +32,27 @@ public class SchemeController {
         return Result.ok(scheme);
     }
 
+    /**
+     * 会员卡订单展示
+     */
+    @GetMapping("/memberOrder")
+    public Result<BaseUserOrderVo> queryOrder() {
+//        BaseUserOrderVo userOrder = schemeService.queryOrder();
+
+        return Result.ok();
+    }
 
     /**
-     * id查询会员卡详细权益
+     * 购买物品订单生成（单个卡片或燃料）
      */
-    @GetMapping("/currentMember/{memberId}")
-    public Result<MemberCardVo> currentMemberById(@PathVariable("memberId") Long memberId) {
-        MemberCardVo memberCard = schemeService.queryCurrentMemberById(memberId);
+    @PostMapping("/createOrder")
+    public Result<BaseUserOrderVo> createOrder(@RequestBody @Valid CreateOrderBo bo){
+        BaseUserOrderVo userOrder = schemeService.createOrder(bo);
 
-        return Result.ok(memberCard);
+        return Result.ok(userOrder);
     }
 
+
     /**
      * 燃料包生效套餐信息
      */
@@ -51,15 +63,6 @@ public class SchemeController {
         return Result.ok(scheme);
     }
 
-//    /**
-//     * 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/UserAuthController.java

@@ -68,7 +68,7 @@ public class UserAuthController {
             return Result.error("短信发送失败！");
         }
 
-        return Result.ok();
+        return Result.ok("发送成功");
     }
 
     /**

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

@@ -62,6 +62,16 @@ public class UserInfoController {
         return Result.ok(baseUserMemberCardDetail);
     }
 
+    /**
+     * 指定会员卡状态
+     */
+    @GetMapping("/cardStatus/{cardId}")
+    public Result<BaseUserMemberCardVo> cardStatus(@PathVariable("cardId") Long cardId) {
+        BaseUserMemberCardVo baseUserMemberCardDetail = userInfoService.queryCardStatus(cardId);
+
+        return Result.ok(baseUserMemberCardDetail);
+    }
+
 
     /**
      * 燃料流水

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

@@ -74,11 +74,6 @@ public class App extends BaseEntity {
     private String delFlag;
 
     /**
-     * 是否精选
-     */
-    private Integer isChoiceness;
-
-    /**
      * app路由
      */
     private String routePath;

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

@@ -0,0 +1,71 @@
+package com.xyzc.start.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.xyzc.start.domain.vo.MemberCardUseDetail;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户会员卡
+ *
+ * @author 杨兴卓
+ */
+@Data
+@TableName("xy_base_user_member_card")
+public class BaseUserMemberCard implements Serializable {
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 会员卡id
+     */
+    private Long memberId;
+
+    /**
+     * 会员卡图地址
+     */
+    private Long baseUserId;
+
+    /**
+     * 版本号
+     */
+    @Version
+    private Integer version;
+
+    /**
+     * 会员卡状态，0-生效，1-过期，2-冻结
+     */
+    private Integer status;
+
+    /**
+     * 到期时间
+     */
+    private Date expireTime;
+
+    /**
+     * 会员卡使用详情
+     */
+    private Long agentMerId;
+
+    /**
+     * 逻辑删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 会员卡别名id
+     */
+    private Long memberCardAliasId;
+
+    /**
+     * 购买订单id
+     */
+    private Long baseUserOrderId;
+
+}

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

@@ -0,0 +1,44 @@
+package com.xyzc.start.domain;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.xyzc.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 用户订单展示
+ *
+ * @author 杨兴卓
+ */
+@Data
+@TableName("xy_base_user_order")
+public class BaseUserOrder extends BaseEntity {
+
+    private Long id;
+
+    private Long baseUserId;
+
+    private Integer status;
+
+    private Integer orderType;
+
+    private Long agentMerId;
+
+    private Integer payMethod;
+
+    private BigDecimal goodsAmount;
+
+    private BigDecimal payAmount;
+
+    private BigDecimal discountAmount;
+
+    @TableLogic
+    private String delFlag;
+
+    @Version
+    private Integer version;
+}

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

@@ -15,5 +15,5 @@ public class DrawAssistant {
     /**
      * 绘画助手名称
      */
-    private String assistant;
+    private String assistantName;
 }

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

@@ -14,11 +14,11 @@ public class DrawGraphics {
 
     private String id;
 
-    private String modelId;
+    private String aiModelId;
 
     private String useCount;
 
-    private String ossId;
+    private String ossUrl;
 
     private String title;
 
@@ -30,8 +30,8 @@ public class DrawGraphics {
 
     private Integer height;
 
-    private String promptWord;
+    private String prompt;
 
-    private String reversePromptWord;
+    private String reversePrompt;
 
 }

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

@@ -1,15 +1,16 @@
 package com.xyzc.start.domain;
 
-import io.github.linpeilie.annotations.AutoMapper;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
  * DrawPromptConfig
- *
- *
+ * <p>
+ * author: 杨兴卓
  */
 @Data
-public class DrawPromptConfig {
+@TableName("xy_draw_prompt")
+public class DrawPrompt {
 
     /**
      * 提示词id

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

@@ -24,7 +24,7 @@ public class UgcUser extends BaseEntity {
     /**
      * ugc用户头像地址
      */
-    private String avatar;
+    private Long ugcAvatarId;
 
     /**
      * ugc用户留言

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

@@ -0,0 +1,24 @@
+package com.xyzc.start.domain.bo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+/**
+ * 生成订单类
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class CreateOrderBo {
+
+    /**
+     * 和type联合使用，0-会员卡id, 1-燃料包id
+     */
+    private Long id;
+
+    /**
+     * 1-会员卡, 2-燃料包，3-卡密兑换
+     */
+    @Range(min = 1, max = 3, message = "type参数错误，请输入{min}到{max}之间的值")
+    private Integer type;
+}

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

@@ -37,4 +37,9 @@ public class BaseUserCollectQuery {
     @Range(min=0, max=1, message = "传入的查询类型不正确")
     private Integer isCollect;
 
+    /**
+     * 每页条数
+     */
+    @Range(min=1, max=100, message = "传入的查询类型不正确")
+    private Integer length;
 }

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

@@ -26,7 +26,7 @@ public class AiModelLawVo {
     private Integer consumeFuelNumber;
 
     /**
-     * 消耗燃料单位
+     * 消耗燃料单位，1-次；2-生成时间（秒）；3-生成结果（秒）
      */
     private Integer consumeFuelUnit;
 

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

@@ -0,0 +1,78 @@
+package com.xyzc.start.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.xyzc.start.domain.BaseUserOrder;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 用户订单视图
+ *
+ * @author 杨兴卓
+ */
+@Data
+@AutoMapper(target = BaseUserOrder.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BaseUserOrderVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单号
+     */
+    private Long id;
+
+    /**
+     * 基础用户id
+     */
+    private Long baseUserId;
+
+    /**
+     * 订单状态，0-未支付，1-支付中，2-已支付，3-支付超时
+     */
+    private Integer status;
+
+    /**
+     * 订单类型，0-会员卡充值，1-燃料包充值，2-卡密支付订单
+     */
+    private Integer orderType;
+
+    /**
+     * 代理商id
+     */
+    private Long agentMerId;
+
+    /**
+     * 支付方式， 1-微信支付，2-支付宝支付，3-银行卡支付，4-其他
+     */
+    private Integer payMethod;
+
+    /**
+     * 商品总额
+     */
+    private BigDecimal goodsAmount;
+
+    /**
+     * 应付金额
+     */
+    private BigDecimal payAmount;
+
+    /**
+     * 折扣金额
+     */
+    private BigDecimal discountAmount;
+
+    /**
+     * 逻辑删除
+     */
+    private String delFlag;
+
+    /**
+     * 版本号
+     */
+    private Integer version;
+
+}

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

@@ -26,4 +26,9 @@ public class BaseUserPhotoFolderVo {
      * 描述
      */
     private String description;
+
+    /**
+     * 图片生成状态，0:未启动;1:生成中;2:生成失败;3:生成成功
+     */
+    private Integer isGenerate;
 }

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

@@ -2,6 +2,7 @@ package com.xyzc.start.domain.vo;
 
 import com.xyzc.start.domain.DrawAssistant;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 /**
@@ -19,6 +20,7 @@ public class DrawAssistantVo {
     /**
      * 助手标题
      */
+    @AutoMapping(target = "assistantName")
     private String assistant;
 
 }

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

@@ -2,6 +2,7 @@ package com.xyzc.start.domain.vo;
 
 import com.xyzc.start.domain.DrawGraphics;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 /**
@@ -31,7 +32,7 @@ public class DrawGraphicsVo {
     /**
      * 图像的地址
      */
-    private String ossId;
+    private String ossUrl;
 
     /**
      * 图像的标题
@@ -61,11 +62,13 @@ public class DrawGraphicsVo {
     /**
      * 正向提示词
      */
+    @AutoMapping(target = "prompt")
     private String promptWord;
 
     /**
      * 反向提示词
      */
+    @AutoMapping(target = "reversePrompt")
     private String reversePromptWord;
 
     /**

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

@@ -8,7 +8,7 @@ import lombok.Data;
  * @author 杨兴卓
  */
 @Data
-public class DrawPromptConfigVo {
+public class DrawPromptVo {
 
     /**
      * 提示词id

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

@@ -76,16 +76,16 @@ public class FuelPackageVo implements Serializable {
     /**
      * 立省价格
      */
-    private BigDecimal savePrice;
+    private BigDecimal saveMoney;
 
 
     /**
      * 覆盖
-     * @param savePrice
+     * @param saveMoney
      */
-    public void setSavePrice(BigDecimal savePrice) {
+    public void setSaveMoney(BigDecimal saveMoney) {
 
-        this.savePrice = strikethroughPrice.subtract(price);
+        this.saveMoney = strikethroughPrice.subtract(price);
     }
 
 }

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

@@ -1,6 +1,5 @@
 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;

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

@@ -17,7 +17,7 @@ public interface BaseUserPhotoFolderMapper extends BaseMapperPlus<BaseUserPhotoF
      * @param id
      * @return
      */
-    List<BaseUserPhotoFolderVo> queryPhotoFolder(Long userId, Long id);
+    List<BaseUserPhotoFolderVo> queryPhotoFolder(Long userId, Long id, Long length);
 
     /**
      * @param userId

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

@@ -12,13 +12,20 @@ public interface CareerMapper extends BaseMapperPlus<Career, CareerVo> {
 
 
     /**
-     * 根据职业id分页查询职业
+     * 根据职业id分页查询app
      * todo:优化查询
      *
      * @param careerId
-     * @param appId 应用id
+     * @param appId    应用id
      * @return
      */
     List<AppPageVo> queryAppPageVoByCareerId(Long userId, Long careerId, Long appId);
 
+    /**
+     * 根据行业id查询所有职业
+     *
+     * @param industryIds
+     * @return
+     */
+    List<CareerVo> queryAppPageVoByIndustryIds(List<Long> industryIds);
 }

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

@@ -4,7 +4,7 @@ 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.DrawPromptVo;
 import com.xyzc.start.domain.vo.DrawReversePromptVo;
 
 import java.util.List;
@@ -18,7 +18,7 @@ public interface DrawAssistantMapper extends BaseMapperPlus<DrawAssistant, DrawA
      * @param promptId
      * @return
      */
-    List<DrawPromptConfigVo> queryDrawPromptList(Integer assistantId, Long promptId, String keyword, Integer length);
+    List<DrawPromptVo> queryDrawPromptList(Integer assistantId, Long promptId, String keyword, Integer length);
 
     /**
      * 分页查询反向prompt列表

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, String keyword);
+    List<DrawGraphicsSquareVo> queryGraphics(Long userId, Long graphicsId, String keyword, Long length);
 
 
 }

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

@@ -24,7 +24,7 @@ public interface DrawModelMapper extends BaseMapperPlus<DrawModel, DrawModelVo>
      * @param drawModelId
      * @return
      */
-    List<DrawModelCollectVo> queryDrawModelList(Long userId ,Long drawModelId, String keyword);
+    List<DrawModelCollectVo> queryDrawModelList(Long userId ,Long drawModelId, String keyword, Long length);
 
 
 }

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

@@ -3,8 +3,11 @@ 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.domain.MemberCard;
+import com.xyzc.start.domain.bo.CreateOrderBo;
 import com.xyzc.start.domain.vo.MemberCardVo;
+import com.xyzc.start.domain.vo.SchemeVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -25,6 +28,11 @@ public interface MemberCardMapper extends BaseMapperPlus<MemberCard, MemberCardV
     List<MemberCardVo> queryVoListBySchemeId(Long schemeId);
 
     /**
+     * 根据会员卡id查询当前可核销方案
      *
+     * @param bo
+     * @return
      */
+    SchemeVo queryCurrentVerifyScheme(@Param("bo") CreateOrderBo bo);
+
 }

xyzc-start/src/main/java/com/xyzc/start/security/MobileUserDetailsServiceImpl.java

@@ -1,7 +1,10 @@
 package com.xyzc.start.security;
 
+import com.xyzc.common.core.exception.ErrorCode;
+import com.xyzc.common.core.exception.ServerException;
 import com.xyzc.common.web.security.mobile.MobileUserDetailsService;
 import com.xyzc.common.web.security.user.UserDetail;
+import com.xyzc.start.constant.BaseUserConst;
 import com.xyzc.start.convert.BaseUserConvert;
 import com.xyzc.start.domain.BaseUser;
 import com.xyzc.start.mapper.BaseUserMapper;
@@ -24,19 +27,27 @@ public class MobileUserDetailsServiceImpl implements MobileUserDetailsService {
 
 
     @Override
-    public UserDetails loadUserByMobile(String mobile) throws UsernameNotFoundException {
+    public UserDetails loadUserByMobile(String mobile) {
         BaseUser userEntity = baseUserMapper.queryDetailByMobile(mobile, 1810310843224322049L);
+
+        // TODO： 后期新添加用户抽离出来不要放在这里
+        // 未发现用户就保存用户信息
+        BaseUser baseUser = new BaseUser();
         if (userEntity == null) {
-            throw new UsernameNotFoundException("手机号错误");
+            baseUser.setUserName(mobile);
+            baseUser.setMobile(mobile);
+            baseUser.setStatus(BaseUserConst.NORMAL_STATUS);
+            baseUser.setSurplusFuel(10L);
+
+            //TODO ：代理商id
+            baseUser.setAgentMerId(1810310843224322049L);
+            baseUserMapper.insert(baseUser);
         }
 
         // 用户详细信息
         // 转换成UserDetail对象
         UserDetail userDetail = BaseUserConvert.INSTANCE.convertDetail(userEntity);
-        userDetail.setUsername(userEntity.getUserName());
-
-        // TODO: 会员卡列表
-
+        userDetail.setUsername(baseUser.getUserName());
 
         // 账号不可用
 //        if (userEntity.getStatus() == UserStatusEnum.DISABLE.getValue()) {

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

@@ -18,7 +18,7 @@ public interface IDiscoverService {
      * @param graphicsId Long
      * @return List<DrawGraphicsVo>
      */
-    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword);
+    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword, Long length);
 
     /**
      * 分页查询绘画模型
@@ -26,7 +26,7 @@ public interface IDiscoverService {
      * @param drawModelId
      * @return
      */
-    List<DrawModelCollectVo> queryDrawModelList(Long drawModelId, String keyword);
+    List<DrawModelCollectVo> queryDrawModelList(Long drawModelId, String keyword, Long length);
 
 
     /**

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

@@ -1,7 +1,7 @@
 package com.xyzc.start.service;
 
 import com.xyzc.start.domain.vo.DrawAssistantVo;
-import com.xyzc.start.domain.vo.DrawPromptConfigVo;
+import com.xyzc.start.domain.vo.DrawPromptVo;
 
 import java.util.List;
 
@@ -19,5 +19,5 @@ public interface IDrawAssistantService {
      * @param assistantId
      * @return
      */
-    List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length);
+    List<DrawPromptVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length);
 }

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

@@ -1,5 +1,6 @@
 package com.xyzc.start.service;
 
+import com.xyzc.start.domain.bo.CreateOrderBo;
 import com.xyzc.start.domain.vo.*;
 
 import java.util.List;
@@ -47,4 +48,11 @@ public interface ISchemeService {
      */
     List<AiModelLawVo> queryModelLawList(Long modelId);
 
+    /**
+     * 创建订单
+     *
+     * @param bo
+     * @return
+     */
+    BaseUserOrderVo createOrder(CreateOrderBo bo);
 }

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

@@ -39,12 +39,12 @@ public interface IUserInfoService {
     List<IndustryVo> getIndustryAll();
 
     /**
-     * 获取画夹的所有内容
+     * 分页获取画夹的
      *
      * @param id
      * @return
      */
-    List<BaseUserPhotoFolderVo> photoFolder(Long id);
+    List<BaseUserPhotoFolderVo> photoFolder(Long id, Long length);
 
     /**
      * 根据id获取图画
@@ -105,4 +105,10 @@ public interface IUserInfoService {
      */
     BaseUserMemberCardVo queryCardUseDetail(Long cardId);
 
+    /**
+     * 会员卡状态
+     * @param cardId
+     * @return
+     */
+    BaseUserMemberCardVo queryCardStatus(Long cardId);
 }

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

@@ -80,7 +80,7 @@ public class AppPageServiceImpl implements IAppPageService {
         // 将行业列表的id抽取出来
         List<Long> industryIds = industryVoList.stream().map(IndustryVo::getIndustryId).toList();
 
-        List<CareerVo> careerVos = careerMapper.selectVoBatchIds(industryIds);
+        List<CareerVo> careerVos = careerMapper.queryAppPageVoByIndustryIds(industryIds);
 
         //遍历行业列表，将职业列表通过行业id关联
         for (IndustryVo industryVo : industryVoList) {
@@ -112,6 +112,8 @@ public class AppPageServiceImpl implements IAppPageService {
         appPageCareerVo.setCareerName(appPageVos.get(0).getCareerName());
         appPageCareerVo.setAppPageList(appPageVos);
 
+        // TODO 记得精选
+
         return appPageCareerVo;
     }
 

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

@@ -36,21 +36,21 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword) {
+    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword, Long length) {
 
-        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId, keyword);
+        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId, keyword, length == null ? 20 : length);
     }
 
     /**
-     * 根据上一个id，列表查询模型助手
+     * 根据上一个id，列表查询模型
      *
      * @param drawModelId
      * @return
      */
     @Override
-    public List<DrawModelCollectVo> queryDrawModelList(Long drawModelId, String keyword) {
+    public List<DrawModelCollectVo> queryDrawModelList(Long drawModelId, String keyword, Long length) {
 
-        return drawModelMapper.queryDrawModelList(SecurityUser.getUserId(), drawModelId, keyword);
+        return drawModelMapper.queryDrawModelList(SecurityUser.getUserId(), drawModelId, keyword, length == null ? 20 : length);
     }
 
     /**

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

@@ -1,7 +1,7 @@
 package com.xyzc.start.service.impl;
 
 import com.xyzc.start.domain.vo.DrawAssistantVo;
-import com.xyzc.start.domain.vo.DrawPromptConfigVo;
+import com.xyzc.start.domain.vo.DrawPromptVo;
 import com.xyzc.start.mapper.DrawAssistantMapper;
 import com.xyzc.start.service.IDrawAssistantService;
 import lombok.RequiredArgsConstructor;
@@ -33,7 +33,7 @@ public class DrawAssistantServiceImpl implements IDrawAssistantService {
      * @return
      */
     @Override
-    public List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length) {
+    public List<DrawPromptVo> 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/SchemeServiceImpl.java

@@ -3,6 +3,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.web.security.user.SecurityUser;
+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;
@@ -11,6 +12,7 @@ import com.xyzc.start.mapper.SchemeMapper;
 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.List;
@@ -82,7 +84,7 @@ public class SchemeServiceImpl implements ISchemeService {
         memberCardVo4.setMemberEquityName("AI绘画");
         memberCardVo4.setMemberEquityCount(2320);
 
-        MemberEquityVo memberCardVo5= new MemberEquityVo();
+        MemberEquityVo memberCardVo5 = new MemberEquityVo();
         memberCardVo5.setMemberEquityid(2);
         memberCardVo5.setMemberEquityName("AI绘画");
         memberCardVo5.setMemberEquityCount(2320);
@@ -147,4 +149,21 @@ public class SchemeServiceImpl implements ISchemeService {
         return scheme;
     }
 
+    /**
+     * 创建订单
+     *
+     * @param bo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public BaseUserOrderVo createOrder(CreateOrderBo bo) {
+        // 先查询当前会员卡或者燃料包是否生效
+        SchemeVo schemeVo = memberCardMapper.queryCurrentVerifyScheme(bo);
+        // 没有生效的套餐抛出异常
+        AssertUtils.notNull(schemeVo, ErrorCode.SCHEME_NOT_EXIST);
+
+        //
+        return null;
+    }
 }

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

@@ -81,23 +81,7 @@ public class UserAuthServiceImpl implements IUserAuthService {
         BaseUser user = baseUserMapper.queryDetailByMobile(login.getMobile(), 1810310843224322049L);
 
         // 发送短信
-        boolean sendFlag = smsService.sendCode(login.getMobile(), "code", code);
-
-        // TODO： 后期新添加用户抽离出来不要放在这里
-        // 未发现用户就保存用户信息
-        if (user == null) {
-            BaseUser baseUser = new BaseUser();
-            baseUser.setUserName(login.getMobile());
-            baseUser.setMobile(login.getMobile());
-            baseUser.setStatus(BaseUserConst.NORMAL_STATUS);
-            baseUser.setSurplusFuel(10L);
-
-            //TODO ：代理商id
-            baseUser.setAgentMerId(1810310843224322049L);
-            baseUserMapper.insert(baseUser);
-        }
-
-        return sendFlag;
+        return smsService.sendCode(login.getMobile(), "code", code);
     }
 
     @Override

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

@@ -118,9 +118,9 @@ public class UserInfoServiceImpl implements IUserInfoService {
      * @return
      */
     @Override
-    public List<BaseUserPhotoFolderVo> photoFolder(Long id) {
+    public List<BaseUserPhotoFolderVo> photoFolder(Long id, Long length) {
 
-        return photoFolderMapper.queryPhotoFolder(SecurityUser.getUserId(), id);
+        return photoFolderMapper.queryPhotoFolder(SecurityUser.getUserId(), id, length == null ? 10 : length);
     }
 
     /**
@@ -185,6 +185,8 @@ public class UserInfoServiceImpl implements IUserInfoService {
         // todo: 目前商户是写死的
         BaseUserMemberCardVo baseUserMemberCardVo = baseUserMemberCardMapper.queryMemberCard(SecurityUser.getUserId(), cardId, 1810310843224322049L);
 
+        AssertUtils.notNull(baseUserMemberCardVo, ErrorCode.NO_SELECT_DATA);
+
         List<MemberCardUseDetail> objects = new ArrayList<>();
 
         MemberCardUseDetail memberCardUseDetail = new MemberCardUseDetail();
@@ -349,5 +351,17 @@ public class UserInfoServiceImpl implements IUserInfoService {
         // 然后扣除燃料返回成功
         baseUserMapper.updateById(baseUser);
     }
+
+    /**
+     * 查询用户会员卡状态
+     *
+     * @param cardId
+     * @return
+     */
+    @Override
+    public BaseUserMemberCardVo queryCardStatus(Long cardId) {
+        // TODO：商户id 暂时写死
+        return baseUserMemberCardMapper.queryMemberCard(SecurityUser.getUserId(), cardId, 1810310843224322049L);
+    }
 }
 

xyzc-start/src/main/resources/application.yml

@@ -23,6 +23,7 @@ spring:
         # 注册组
         group: @nacos.discovery.group@
         namespace: ${spring.profiles.active}
+        ip: @jar.ip@
       config:
         # 配置组
         group: @nacos.config.group@

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

@@ -6,20 +6,20 @@
 
     <select id="queryDrawModelByBo" resultType="com.xyzc.start.domain.vo.BaseUserCollectVo">
         SELECT
-        xdm.oss_id AS pic_url,
-        xdm.model_name AS ai_model_name,
-        xdm.description AS description
+            xdm.oss_id AS pic_url,
+            xdm.model_name AS ai_model_name,
+            xdm.description AS description
         FROM
-        xy_base_user_collect xbuc
+            xy_base_user_collect xbuc
         LEFT JOIN xy_draw_model xdm ON xbuc.collect_id = xdm.id
-        WHERE
-        xbuc.base_user_id = #{baseUserId}
-        AND xbuc.id > #{bo.id}
-        AND xbuc.is_collect = #{bo.isCollect}
+        WHERE xbuc.base_user_id = #{baseUserId}
+            AND xbuc.id > #{bo.id}
+            AND xbuc.is_collect = #{bo.isCollect}
         <if test="bo.likeName != null">
             AND xdm.`model_name` LIKE CONCAT( '%',#{bo.likeName}, '%')
         </if>
         ORDER BY xbuc.use_time DESC
+        <if test=""></if>
         LIMIT 10
     </select>
 
@@ -36,24 +36,23 @@
     <select id="queryDrawModelById" resultType="com.xyzc.start.domain.vo.DrawModelCollectVo">
         SELECT xdm.id       AS id,
                xbuc.id      AS collect_id,
-               oss.url      AS oss_id,
+               xdm.oss_url      AS oss_url,
                xdm.model_name,
                xdm.description,
                xuu.id       AS ugc_user_id,
-               xuu.ugc_nick AS ugc_user_name,
-               oss2.url     AS ugc_user_avatar,
+               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 sys_oss oss ON xdm.oss_id = oss.oss_id
-            AND `type` = 1
-                 LEFT JOIN xy_ugc_user xuu ON xdm.ugc_id = xuu.id
-                 LEFT JOIN sys_oss oss2 ON xuu.avatar = oss2.oss_id
+                 LEFT JOIN xy_ugc_user xuu ON xdm.ugc_user_id = xuu.id
+                 LEFT JOIN xy_ugc_avatar xua ON xuu.ugc_avatar_id = xua.id
         WHERE xdm.id = xbuc.collect_id
           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}, '%')
         </if>
@@ -70,7 +69,7 @@
                app.description         AS app_desc,
                oss.url                 AS app_logo,
                app.id                  AS app_id,
-               app.is_choiceness,
+               xda.discover_app_type   AS is_choiceness,
                app.use_count,
                xbuc.type               AS type,
                am.ai_model_logo_oss_id AS ai_model_logo,
@@ -79,6 +78,7 @@
         FROM xy_base_user_collect xbuc
                  LEFT JOIN xy_base_user bu ON bu.id = xbuc.base_user_id
                  LEFT JOIN xy_app app ON app.id = xbuc.collect_id
+                 LEFT JOIN xy_discover_app xda ON xbuc.collect_id = xda.app_id
                  LEFT JOIN sys_oss oss ON oss.oss_id = app.oss_id
                  LEFT JOIN xy_ai_model_app xama ON app.id = xama.app_id
                  LEFT JOIN xy_ai_model am ON xama.ai_model_id = am.id
@@ -99,17 +99,16 @@
         SELECT xbuc.id         AS collect_id,
                xbuc.collect_id AS graphics_id,
                xbuc.is_collect,
-               oss.url         AS oss_url,
-               dg.with,
+               dg.oss_url         AS oss_url,
+               dg.width,
                dg.height,
                dg.title,
                dg.use_count,
-               xdm.model_name,
+               xam.ai_model_name AS model_name,
                xbuc.type
         FROM xy_base_user_collect xbuc
                  LEFT JOIN xy_draw_graphics dg ON xbuc.collect_id = dg.id
-                 LEFT JOIN xy_draw_model xdm ON dg.model_id = xdm.id
-                 LEFT JOIN sys_oss oss ON oss.oss_id = dg.oss_id
+                 LEFT JOIN xy_ai_model xam ON dg.ai_model_id = xam.id
         WHERE xbuc.base_user_id = #{userId}
           and xbuc.type = 2  AND xbuc.is_collect = 1 AND  dg.del_flag = '0'
         <if test="name != null">
@@ -129,6 +128,7 @@
             app.description AS app_desc,
             oss.url         AS app_icon,
             app.route_path,
+            xbuc.is_collect AS is_collect,
             oss2.url        AS ai_model_icon,
             am.ai_model_name AS ai_model_name,
             app.use_count   AS use_count
@@ -217,7 +217,9 @@
 
     </select>
 
-    <select id="queryMoreHistoryAppBy" resultType="com.xyzc.start.domain.vo.BaseUserCollectAppVo"></select>
+    <select id="queryMoreHistoryAppBy" resultType="com.xyzc.start.domain.vo.BaseUserCollectAppVo">
+
+    </select>
 
 
 </mapper>

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

@@ -18,7 +18,7 @@
             AND bupf.id < #{id}
         </if>
         ORDER BY bupf.id DESC
-        LIMIT 10
+        LIMIT #{length}
     </select>
 
 

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

@@ -17,8 +17,7 @@
                xam.id          AS ai_model_id,
                oss2.url        AS ai_model_icon,
                app.use_count,
-               buc.is_collect AS is_collect,
-               app.is_choiceness
+               buc.is_collect AS is_collect
         FROM xy_industry xin
                  LEFT JOIN xy_career xc ON xin.id = xc.industry_id
                  LEFT JOIN xy_career_app xca ON xc.id = xca.career_id
@@ -39,5 +38,14 @@
 
     </select>
 
+    <select id="queryAppPageVoByIndustryIds" resultType="com.xyzc.start.domain.vo.CareerVo">
+        select * from xy_career
+        where industry_id in
+        <foreach collection="industryIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+
 
 </mapper>

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

@@ -5,20 +5,23 @@
 <mapper namespace="com.xyzc.start.mapper.DrawAssistantMapper">
 
 
-    <select id="queryDrawPromptList" resultType="com.xyzc.start.domain.vo.DrawPromptConfigVo">
+    <select id="queryDrawPromptList" resultType="com.xyzc.start.domain.vo.DrawPromptVo">
         select
-            xdpc.id     AS prompt_id,
-            xdpc.prompt_oss_url,
-            xdpc.prompt,
-            xdpc.prompt_en
+            xdp.id     AS prompt_id,
+            xdp.prompt_oss_url,
+            xdp.prompt_name,
+            xdp.prompt_name_en
         from xy_draw_assistant xda
-                 left join xy_draw_prompt_config xdpc on xda.id = xdpc.assistant_id
+                 left join xy_draw_prompt xdp on xda.id = xdp.assistant_id
         where xda.id = #{assistantId}
         <if test="promptId != null">
-            and xdpc.id > #{promptId}
+            and xdp.id > #{promptId}
         </if>
         <if test="keyword != null">
-            and xdpc.prompt like concat('%',#{keyword},'%')
+            and xdp.prompt_name like concat('%',#{keyword},'%')
+        </if>
+        <if test="keyword != null">
+            and xdp.prompt_name_en like concat('%',#{keyword},'%')
         </if>
         LIMIT #{length}
     </select>

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

@@ -8,14 +8,13 @@
     <select id="queryGraphics" resultType="com.xyzc.start.domain.vo.DrawGraphicsSquareVo">
         SELECT
             dg.id           AS graphics_id,
-            oss.url         AS oss_url,
+            dg.oss_url      AS oss_url,
             dg.title,
             dm.model_name   AS model_name,
             dg.use_count    AS use_count,
             buc.is_collect  AS is_collect
         FROM xy_draw_graphics dg
-            LEFT JOIN sys_oss oss       ON dg.oss_id = oss.oss_id
-            LEFT JOIN xy_draw_model dm  ON dg.model_id = dm.id
+            LEFT JOIN xy_draw_model dm  ON dg.ai_model_id = dm.id
             LEFT JOIN xy_base_user_collect buc ON buc.collect_id = dg.id AND buc.type = 2
         WHERE dg.del_flag = '0'
         <if test="graphicsId != null">
@@ -25,7 +24,7 @@
             AND dg.title LIKE CONCAT('%',#{keyword},'%')
         </if>
         ORDER BY dg.id DESC
-        LIMIT 20
+        LIMIT #{length}
     </select>
 
 </mapper>

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

@@ -11,19 +11,27 @@
                xdm.oss_url,
                xdm.description,
                xuu.id       AS ugc_user_id,
-               xuu.avatar   AS ugc_user_avatar,
-               xuu.ugc_nick AS ugc_user_name,
+               xua.avatar   AS ugc_user_avatar,
+               xuu.nick_name 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_ugc_user xuu on xdm.ugc_user_id = xuu.id
                  left join xy_base_user_collect xbuc on xdm.id = xbuc.collect_id
+                 left join xy_ugc_avatar xua on xuu.ugc_avatar_id = xua.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>
+        <if test="drawModelId != null">
+            and xdm.id &lt; #{drawModelId}
+        </if>
+        order by xdm.id desc
+        <if test="length != null">
+            limit #{length}
+        </if>
     </select>
 
 

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

@@ -25,5 +25,14 @@
     </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>
+
 
 </mapper>

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

@@ -8,10 +8,12 @@
 
     <select id="queryFuelPackageById" resultType="com.xyzc.start.domain.vo.FuelPackageVo">
         select xafpp.id,
-               xfp.fuel_package_name    AS fuelPackageName,
+               xfp.fuel_package_name     AS  fuelPackageName,
                xfp.description,
+               xfp.fuel_number,
                xafpp.strikethrough_price,
-              xafpp.agent_price         AS price
+               xafpp.agent_price         AS  price,
+               xafpp.agent_price         AS  save_money
         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}