fix 商品订单状态

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.order.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.zhongzheng.common.exception.CustomException;
@@ -66,9 +67,8 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     private IClassGradeGoodsService iClassGradeGoodsService;
 
 
-
     @Override
-    public OrderGoodsVo queryById(Long orderGoodsId){
+    public OrderGoodsVo queryById(Long orderGoodsId) {
         OrderGoods db = this.baseMapper.selectById(orderGoodsId);
         return BeanUtil.toBean(db, OrderGoodsVo.class);
     }
@@ -77,16 +77,16 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     public OrderGoodsVo selectDetail(OrderGoodsQueryBo bo) {
         OrderGoodsVo vo = orderGoodsMapper.selectDetail(bo);
         //商品订单状态 -1关闭 0待支付 1已支付 2已退款
-        if(bo.getRefundStatus()==2){
-            vo.setOrderGoodsStatus(2);
-        }
-        else if(vo.getOrderStatus()<0){
+        if (Validator.isEmpty(vo.getRefundStatus())) {
             vo.setOrderGoodsStatus(-1);
         }
-        else if(vo.getPayStatus()==0){
+        else if (vo.getRefundStatus() == 2) {
+            vo.setOrderGoodsStatus(2);
+        } else if (vo.getOrderStatus() < 0) {
+            vo.setOrderGoodsStatus(-1);
+        } else if (vo.getPayStatus() == 0) {
             vo.setOrderGoodsStatus(0);
-        }
-        else if(vo.getPayStatus()>1){
+        } else if (vo.getPayStatus() > 1) {
             vo.setOrderGoodsStatus(1);
         }
         return vo;
@@ -115,19 +115,19 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     }
 
     /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
     private List<OrderGoodsVo> entity2Vo(Collection<OrderGoods> collection) {
         List<OrderGoodsVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, OrderGoodsVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<OrderGoods> page = (Page<OrderGoods>)collection;
+            Page<OrderGoods> page = (Page<OrderGoods>) collection;
             Page<OrderGoodsVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
+            BeanUtil.copyProperties(page, pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
         }
@@ -176,25 +176,25 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         update.setGoodsInputData(JSON.toJSONString(bo.getGoodsInputData()));
         OrderGoods db = this.baseMapper.selectById(bo.getOrderGoodsId());
         //新的班级ID变化
-        if(bo.getGradeId()!=null&&db.getGradeId()!=bo.getGradeId()){
+        if (bo.getGradeId() != null && db.getGradeId() != bo.getGradeId()) {
             //修改班级
-            Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId,bo.getGoodsId()));
+            Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId, bo.getGoodsId()));
             //视频商品安排班级
-            if(goods.getGoodsType()==1){
-                Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn,bo.getOrderSn()));
+            if (goods.getGoodsType() == 1) {
+                Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, bo.getOrderSn()));
                 //加入新班级
-                joinGrade(bo.getOrderGoodsId(),bo.getGradeId(),order.getUserId(),bo.getGoodsId());
+                joinGrade(bo.getOrderGoodsId(), bo.getGradeId(), order.getUserId(), bo.getGoodsId());
                 //移除旧班级
-                ClassGradeUser classGradeUser =iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>()
-                        .eq(ClassGradeUser::getUserId,order.getUserId()).eq(ClassGradeUser::getGradeId,db.getGradeId()
-                        ).eq(ClassGradeUser::getStatus,1).last("limit 1"));
-                if(classGradeUser==null){
+                ClassGradeUser classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>()
+                        .eq(ClassGradeUser::getUserId, order.getUserId()).eq(ClassGradeUser::getGradeId, db.getGradeId()
+                        ).eq(ClassGradeUser::getStatus, 1).last("limit 1"));
+                if (classGradeUser == null) {
                     throw new CustomException("原班级查无你的信息");
                 }
                 classGradeUser.setStatus(0);
                 classGradeUser.setUpdateTime(DateUtils.getNowTime());
                 iClassGradeUserService.updateById(classGradeUser);
-            }else{
+            } else {
                 throw new CustomException("非视频课程无法修改班级");
             }
         }
@@ -206,13 +206,13 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(OrderGoods entity){
+    private void validEntityBeforeSave(OrderGoods entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return this.removeByIds(ids);
@@ -242,22 +242,22 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return baseMapper.gradeGoods(bo);
     }
 
-    public boolean joinGrade(Long orderGoodsId,Long gradeId,Long userId,Long goodsId){
+    public boolean joinGrade(Long orderGoodsId, Long gradeId, Long userId, Long goodsId) {
         ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
-        if(classGradeVo==null){
+        if (classGradeVo == null) {
             throw new CustomException("班级不存在");
         }
-        ClassGradeGoods gradeGoods = iClassGradeGoodsService.getOne(new LambdaQueryWrapper<ClassGradeGoods>().eq(ClassGradeGoods::getGradeId,gradeId)
-                .eq(ClassGradeGoods::getGoodsId,goodsId));
-        if(gradeGoods==null){
+        ClassGradeGoods gradeGoods = iClassGradeGoodsService.getOne(new LambdaQueryWrapper<ClassGradeGoods>().eq(ClassGradeGoods::getGradeId, gradeId)
+                .eq(ClassGradeGoods::getGoodsId, goodsId));
+        if (gradeGoods == null) {
             throw new CustomException("该班级不支持该商品使用");
         }
         LambdaQueryWrapper<ClassGradeUser> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(ClassGradeUser::getGradeId,gradeId);
-        lqw.eq(ClassGradeUser::getStatus,1);
+        lqw.eq(ClassGradeUser::getGradeId, gradeId);
+        lqw.eq(ClassGradeUser::getStatus, 1);
         int studentNum = iClassGradeUserService.count(lqw);
         //预留0空位避免超人数
-        if(classGradeVo.getStudentUpper()-studentNum<1){
+        if (classGradeVo.getStudentUpper() - studentNum < 1) {
             //班级还有剩位,直接加入班级
             throw new CustomException("班级人数已满");
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -18,165 +18,227 @@ import java.util.List;
 @Data
 @ApiModel("订单视图对象")
 public class OrderListVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long orderId;
-
-	/** 订单编号 */
-	@Excel(name = "订单编号")
-	@ApiModelProperty("订单编号")
-	private String orderSn;
-	/** 用户ID */
-	@Excel(name = "用户ID")
-	@ApiModelProperty("用户ID")
-	private Long userId;
-
-	/** 用户ID */
-	@Excel(name = "商品封面")
-	@ApiModelProperty("商品封面")
-	private String coverUrl;
-	/** 订单价格 */
-	@Excel(name = "订单价格")
-	@ApiModelProperty("订单价格")
-	private BigDecimal orderPrice;
-	/** 支付订单号 */
-	@Excel(name = "支付订单号")
-	@ApiModelProperty("支付订单号")
-	private String orderGeneral;
-	/** 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功 */
-	@Excel(name = "订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
-	@ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
-	private Integer orderStatus;
-	/** 支付时间 */
-	@Excel(name = "支付时间")
-	@ApiModelProperty("支付时间")
-	private Long payTime;
-	/** 支付平台 1微信 2支付宝 */
-	@Excel(name = "支付平台 1微信 2支付宝")
-	@ApiModelProperty("支付平台 1微信 2支付宝")
-	private Integer payType;
-	/** 微信流水号 */
-	@Excel(name = "微信流水号")
-	@ApiModelProperty("微信流水号")
-	private String transid;
-	/** 关闭时间 */
-	@Excel(name = "关闭时间")
-	@ApiModelProperty("关闭时间")
-	private Long cancelTime;
-	/** 订单完成时间 */
-	@Excel(name = "订单完成时间")
-	@ApiModelProperty("订单完成时间")
-	private Long finishTime;
-	/** 订单类型 1充值订单 2金币消费订单 */
-	@Excel(name = "订单类型 1充值订单 2金币消费订单")
-	@ApiModelProperty("订单类型 1充值订单 2金币消费订单")
-	private Integer orderType;
-	/** 支付价格 */
-	@Excel(name = "支付价格")
-	@ApiModelProperty("支付价格")
-	private BigDecimal payPrice;
-	/** 收费方式 1即刻收费 2稍后收费 */
-	@Excel(name = "收费方式 1即刻收费 2稍后收费")
-	@ApiModelProperty("收费方式 1即刻收费 2稍后收费")
-	private Integer chargingType;
-	/** 订单来源 1业务员录单 */
-	@Excel(name = "订单来源 1业务员录单")
-	@ApiModelProperty("订单来源 1业务员录单")
-	private Integer orderFrom;
-	@ApiModelProperty("订单创建时间")
-	private Long createTime;
-	/** 商品标准价格 */
-	@Excel(name = "商品标准价格")
-	@ApiModelProperty("商品标准价格")
-	private BigDecimal goodsPrice;
-	/** 商品成交价格 */
-	@Excel(name = "商品成交价格")
-	@ApiModelProperty("商品成交价格")
-	private BigDecimal goodsRealPrice;
-	/** 商品名称 */
-	@Excel(name = "商品名称")
-	@ApiModelProperty("商品名称")
-	private String goodsName;
-	@Excel(name = "年份")
-	@ApiModelProperty("年份")
-	private Long year;
-	@ApiModelProperty("商品id")
-	private Long goodsId;
-
-	@ApiModelProperty("教育名称")
-	private String educationName;
-	@ApiModelProperty("项目名称")
-	private String projectName;
-	@ApiModelProperty("业务名称")
-	private String businessName;
-	@ApiModelProperty("学校名称")
-	private String schoolName;
-	@ApiModelProperty("专业名称")
-	private String categoryName;
-
-	/** 真实姓名 */
-	@Excel(name = "真实姓名")
-	@ApiModelProperty("真实姓名")
-	private String realname;
-	/** 身份证号 */
-	@Excel(name = "身份证号")
-	@ApiModelProperty("身份证号")
-	private String idCard;
-	/** 手机号码 */
-	@Excel(name = "手机号码")
-	@ApiModelProperty("手机号码")
-	private String telphone;
-
-	@Excel(name = "商品订单状态")
-	@ApiModelProperty("商品订单状态 -1关闭 0待支付 1已支付 2已退款")
-	private Integer orderGoodsStatus;
-
-	/** 已收金额 */
-	@Excel(name = "已收金额")
-	@ApiModelProperty("已收金额")
-	private BigDecimal goodsReceived;
-	/** 退款状态 0无  1退款中 2已退款 3拒绝退款 */
-	@Excel(name = "退款状态 0无  1退款中 2已退款 3拒绝退款")
-	@ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
-	private Integer refundStatus;
-	/** 支付状态 1未收费 2部分收费 3完全收费 */
-	@Excel(name = "支付状态 1未收费 2部分收费 3完全收费")
-	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
-	private Integer payStatus;
-	/** 订单商品id */
-	@ApiModelProperty("订单商品id")
-	private Long orderGoodsId;
-
-	/** 订单状态 */
-	@ApiModelProperty("订单状态")
-	private Long status;
-
-	/** 总价格 */
-	@ApiModelProperty("总价格")
-	private BigDecimal totalPrice;
-
-	/** 订单商品 */
-	@ApiModelProperty("订单商品")
-	private List<OrderGoodsVo> orderGoodsList;
-
-	@ApiModelProperty("商品编号")
-	private String code;
-	/** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
-	@Excel(name = "0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
-	@ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
-	private Integer rebuy;
-	@ApiModelProperty("是否学时推送 0未推送 1推送")
-	private Integer periodPlush;
-	@Excel(name = "复购老订单商品ID")
-	@ApiModelProperty("复购老订单商品ID")
-	private Long rebuyOrderGoodsId;
-	@Excel(name = "订单商品支付状态")
-	@ApiModelProperty("订单商品支付状态  1未收费 2部分收费 3完全收费 4免费")
-	private Integer goodsPayStatus;
-	/** 商品类型 1视频2题库 3补考 4前培  */
-	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
-	private Integer goodsType;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $pkColumn.columnComment
+     */
+    @ApiModelProperty("$pkColumn.columnComment")
+    private Long orderId;
+
+    /**
+     * 订单编号
+     */
+    @Excel(name = "订单编号")
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /**
+     * 用户ID
+     */
+    @Excel(name = "用户ID")
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /**
+     * 用户ID
+     */
+    @Excel(name = "商品封面")
+    @ApiModelProperty("商品封面")
+    private String coverUrl;
+    /**
+     * 订单价格
+     */
+    @Excel(name = "订单价格")
+    @ApiModelProperty("订单价格")
+    private BigDecimal orderPrice;
+    /**
+     * 支付订单号
+     */
+    @Excel(name = "支付订单号")
+    @ApiModelProperty("支付订单号")
+    private String orderGeneral;
+    /**
+     * 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功
+     */
+    @Excel(name = "订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
+    @ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
+    private Integer orderStatus;
+    /**
+     * 支付时间
+     */
+    @Excel(name = "支付时间")
+    @ApiModelProperty("支付时间")
+    private Long payTime;
+    /**
+     * 支付平台 1微信 2支付宝
+     */
+    @Excel(name = "支付平台 1微信 2支付宝")
+    @ApiModelProperty("支付平台 1微信 2支付宝")
+    private Integer payType;
+    /**
+     * 微信流水号
+     */
+    @Excel(name = "微信流水号")
+    @ApiModelProperty("微信流水号")
+    private String transid;
+    /**
+     * 关闭时间
+     */
+    @Excel(name = "关闭时间")
+    @ApiModelProperty("关闭时间")
+    private Long cancelTime;
+    /**
+     * 订单完成时间
+     */
+    @Excel(name = "订单完成时间")
+    @ApiModelProperty("订单完成时间")
+    private Long finishTime;
+    /**
+     * 订单类型 1充值订单 2金币消费订单
+     */
+    @Excel(name = "订单类型 1充值订单 2金币消费订单")
+    @ApiModelProperty("订单类型 1充值订单 2金币消费订单")
+    private Integer orderType;
+    /**
+     * 支付价格
+     */
+    @Excel(name = "支付价格")
+    @ApiModelProperty("支付价格")
+    private BigDecimal payPrice;
+    /**
+     * 收费方式 1即刻收费 2稍后收费
+     */
+    @Excel(name = "收费方式 1即刻收费 2稍后收费")
+    @ApiModelProperty("收费方式 1即刻收费 2稍后收费")
+    private Integer chargingType;
+    /**
+     * 订单来源 1业务员录单
+     */
+    @Excel(name = "订单来源 1业务员录单")
+    @ApiModelProperty("订单来源 1业务员录单")
+    private Integer orderFrom;
+    @ApiModelProperty("订单创建时间")
+    private Long createTime;
+    /**
+     * 商品标准价格
+     */
+    @Excel(name = "商品标准价格")
+    @ApiModelProperty("商品标准价格")
+    private BigDecimal goodsPrice;
+    /**
+     * 商品成交价格
+     */
+    @Excel(name = "商品成交价格")
+    @ApiModelProperty("商品成交价格")
+    private BigDecimal goodsRealPrice;
+    /**
+     * 商品名称
+     */
+    @Excel(name = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @Excel(name = "年份")
+    @ApiModelProperty("年份")
+    private Long year;
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    @ApiModelProperty("教育名称")
+    private String educationName;
+    @ApiModelProperty("项目名称")
+    private String projectName;
+    @ApiModelProperty("业务名称")
+    private String businessName;
+    @ApiModelProperty("学校名称")
+    private String schoolName;
+    @ApiModelProperty("专业名称")
+    private String categoryName;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "真实姓名")
+    @ApiModelProperty("真实姓名")
+    private String realname;
+    /**
+     * 身份证号
+     */
+    @Excel(name = "身份证号")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+    /**
+     * 手机号码
+     */
+    @Excel(name = "手机号码")
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    @Excel(name = "商品订单状态")
+    @ApiModelProperty("商品订单状态 -1关闭 0待支付 1已支付 2已退款")
+    private Integer orderGoodsStatus;
+
+    /**
+     * 已收金额
+     */
+    @Excel(name = "已收金额")
+    @ApiModelProperty("已收金额")
+    private BigDecimal goodsReceived;
+    /**
+     * 退款状态 0无  1退款中 2已退款 3拒绝退款
+     */
+    @Excel(name = "退款状态 0无  1退款中 2已退款 3拒绝退款")
+    @ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
+    private Integer refundStatus;
+    /**
+     * 支付状态 1未收费 2部分收费 3完全收费
+     */
+    @Excel(name = "支付状态 1未收费 2部分收费 3完全收费")
+    @ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
+    private Integer payStatus;
+    /**
+     * 订单商品id
+     */
+    @ApiModelProperty("订单商品id")
+    private Long orderGoodsId;
+
+    /**
+     * 订单状态
+     */
+    @ApiModelProperty("订单状态")
+    private Long status;
+
+    /**
+     * 总价格
+     */
+    @ApiModelProperty("总价格")
+    private BigDecimal totalPrice;
+
+    /**
+     * 订单商品
+     */
+    @ApiModelProperty("订单商品")
+    private List<OrderGoodsVo> orderGoodsList;
+
+    @ApiModelProperty("商品编号")
+    private String code;
+    /**
+     * 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级
+     */
+    @Excel(name = "0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
+    @ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
+    private Integer rebuy;
+    @ApiModelProperty("是否学时推送 0未推送 1推送")
+    private Integer periodPlush;
+    @Excel(name = "复购老订单商品ID")
+    @ApiModelProperty("复购老订单商品ID")
+    private Long rebuyOrderGoodsId;
+    @Excel(name = "订单商品支付状态")
+    @ApiModelProperty("订单商品支付状态  1未收费 2部分收费 3完全收费 4免费")
+    private Integer goodsPayStatus;
+    /**
+     * 商品类型 1视频2题库 3补考 4前培
+     */
+    @ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
+    private Integer goodsType;
 
 }