临时锁定

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserTempAddBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 学员下单临时锁定记录添加对象 class_grade_user_temp
+ *
+ * @author hjl
+ * @date 2021-12-23
+ */
+@Data
+@ApiModel("学员下单临时锁定记录添加对象")
+public class ClassGradeUserTempAddBo {
+
+    /** 学员ID */
+    @ApiModelProperty("学员ID")
+    private Long userId;
+    /** 班级id */
+    @ApiModelProperty("班级id")
+    private Long gradeId;
+    /** 1 锁定中 0关闭 */
+    @ApiModelProperty("1 锁定中 0关闭")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 来源 1订单购买 */
+    @ApiModelProperty("来源 1订单购买")
+    private Integer fromType;
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserTempEditBo.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 学员下单临时锁定记录编辑对象 class_grade_user_temp
+ *
+ * @author hjl
+ * @date 2021-12-23
+ */
+@Data
+@ApiModel("学员下单临时锁定记录编辑对象")
+public class ClassGradeUserTempEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 学员ID */
+    @ApiModelProperty("学员ID")
+    private Long userId;
+
+    /** 班级id */
+    @ApiModelProperty("班级id")
+    private Long gradeId;
+
+    /** 1 锁定中 0关闭 */
+    @ApiModelProperty("1 锁定中 0关闭")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 来源 1订单购买 */
+    @ApiModelProperty("来源 1订单购买")
+    private Integer fromType;
+
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserTempQueryBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 学员下单临时锁定记录分页查询对象 class_grade_user_temp
+ *
+ * @author hjl
+ * @date 2021-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("学员下单临时锁定记录分页查询对象")
+public class ClassGradeUserTempQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 学员ID */
+	@ApiModelProperty("学员ID")
+	private Long userId;
+	/** 班级id */
+	@ApiModelProperty("班级id")
+	private Long gradeId;
+	/** 1 锁定中 0关闭 */
+	@ApiModelProperty("1 锁定中 0关闭")
+	private Integer status;
+	/** 来源 1订单购买 */
+	@ApiModelProperty("来源 1订单购买")
+	private Integer fromType;
+	/** 商品id */
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeUserTemp.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.grade.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 学员下单临时锁定记录对象 class_grade_user_temp
+ *
+ * @author hjl
+ * @date 2021-12-23
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("class_grade_user_temp")
+public class ClassGradeUserTemp implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 学员ID */
+    private Long userId;
+    /** 班级id */
+    private Long gradeId;
+    /** 1 锁定中 0关闭 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 来源 1订单购买 */
+    private Integer fromType;
+    /** 商品id */
+    private Long goodsId;
+    /** 订单编号 */
+    private String orderSn;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserTempMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.grade.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.grade.domain.ClassGradeUserTemp;
+
+/**
+ * 学员下单临时锁定记录Mapper接口
+ *
+ * @author hjl
+ * @date 2021-12-23
+ */
+public interface ClassGradeUserTempMapper extends BaseMapper<ClassGradeUserTemp> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeUserTempService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.grade.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserTempAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserTempEditBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserTempQueryBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeUserTemp;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserTempVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学员下单临时锁定记录Service接口
+ *
+ * @author hjl
+ * @date 2021-12-23
+ */
+public interface IClassGradeUserTempService extends IService<ClassGradeUserTemp> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ClassGradeUserTempVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ClassGradeUserTempVo> queryList(ClassGradeUserTempQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入学员下单临时锁定记录
+	 * @param bo 学员下单临时锁定记录新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ClassGradeUserTempAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改学员下单临时锁定记录
+	 * @param bo 学员下单临时锁定记录编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ClassGradeUserTempEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserTempServiceImpl.java

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.grade.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserTempAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserTempEditBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserTempQueryBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeUserTemp;
+import com.zhongzheng.modules.grade.mapper.ClassGradeUserTempMapper;
+import com.zhongzheng.modules.grade.service.IClassGradeUserTempService;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserTempVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 学员下单临时锁定记录Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-12-23
+ */
+@Service
+public class ClassGradeUserTempServiceImpl extends ServiceImpl<ClassGradeUserTempMapper, ClassGradeUserTemp> implements IClassGradeUserTempService {
+
+    @Override
+    public ClassGradeUserTempVo queryById(Long id){
+        ClassGradeUserTemp db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ClassGradeUserTempVo.class);
+    }
+
+    @Override
+    public List<ClassGradeUserTempVo> queryList(ClassGradeUserTempQueryBo bo) {
+        LambdaQueryWrapper<ClassGradeUserTemp> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, ClassGradeUserTemp::getUserId, bo.getUserId());
+        lqw.eq(bo.getGradeId() != null, ClassGradeUserTemp::getGradeId, bo.getGradeId());
+        lqw.eq(bo.getStatus() != null, ClassGradeUserTemp::getStatus, bo.getStatus());
+        lqw.eq(bo.getFromType() != null, ClassGradeUserTemp::getFromType, bo.getFromType());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), ClassGradeUserTemp::getOrderSn, bo.getOrderSn());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ClassGradeUserTempVo> entity2Vo(Collection<ClassGradeUserTemp> collection) {
+        List<ClassGradeUserTempVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ClassGradeUserTempVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ClassGradeUserTemp> page = (Page<ClassGradeUserTemp>)collection;
+            Page<ClassGradeUserTempVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ClassGradeUserTempAddBo bo) {
+        ClassGradeUserTemp add = BeanUtil.toBean(bo, ClassGradeUserTemp.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ClassGradeUserTempEditBo bo) {
+        ClassGradeUserTemp update = BeanUtil.toBean(bo, ClassGradeUserTemp.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ClassGradeUserTemp entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserTempVo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 学员下单临时锁定记录视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-12-23
+ */
+@Data
+@ApiModel("学员下单临时锁定记录视图对象")
+public class ClassGradeUserTempVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 学员ID */
+	@Excel(name = "学员ID")
+	@ApiModelProperty("学员ID")
+	private Long userId;
+	/** 班级id */
+	@Excel(name = "班级id")
+	@ApiModelProperty("班级id")
+	private Long gradeId;
+	/** 1 锁定中 0关闭 */
+	@Excel(name = "1 锁定中 0关闭")
+	@ApiModelProperty("1 锁定中 0关闭")
+	private Integer status;
+	/** 来源 1订单购买 */
+	@Excel(name = "来源 1订单购买")
+	@ApiModelProperty("来源 1订单购买")
+	private Integer fromType;
+	/** 商品id */
+	@Excel(name = "商品id")
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsQueryBo.java

@@ -87,4 +87,7 @@ public class OrderGoodsQueryBo extends BaseEntity {
 	@ApiModelProperty("所在公司")
 	private String company;
 
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsMapper.java

@@ -24,5 +24,5 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     List<OrderGoodsVo> selectOrderGoods(OrderGoodsQueryBo orderGoodsQueryBo);
 
     List<OrderGoodsVo> selectOrderTwoGoods(OrderGoodsQueryBo orderGoodsQueryBo);
-
+    Long getBuyGoodsHistory(OrderGoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsService.java

@@ -40,6 +40,8 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 	 */
 	Boolean insertByAddBo(OrderGoodsAddBo bo);
 
+	Long getBuyGoodsHistory(OrderGoodsQueryBo bo);
+
 	/**
 	 * 根据编辑业务对象修改订单商品
 	 * @param bo 订单商品编辑业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -26,6 +26,7 @@ import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -124,6 +125,11 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return this.save(add);
     }
 
+    @Override
+    public Long getBuyGoodsHistory(OrderGoodsQueryBo bo) {
+        return this.baseMapper.getBuyGoodsHistory(bo);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(OrderGoodsEditBo bo) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -16,13 +16,11 @@ import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
-import com.zhongzheng.modules.grade.domain.ClassGrade;
-import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
-import com.zhongzheng.modules.grade.domain.ClassGradeSys;
-import com.zhongzheng.modules.grade.domain.ClassGradeUser;
+import com.zhongzheng.modules.grade.domain.*;
 import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
+import com.zhongzheng.modules.grade.service.IClassGradeUserTempService;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.inform.bo.InformUserAddBo;
 import com.zhongzheng.modules.inform.service.IInformRemindService;
@@ -74,6 +72,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IClassGradeService iClassGradeService;
     @Autowired
+    private IClassGradeUserTempService iClassGradeUserTempService;
+    @Autowired
     private IClassGradeUserService iClassGradeUserService;
     @Autowired
     private IClassGradeGoodsService iClassGradeGoodsService;
@@ -236,13 +236,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             totalPrice = totalPrice.add(g.getGoodsPrice());
             //暂不计算优惠券
             payPrice = payPrice.add(g.getGoodsPrice());
+
+            this.checkBuyGoods(g.getGoodsId(),bo.getUserId());
             //视频商品安排班级
             if(goods.getGoodsType()==1&&orderGoodsRs){
                 Long gradeId = null;
                 if(g.getGoodsInputData()!=null){
                     gradeId = g.getGoodsInputData().getGradeId();
                 }
-                arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId());
+                if(g.getGoodsInputData().getType().equals("class")){
+                    arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
+                }
             }
         }
 
@@ -309,13 +313,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             totalPrice = totalPrice.add(goods.getStandPrice());
             //暂不计算优惠券
             payPrice = payPrice.add(goods.getStandPrice());
+
+            this.checkBuyGoods(g.getGoodsId(),bo.getUserId());
+
             //视频商品安排班级
             if(goods.getGoodsType()==1&&orderGoodsRs){
                 Long gradeId = null;
                 if(g.getGoodsInputData()!=null){
                     gradeId = g.getGoodsInputData().getGradeId();
                 }
-                arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId());
+                if(g.getGoodsInputData().getType().equals("class")){
+                    arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
+                }
             }
             iShoppingCartService.deleteByGoodsId(g.getGoodsId(),bo.getUserId());
         }
@@ -409,6 +418,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return orderListVos;
     }
 
+    //检查是否购买过商品
+    public boolean checkBuyGoods(Long goodsId,Long userId){
+        OrderGoodsQueryBo bo = new OrderGoodsQueryBo();
+        bo.setUserId(userId);
+        bo.setGoodsId(goodsId);
+        Long num = iOrderGoodsService.getBuyGoodsHistory(bo);
+        if(num.longValue()>0){
+            throw new CustomException("无法重复购买此商品");
+        }
+        return false;
+    }
 
     /**
      * 加入班级
@@ -416,7 +436,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      * @param gradeId
      * @return
      */
-    public boolean arrangeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId){
+    public boolean arrangeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId,String orderSn){
         //查询该学员有没有有效期内同商品班级 有就不允许添加
         Integer classNum = baseMapper.selectUserClass(goodsId,userId);
         if (classNum > 0){
@@ -475,13 +495,41 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         classGradeGoods.setCreateTime(DateUtils.getNowTime());
         classGradeGoods.setUpdateTime(DateUtils.getNowTime());
         iClassGradeGoodsService.save(classGradeGoods);
-        //加入班级
-        joinGrade(orderGoodsId,classGrade.getGradeId(),userId);
+        //锁定班级
+        lockGrade(orderGoodsId,classGrade.getGradeId(),userId,goodsId,orderSn);
         return true;
     }
 
+    /**
+     * 锁定班级
+     * @param orderGoodsId
+     * @param gradeId
+     * @param userId
+     * @param goodsId
+     * @param orderSn
+     * @return
+     */
+    public boolean lockGrade(Long orderGoodsId,Long gradeId,Long userId,Long goodsId,String orderSn){
+        //锁定班级
+        ClassGradeUserTemp classGradeUserTemp = new ClassGradeUserTemp();
+        classGradeUserTemp.setUserId(userId);
+        classGradeUserTemp.setGradeId(gradeId);
+        classGradeUserTemp.setStatus(1);
+        classGradeUserTemp.setFromType(1);
+        classGradeUserTemp.setGoodsId(goodsId);
+        classGradeUserTemp.setOrderSn(orderSn);
+        classGradeUserTemp.setCreateTime(DateUtils.getNowTime());
+        classGradeUserTemp.setUpdateTime(DateUtils.getNowTime());
+        iClassGradeUserTempService.save(classGradeUserTemp);
+        //更新订单绑定班级ID
+        OrderGoods orderGoods = new OrderGoods();
+        orderGoods.setOrderGoodsId(orderGoodsId);
+        orderGoods.setGradeId(gradeId);
+        orderGoods.setUpdateTime(DateUtils.getNowTime());
+        iOrderGoodsService.updateById(orderGoods);
+        return true;
+    }
     public boolean joinGrade(Long orderGoodsId,Long gradeId,Long userId){
-    //    System.out.println("加入班级"+gradeId);
         //进入班级
         ClassGradeUser classGradeUser = new ClassGradeUser();
         classGradeUser.setUserId(userId);

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserTempMapper.xml

@@ -0,0 +1,20 @@
+<?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.zhongzheng.system.mapper.ClassGradeUserTempMapper">
+
+    <resultMap type="com.zhongzheng.modules.grade.domain.ClassGradeUserTemp" id="ClassGradeUserTempResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="fromType" column="from_type"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="orderSn" column="order_sn"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -138,4 +138,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND (SELECT COUNT(1) FROM inform_user iu where iu.user_id = o.user_id and iu.goods_id = og.goods_id and system_status = 3) < 1
 
     </select>
+
+    <select id="getBuyGoodsHistory" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultType="Long">
+        SELECT
+            ifnull(count(*),0) num
+        FROM
+            `order` o
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+        WHERE
+            o.user_id = #{userId}
+          AND og.goods_id = #{goodsId}
+          AND o.order_status >= 0
+
+    </select>
 </mapper>