fix 订单提交

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/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;
@@ -15,6 +16,7 @@ import java.util.Date;
  * @author 杨兴卓
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("xy_base_user_order")
 public class BaseUserOrder extends BaseEntity {
 
@@ -24,8 +26,6 @@ public class BaseUserOrder extends BaseEntity {
 
     private Integer status;
 
-    private Integer orderType;
-
     private Long agentMerId;
 
     private Integer payMethod;

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

@@ -2,14 +2,13 @@ package com.xyzc.start.domain;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.xyzc.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("xy_draw_model_feedback")
-public class DrawModelFeedBack extends BaseEntity {
+public class DrawModelFeedBack  {
 
     private Long id;
 
@@ -19,4 +18,6 @@ public class DrawModelFeedBack extends BaseEntity {
 
     @TableLogic
     private String delFlag;
+
+    private Date createTime;
 }

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

@@ -1,6 +1,5 @@
 package com.xyzc.start.domain.bo;
 
-import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 /**

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/mapper/BaseUserOrderMapper.java

@@ -0,0 +1,11 @@
+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/service/impl/SchemeServiceImpl.java

@@ -1,9 +1,14 @@
 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.Scheme;
 import com.xyzc.start.domain.bo.CreateOrderBo;
 import com.xyzc.start.domain.vo.*;
@@ -13,6 +18,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 +33,7 @@ public class SchemeServiceImpl implements ISchemeService {
     private final AiModelMapper aiModelMapper;
 
     private final FuelPackageMapper fuelPackageMapper;
+    private final BaseUserOrderMapper baseUserOrderMapper;
 
     /**
      * 获取当前方案
@@ -161,6 +168,9 @@ public class SchemeServiceImpl implements ISchemeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BaseUserOrderVo createOrder(CreateOrderBo bo) {
+        // 生成订单
+        BaseUserOrderVo baseUserOrderVo = new BaseUserOrderVo();
+
         List<MemberCardOrderVo> memberCardOrderList = null;
         // 或者燃料包
         List<FuelPackageOrderVo> fuelPackageOrderList = null;
@@ -169,22 +179,32 @@ public class SchemeServiceImpl implements ISchemeService {
             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));
+
+        BaseUserOrder convert = MapstructUtils.convert(baseUserOrderVo, BaseUserOrder.class);
+        baseUserOrderMapper.insert(convert);
+        baseUserOrderVo.setId(convert.getId());
+
         return baseUserOrderVo;
     }
 }