fix 订单提交

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/domain/AiModel.java

@@ -114,5 +114,5 @@ public class AiModel extends BaseEntity {
     /**
      * 备案信息
      */
-    private String filings;
+    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

@@ -16,9 +16,8 @@ import java.util.Date;
  * @author 杨兴卓
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("xy_base_user_order")
-public class BaseUserOrder extends BaseEntity {
+public class BaseUserOrder {
 
     private Long id;
 
@@ -36,8 +35,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/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/vo/AiModelVo.java

@@ -122,6 +122,6 @@ public class AiModelVo {
     /**
      * 模型备案信息
      */
-    private String filings;
+    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/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

@@ -8,4 +8,5 @@ import com.xyzc.start.domain.vo.BaseUserOrderVo;
  *
  */
 public interface BaseUserOrderMapper extends BaseMapperPlus<BaseUserOrder, BaseUserOrderVo> {
+
 }

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/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/impl/DiscoverServiceImpl.java

@@ -1,6 +1,7 @@
 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;
@@ -32,7 +33,7 @@ public class DiscoverServiceImpl implements IDiscoverService {
     private final MerchantMapper merchantMapper;
     private final AiModelMapper aiModelMapper;
 
-    private final DrawModelFeedbackMapper drawModelFeedbackMapper;
+    private final BaseUserFeedbackMapper baseUserFeedbackMapper;
 
     /**
      * 根据id返回分页绘画
@@ -114,10 +115,10 @@ public class DiscoverServiceImpl implements IDiscoverService {
      */
     @Override
     public void drawModelFeedback(DrawModelFeedbackBo bo) {
-        DrawModelFeedBack drawModelFeedBack = new DrawModelFeedBack();
-        drawModelFeedBack.setFeedbackContent(bo.getFeedbackContent());
+        BaseUserFeedback drawModelFeedBack = new BaseUserFeedback();
+        drawModelFeedBack.setContent(bo.getFeedbackContent());
         drawModelFeedBack.setBaseUserId(SecurityUser.getUserId());
 
-        drawModelFeedbackMapper.insert(drawModelFeedBack);
+        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

@@ -9,6 +9,7 @@ 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.*;
@@ -34,6 +35,7 @@ public class SchemeServiceImpl implements ISchemeService {
 
     private final FuelPackageMapper fuelPackageMapper;
     private final BaseUserOrderMapper baseUserOrderMapper;
+    private final BaseUserOrderDetailMapper baseUserOrderDetailMapper;
 
     /**
      * 获取当前方案
@@ -170,11 +172,13 @@ public class SchemeServiceImpl implements ISchemeService {
     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);
             // 没有生效的套餐抛出异常
@@ -194,17 +198,54 @@ public class SchemeServiceImpl implements ISchemeService {
             baseUserOrderVo.setPayAmount(fuelPackageOrderList.get(0).getPrice());
         }
 
-
+        // 设置订单信息
         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());
 
+        // 生成订单详情
+        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/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">