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

@@ -0,0 +1,8 @@
+package com.xyzc.start.constant;
+
+
+public interface BaseUserOrderStatus {
+    int UNPAID = 1; //未支付
+    int PAID = 2; //已支付
+    int CANCEL = 3; //已取消
+}

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

@@ -1,6 +1,7 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
+import com.xyzc.start.domain.bo.DrawModelFeedbackBo;
 import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.query.DiscoveryAppQuery;
 import com.xyzc.start.domain.vo.*;
@@ -8,6 +9,7 @@ import com.xyzc.start.service.IDiscoverService;
 import com.xyzc.start.service.IDrawAssistantService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.apache.http.HttpRequest;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -50,6 +52,26 @@ public class DiscoverPageController {
     }
 
     /**
+     * 查询代理商邮箱
+     */
+    @GetMapping("/merMail")
+    public Result<String> agentMail(HttpRequest request) {
+        String copyRight = discoverService.queryMail(request);
+
+        return Result.ok(copyRight);
+    }
+
+    /**
+     * 分页查询大模型备案信息
+     */
+    @GetMapping("/filings")
+    public Result<List<AiModelVo>> drawModelList(@Valid AppQuery appQuery) {
+        List<AiModelVo> aiModelVoList = discoverService.queryFilingsInfo(appQuery);
+
+        return Result.ok(aiModelVoList);
+    }
+
+    /**
      * 分页查询反向提示词
      */
     @GetMapping("/reversePrompt")
@@ -100,4 +122,14 @@ public class DiscoverPageController {
         return Result.ok();
     }
 
+    /**
+     * 绘画模型反馈
+     */
+    @PostMapping("/drawModelFeedback")
+    public Result<String> drawModelFeedback(@RequestBody DrawModelFeedbackBo bo) {
+        discoverService.drawModelFeedback(bo);
+
+        return Result.ok("反馈成功");
+    }
+
 }

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

@@ -1,7 +1,7 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.start.domain.HelpCommon;
+import com.xyzc.start.domain.HelpContent;
 import com.xyzc.start.domain.bo.HelpFeedbackBo;
 import com.xyzc.start.service.IHelpPageService;
 import lombok.RequiredArgsConstructor;
@@ -50,8 +50,8 @@ public class HelpPageController {
      * @return
      */
     @GetMapping("/queryMember")
-    public Result<List<HelpCommon>> queryHelpDocById(Long id) {
-        List<HelpCommon> helpCommonList = helpPageService.queryHelpDocById(id);
+    public Result<List<HelpContent>> queryHelpDocById(Long id) {
+        List<HelpContent> helpCommonList = helpPageService.queryHelpDocById(id);
 
         return Result.ok(helpCommonList);
     }

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

@@ -6,6 +6,7 @@ import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.ISchemeService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -22,6 +23,9 @@ public class SchemeController {
 
     private final ISchemeService schemeService;
 
+    @DubboReference(mock = "true")
+//    private final RemotePayService remotePayService;
+
     /**
      * 会员卡生效套餐信息
      */
@@ -52,6 +56,16 @@ public class SchemeController {
         return Result.ok(userOrder);
     }
 
+    /**
+     * 点击支付
+     */
+    @PostMapping("/orderPay")
+    public Result<String> orderPay(@RequestBody @Valid CreateOrderBo bo){
+
+        return Result.ok();
+    }
+
+
 
     /**
      * 燃料包生效套餐信息

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

@@ -108,6 +108,7 @@ public class UserAuthController {
     @PostMapping("logout")
     public Result<String> logout() {
 //        userAuthService.logout();
+
         return Result.ok("退出成功");
     }
 
@@ -117,7 +118,7 @@ public class UserAuthController {
      */
     @GetMapping("agreement")
     public Result<XyConfigVo> legal() {
-        XyConfigVo lawVo = xyConfigService.getPrivacyPolicy();
+        XyConfigVo lawVo = xyConfigService.getUserAgreement();
 
         return Result.ok(lawVo);
     }
@@ -127,7 +128,7 @@ public class UserAuthController {
      */
     @GetMapping("privacy")
     public Result<XyConfigVo> privacy() {
-        XyConfigVo lawVo = xyConfigService.getUserAgreement();
+        XyConfigVo lawVo = xyConfigService.getPrivacyPolicy();
 
         return Result.ok(lawVo);
     }

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

@@ -111,5 +111,8 @@ public class AiModel extends BaseEntity {
     @TableLogic
     private String delFlag;
 
-
+    /**
+     * 备案信息
+     */
+    private String filingsInfo;
 }

xyzc-start/src/main/java/com/xyzc/start/domain/HelpFeedback.java → xyzc-start/src/main/java/com/xyzc/start/domain/BaseUserFeedback.java

@@ -8,9 +8,9 @@ import lombok.Data;
 /**
  * 用户反馈的内容
  */
-@TableName("xy_help_feedback")
+@TableName("xy_base_user_feedback")
 @Data
-public class HelpFeedback {
+public class BaseUserFeedback {
 
     @TableId(value = "id", type= IdType.ASSIGN_ID)
     private Long id;

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.xyzc.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -16,15 +17,15 @@ import java.util.Date;
  */
 @Data
 @TableName("xy_base_user_order")
-public class BaseUserOrder extends BaseEntity {
+public class BaseUserOrder {
 
     private Long id;
 
     private Long baseUserId;
 
-    private Integer status;
+    private Date createTime;
 
-    private Integer orderType;
+    private Integer status;
 
     private Long agentMerId;
 
@@ -36,8 +37,6 @@ public class BaseUserOrder extends BaseEntity {
 
     private BigDecimal discountAmount;
 
-    @TableLogic
-    private String delFlag;
 
     @Version
     private Integer version;

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

@@ -0,0 +1,30 @@
+package com.xyzc.start.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 基础用户订单详细
+ *
+ * @author 杨兴卓
+ */
+@Data
+@TableName("xy_base_user_order_detail")
+public class BaseUserOrderDetail {
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+    private Long baseUserOrderId;
+
+    private Long baseUserId;
+
+    private Long agentId;
+
+    private Long goodsId;
+
+    private Integer goodsType;
+
+    private Integer goodsCount;
+}

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

@@ -1,5 +1,6 @@
 package com.xyzc.start.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -15,6 +16,7 @@ public class BaseUserPhotoFolder extends BaseUser{
     /**
      * id
      */
+    @TableId
     private Long id;
 
     /**

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

@@ -0,0 +1,23 @@
+package com.xyzc.start.domain;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("xy_draw_model_feedback")
+public class DrawModelFeedBack  {
+
+    private Long id;
+
+    private String feedbackContent;
+
+    private Long baseUserId;
+
+    @TableLogic
+    private String delFlag;
+
+    private Date createTime;
+}

xyzc-start/src/main/java/com/xyzc/start/domain/HelpCommon.java → xyzc-start/src/main/java/com/xyzc/start/domain/HelpContent.java

@@ -10,8 +10,8 @@ import lombok.Data;
  */
 
 @Data
-@TableName("xy_help_common")
-public class HelpCommon {
+@TableName("xy_help_content")
+public class HelpContent {
 
     @TableId(value = "id", type= IdType.ASSIGN_ID)
     private Integer id;

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

@@ -0,0 +1,19 @@
+package com.xyzc.start.domain.bo;
+
+import lombok.Data;
+
+/**
+ * 绘画模型反馈
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class DrawModelFeedbackBo {
+
+    /**
+     * 反馈内容
+     */
+    private String feedbackContent;
+
+
+}

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

@@ -1,17 +1,22 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.xyzc.start.domain.AiModel;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @description: TODO
- * @author: 墨凡
- * @date: 2024/7/21 20:14
- * @version: 1.0
+ * ai模型视图
+ * <p>
+ * author: 杨兴卓
+ * date 2024/7/21 20:14
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@AutoMapper(target = AiModel.class)
 public class AiModelVo {
 
     /**
@@ -113,4 +118,10 @@ public class AiModelVo {
      * 创建时间
      */
     private Date createTime;
+
+    /**
+     * 模型备案信息
+     */
+    private String filingsInfo;
+
 }

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

@@ -0,0 +1,10 @@
+package com.xyzc.start.domain.vo;
+
+/**
+ * 基础用户订单详情
+ *
+ * @author 杨兴卓
+ */
+public class BaseUserOrderDetailVo {
+
+}

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

@@ -52,10 +52,6 @@ public class BaseUserOrderVo implements Serializable {
      */
     private Integer status;
 
-    /**
-     * 订单类型，0-会员卡充值，1-燃料包充值，2-卡密支付订单
-     */
-    private Integer orderType;
 
     /**
      * 代理商id

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

@@ -0,0 +1,26 @@
+package com.xyzc.start.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.xyzc.start.domain.DrawModelFeedBack;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+@Data
+@AutoMapper(target = DrawModelFeedBack.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class DrawModelFeedBackVo {
+
+    /**
+     * 绘画模型反馈主键
+     */
+    private Long id;
+
+    /**
+     * 反馈的内容
+     */
+    private String feedbackContent;
+
+    private Long baseUserId;
+
+}

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

@@ -26,7 +26,6 @@ public class XyConfigVo implements Serializable {
     /**
      * 小易平台配置id
      */
-
     private Integer id;
 
     /**

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

@@ -4,9 +4,11 @@ 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.query.AppQuery;
 import com.xyzc.start.domain.vo.AiModelLawVo;
 import com.xyzc.start.domain.vo.AiModelVo;
 import com.xyzc.start.domain.vo.FuelPackageVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,9 +21,18 @@ public interface AiModelMapper extends BaseMapperPlus<AiModel, AiModelVo> {
 
     /**
      * 根据燃料id分页查询燃料包规则列表
+     *
      * @param modelId 模型id
      * @return
      */
     List<AiModelLawVo> queryModelLawList(Long modelId);
 
+    /**
+     * 分页查询ai模型的备案信息
+     *
+     * @param appQuery
+     * @return
+     */
+    List<AiModelVo> queryFilingsInfo(@Param("appQuery") AppQuery appQuery);
+
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/HelpFeedbackMapper.java → xyzc-start/src/main/java/com/xyzc/start/mapper/BaseUserFeedbackMapper.java

@@ -1,9 +1,10 @@
 package com.xyzc.start.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xyzc.start.domain.HelpFeedback;
+import com.xyzc.start.domain.BaseUserFeedback;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface HelpFeedbackMapper extends BaseMapper<HelpFeedback> {
+public interface BaseUserFeedbackMapper extends BaseMapper<BaseUserFeedback> {
+
 }

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

@@ -0,0 +1,13 @@
+package com.xyzc.start.mapper;
+
+import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
+import com.xyzc.start.domain.BaseUserOrderDetail;
+import com.xyzc.start.domain.vo.BaseUserOrderDetailVo;
+
+/**
+ * 订单详细mapper
+ *
+ * @author 杨兴卓
+ */
+public interface BaseUserOrderDetailMapper extends BaseMapperPlus<BaseUserOrderDetail, BaseUserOrderDetailVo> {
+}

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

@@ -0,0 +1,12 @@
+package com.xyzc.start.mapper;
+
+import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
+import com.xyzc.start.domain.BaseUserOrder;
+import com.xyzc.start.domain.vo.BaseUserOrderVo;
+
+/**
+ *
+ */
+public interface BaseUserOrderMapper extends BaseMapperPlus<BaseUserOrder, BaseUserOrderVo> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.xyzc.start.mapper;
+
+
+import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
+import com.xyzc.start.domain.DrawModelFeedBack;
+import com.xyzc.start.domain.vo.DrawModelFeedBackVo;
+
+public interface DrawModelFeedbackMapper extends BaseMapperPlus<DrawModelFeedBack, DrawModelFeedBackVo> {
+
+
+}

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

@@ -2,7 +2,7 @@ package com.xyzc.start.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xyzc.start.domain.HelpCommon;
+import com.xyzc.start.domain.HelpContent;
 
 import java.util.List;
 
@@ -12,11 +12,11 @@ import java.util.List;
  * @date: 2024/7/21 14:06
  * @version: 1.0
  */
-public interface HelpCommonMapper extends BaseMapper<HelpCommon> {
+public interface HelpCommonMapper extends BaseMapper<HelpContent> {
 
-    default List<HelpCommon> queryHelpDocListById(Long id){
-        return this.selectList(new LambdaQueryWrapper<HelpCommon>()
-                .gt(HelpCommon::getId, id)
+    default List<HelpContent> queryHelpDocListById(Long id){
+        return this.selectList(new LambdaQueryWrapper<HelpContent>()
+                .gt(HelpContent::getId, id)
                 .last("limit 6"));
     }
 }

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

@@ -2,8 +2,11 @@ package com.xyzc.start.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.Merchant;
 import com.xyzc.start.domain.vo.MerchantCancatVo;
+import com.xyzc.start.domain.vo.MerchantVo;
+import org.apache.http.HttpRequest;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -15,7 +18,7 @@ import java.util.List;
  * @date 2024-07-02
  */
 @Repository
-public interface MerchantMapper extends BaseMapper<Merchant> {
+public interface MerchantMapper extends BaseMapperPlus<Merchant, MerchantVo> {
 
     /**
      * 查询代理商集合
@@ -27,4 +30,14 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
     }
 
     MerchantCancatVo queryMerchantCancatById(Long userId);
+
+    /**
+     * 查询代理商的邮箱
+     *
+     * @param agentId
+     * @return
+     */
+    default MerchantVo queryMail(Long agentId){
+        return this.selectVoById(agentId);
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.xyzc.start.service;
 
+import com.xyzc.start.domain.bo.DrawModelFeedbackBo;
 import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.query.DiscoveryAppQuery;
 import com.xyzc.start.domain.vo.*;
+import org.apache.http.HttpRequest;
 
 import java.util.List;
 
@@ -46,4 +48,25 @@ public interface IDiscoverService {
      * @return
      */
     List<DrawReversePromptVo> queryReversePromptList(Long reversePromptId, String keyword, Integer length);
+
+    /**
+     * 查询代理商邮箱
+     *
+     * @param request
+     * @return
+     */
+    String queryMail(HttpRequest request);
+
+
+    /**
+     * 分页查询大模型备案信息
+     */
+    List<AiModelVo> queryFilingsInfo(AppQuery appQuery);
+
+    /**
+     * 反馈内容
+     *
+     * @param bo
+     */
+    void drawModelFeedback(DrawModelFeedbackBo bo);
 }

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

@@ -1,6 +1,6 @@
 package com.xyzc.start.service;
 
-import com.xyzc.start.domain.HelpCommon;
+import com.xyzc.start.domain.HelpContent;
 import com.xyzc.start.domain.bo.HelpFeedbackBo;
 
 import java.util.List;
@@ -30,5 +30,5 @@ public interface IHelpPageService {
      * @param id
      * @return
      */
-    List<HelpCommon> queryHelpDocById(Long id);
+    List<HelpContent> queryHelpDocById(Long id);
 }

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

@@ -24,13 +24,6 @@ public interface ISchemeService {
      */
     SchemeVo getCurrentFuel();
 
-    /**
-     * 获取具体的燃料信息
-     *
-     * @param fuelId
-     * @return
-     */
-    List<FuelPackageVo> queryCurrentFuelById(Long fuelId);
 
     /**
      * 获取具体的会员卡信息

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

@@ -1,15 +1,16 @@
 package com.xyzc.start.service.impl;
 
 import com.xyzc.common.web.security.user.SecurityUser;
+import com.xyzc.start.domain.BaseUserFeedback;
+import com.xyzc.start.domain.DrawModelFeedBack;
+import com.xyzc.start.domain.bo.DrawModelFeedbackBo;
 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;
-import com.xyzc.start.mapper.DrawGraphicsMapper;
-import com.xyzc.start.mapper.DrawModelMapper;
+import com.xyzc.start.mapper.*;
 import com.xyzc.start.service.IDiscoverService;
 import lombok.RequiredArgsConstructor;
+import org.apache.http.HttpRequest;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -29,6 +30,10 @@ public class DiscoverServiceImpl implements IDiscoverService {
 
     private final AppMapper appMapper;
     private final DrawAssistantMapper drawAssistantMapper;
+    private final MerchantMapper merchantMapper;
+    private final AiModelMapper aiModelMapper;
+
+    private final BaseUserFeedbackMapper baseUserFeedbackMapper;
 
     /**
      * 根据id返回分页绘画
@@ -77,4 +82,43 @@ public class DiscoverServiceImpl implements IDiscoverService {
 
         return drawAssistantMapper.queryDrawReservePrompt(reversePromptId, keyword, length == null ? 10 : length);
     }
+
+    /**
+     * 查询商家邮箱信息
+     *
+     * @param request
+     * @return
+     */
+    @Override
+    public String queryMail(HttpRequest request) {
+        MerchantVo merchantVo = merchantMapper.queryMail(1810310843224322049L);
+
+        return merchantVo.getContactsEmail();
+    }
+
+    /**
+     * 分页查询大模型备案信息
+     *
+     * @param appQuery
+     * @return
+     */
+    @Override
+    public List<AiModelVo> queryFilingsInfo(AppQuery appQuery) {
+
+        return aiModelMapper.queryFilingsInfo(appQuery);
+    }
+
+    /**
+     * 反馈内容
+     *
+     * @param bo
+     */
+    @Override
+    public void drawModelFeedback(DrawModelFeedbackBo bo) {
+        BaseUserFeedback drawModelFeedBack = new BaseUserFeedback();
+        drawModelFeedBack.setContent(bo.getFeedbackContent());
+        drawModelFeedBack.setBaseUserId(SecurityUser.getUserId());
+
+        baseUserFeedbackMapper.insert(drawModelFeedBack);
+    }
 }

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

@@ -3,11 +3,11 @@ package com.xyzc.start.service.impl;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.xyzc.common.core.exception.ServerException;
 import com.xyzc.start.constant.FeedbackConst;
-import com.xyzc.start.domain.HelpCommon;
-import com.xyzc.start.domain.HelpFeedback;
+import com.xyzc.start.domain.HelpContent;
+import com.xyzc.start.domain.BaseUserFeedback;
 import com.xyzc.start.domain.bo.HelpFeedbackBo;
 import com.xyzc.start.mapper.HelpCommonMapper;
-import com.xyzc.start.mapper.HelpFeedbackMapper;
+import com.xyzc.start.mapper.BaseUserFeedbackMapper;
 import com.xyzc.start.service.IHelpPageService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -18,7 +18,7 @@ import java.util.List;
 @RequiredArgsConstructor
 public class HelpPageServiceImpl implements IHelpPageService {
 
-    private final HelpFeedbackMapper helpFeedbackmapper;
+    private final BaseUserFeedbackMapper helpFeedbackmapper;
     private final HelpCommonMapper helpCommonMapper;
 
     /**
@@ -28,7 +28,7 @@ public class HelpPageServiceImpl implements IHelpPageService {
      */
     @Override
     public void submit(HelpFeedbackBo helpFeedbackBo) {
-        HelpFeedback helpFeedback = new HelpFeedback();
+        BaseUserFeedback helpFeedback = new BaseUserFeedback();
         //todo ：记得使用 sysUser获取当前用户信息
         helpFeedback.setContent(helpFeedbackBo.getContent());
         boolean flag = helpFeedbackmapper.insert(helpFeedback) == 1;
@@ -46,18 +46,18 @@ public class HelpPageServiceImpl implements IHelpPageService {
      */
     @Override
     public void setHelper(Long id, Integer status) {
-        HelpCommon helpCommon = helpCommonMapper.selectById(id);
+        HelpContent helpCommon = helpCommonMapper.selectById(id);
         if (helpCommon == null) {
             throw new ServerException("反馈失败，请联系商家");
         }
         if (FeedbackConst.HELPER.equals(status)) {
-            helpCommonMapper.update(new LambdaUpdateWrapper<HelpCommon>()
-                    .set(HelpCommon::getHelpful, helpCommon.getHelpful() + 1)
-                    .eq(HelpCommon::getId, id));
+            helpCommonMapper.update(new LambdaUpdateWrapper<HelpContent>()
+                    .set(HelpContent::getHelpful, helpCommon.getHelpful() + 1)
+                    .eq(HelpContent::getId, id));
         } else {
-            helpCommonMapper.update(new LambdaUpdateWrapper<HelpCommon>()
-                    .set(HelpCommon::getNoHelp, helpCommon.getNoHelp() + 1)
-                    .eq(HelpCommon::getId, id));
+            helpCommonMapper.update(new LambdaUpdateWrapper<HelpContent>()
+                    .set(HelpContent::getNoHelp, helpCommon.getNoHelp() + 1)
+                    .eq(HelpContent::getId, id));
         }
     }
 
@@ -68,9 +68,9 @@ public class HelpPageServiceImpl implements IHelpPageService {
      * @return
      */
     @Override
-    public List<HelpCommon> queryHelpDocById(Long id) {
+    public List<HelpContent> queryHelpDocById(Long id) {
         //每次都只拿6个
-        List<HelpCommon> helpDocs = helpCommonMapper.queryHelpDocListById(id != null ? id : 0);
+        List<HelpContent> helpDocs = helpCommonMapper.queryHelpDocListById(id != null ? id : 0);
 
         return helpDocs;
     }

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

@@ -1,9 +1,15 @@
 package com.xyzc.start.service.impl;
 
 import com.xyzc.common.core.exception.ErrorCode;
+import com.xyzc.common.core.exception.ServerException;
 import com.xyzc.common.core.utils.AssertUtils;
+import com.xyzc.common.core.utils.MapstructUtils;
+import com.xyzc.common.core.utils.SpringUtils;
 import com.xyzc.common.web.security.user.SecurityUser;
+import com.xyzc.start.constant.BaseUserOrderStatus;
 import com.xyzc.start.constant.SchemeConst;
+import com.xyzc.start.domain.BaseUserOrder;
+import com.xyzc.start.domain.BaseUserOrderDetail;
 import com.xyzc.start.domain.Scheme;
 import com.xyzc.start.domain.bo.CreateOrderBo;
 import com.xyzc.start.domain.vo.*;
@@ -13,6 +19,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -27,6 +34,8 @@ public class SchemeServiceImpl implements ISchemeService {
     private final AiModelMapper aiModelMapper;
 
     private final FuelPackageMapper fuelPackageMapper;
+    private final BaseUserOrderMapper baseUserOrderMapper;
+    private final BaseUserOrderDetailMapper baseUserOrderDetailMapper;
 
     /**
      * 获取当前方案
@@ -95,17 +104,6 @@ public class SchemeServiceImpl implements ISchemeService {
         return objects;
     }
 
-    /**
-     * 根据id获取燃料信息
-     *
-     * @param fuelId
-     * @return
-     */
-    @Override
-    public List<FuelPackageVo> queryCurrentFuelById(Long fuelId) {
-
-        return schemeMapper.queryFuelPackageById(fuelId);
-    }
 
     /**
      * 分页查询燃料规则详情
@@ -161,30 +159,85 @@ public class SchemeServiceImpl implements ISchemeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BaseUserOrderVo createOrder(CreateOrderBo bo) {
+        // 生成订单
+        BaseUserOrderVo baseUserOrderVo = new BaseUserOrderVo();
+        baseUserOrderVo.setBaseUserId(SecurityUser.getUserId());
+
         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);
 
+            baseUserOrderVo.setGoodsAmount(memberCardOrderList.get(0).getPrice());
+            baseUserOrderVo.setPayAmount(memberCardOrderList.get(0).getPrice());
+
         } 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);
+
+            baseUserOrderVo.setGoodsAmount(fuelPackageOrderList.get(0).getPrice());
+            baseUserOrderVo.setPayAmount(fuelPackageOrderList.get(0).getPrice());
         }
 
-        // TODO 生成一个假数据
-        BaseUserOrderVo baseUserOrderVo = new BaseUserOrderVo();
+        // 设置订单信息
         baseUserOrderVo.setMemberCardList(memberCardOrderList);
         baseUserOrderVo.setFuelPackageList(fuelPackageOrderList);
+        baseUserOrderVo.setStatus(BaseUserOrderStatus.UNPAID);
+        baseUserOrderVo.setDiscountAmount(new BigDecimal(0));
+
+        // 插入订单，返回订单id
+        BaseUserOrder convert = MapstructUtils.convert(baseUserOrderVo, BaseUserOrder.class);
+        AssertUtils.notNull(convert, ErrorCode.ORDER_NO_EXIST);
+        convert.setBaseUserId(SecurityUser.getUserId());
+        // todo 后期写活
+        convert.setAgentMerId(1810310843224322049L);
+        convert.setBaseUserId(SecurityUser.getUserId());
+        baseUserOrderMapper.insert(convert);
+        baseUserOrderVo.setId(convert.getId());
+        baseUserOrderVo.setCreateTime(convert.getCreateTime());
+
+        // 生成订单详情
+        BaseUserOrderDetail baseUserOrderDetail = new BaseUserOrderDetail();
+        baseUserOrderDetail.setAgentId(1810310843224322049L);
+        baseUserOrderDetail.setGoodsType(bo.getType());
+        baseUserOrderDetail.setGoodsId(bo.getId());
+        baseUserOrderDetail.setBaseUserOrderId(convert.getId());
+        // TODO: 这里因为是单个商品购买，所以只需要输入1即可，后续别的地方需要活用
+        baseUserOrderDetail.setGoodsCount(1);
+        baseUserOrderDetail.setBaseUserId(SecurityUser.getUserId());
+
+        // 插入会员卡信息或者插入燃料包信息
+        if (SchemeConst.MEMEBER_TYPE.equals(bo.getType())) {
+            baseUserOrderDetailMapper.insert(baseUserOrderDetail);
+        } else if (SchemeConst.FUEL_TYPE.equals(bo.getType())) {
+            baseUserOrderDetailMapper.insert(baseUserOrderDetail);
+        }
 
         return baseUserOrderVo;
     }
+
+
+
+
+    /**
+     * 消费mq消息，拿到订单支付状态，修改订单状态
+     */
+//    @Override
+//    public void updateOrderStatus(BaseUserOrder baseUserOrder) {
+//        if (BaseUserOrderStatus.PAID.equals(baseUserOrder.getStatus())) {
+//            baseUserOrderMapper.updateOrderStatus(baseUserOrder);
+//        } else {
+//            throw new ServerException("订单状态异常");
+//        }
+//    }
+
+
 }

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

@@ -21,5 +21,18 @@
     </select>
 
 
+    <select id="queryFilingsInfo" resultType="com.xyzc.start.domain.vo.AiModelVo">
+        select id,
+               ai_model_name,
+               filings
+        from xy_ai_model
+        where del_flag = 0
+        <if test="appQuery.appId != null">
+            AND id > #{appQuery.appId}
+        </if>
+        LIMIT #{appQuery.length}
+
+    </select>
+
 
 </mapper>

xyzc-start/src/main/resources/mapper/WebStart/HelpFeedbackMapper.xml → xyzc-start/src/main/resources/mapper/WebStart/BaseUserFeedbackMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xyzc.start.mapper.HelpFeedbackMapper">
+<mapper namespace="com.xyzc.start.mapper.BaseUserFeedbackMapper">
 
 
 

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

@@ -0,0 +1,13 @@
+<?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.FuelPackageMapper">
+
+
+    <select id="queryOrderByFuelPackageId" resultType="com.xyzc.start.domain.vo.FuelPackageOrderVo">
+
+    </select>
+
+
+</mapper>