商品订单状态

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

@@ -75,7 +75,21 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
 
     @Override
     public OrderGoodsVo selectDetail(OrderGoodsQueryBo bo) {
-        return orderGoodsMapper.selectDetail(bo);
+        OrderGoodsVo vo = orderGoodsMapper.selectDetail(bo);
+        //商品订单状态 -1关闭 0待支付 1已支付 2已退款
+        if(bo.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){
+            vo.setOrderGoodsStatus(1);
+        }
+        return vo;
     }
 
     @Override

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

@@ -146,6 +146,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if(Validator.isNotEmpty(vo.getRebuyOrderGoodsId())&&vo.getRebuyOrderGoodsId().longValue()>0){
                 vo.setRebuy(this.baseMapper.getGradePeriod(vo.getRebuyOrderGoodsId(),vo.getUserId()));
             }
+            //商品订单状态 -1关闭 0待支付 1已支付 2已退款
+            if(bo.getRefundStatus()==2){
+                vo.setOrderGoodsStatus(2);
+            }
+            else if(vo.getOrderStatus()<0){
+                vo.setOrderGoodsStatus(-1);
+            }
+            else if(vo.getGoodsPayStatus()==0){
+                vo.setOrderGoodsStatus(0);
+            }
+            else if(vo.getGoodsPayStatus()>1){
+                vo.setOrderGoodsStatus(1);
+            }
         }
         return orderListVos;
     }

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

@@ -142,4 +142,10 @@ public class OrderGoodsVo {
 	@Excel(name = "服务有效期结束")
 	@ApiModelProperty("服务有效期结束")
 	private Long serviceEndTime;
+	@Excel(name = "订单状态")
+	@ApiModelProperty("订单状态")
+	private Integer orderStatus;
+	@Excel(name = "商品订单状态")
+	@ApiModelProperty("商品订单状态 -1关闭 0待支付 1已支付 2已退款")
+	private Integer orderGoodsStatus;
 }

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

@@ -129,8 +129,8 @@ public class OrderListVo {
 	@ApiModelProperty("手机号码")
 	private String telphone;
 
-	@Excel(name = "订单商品状态")
-	@ApiModelProperty("订单商品状态   1正常 0关闭  2退款中 3已退款 4拒绝退款")
+	@Excel(name = "商品订单状态")
+	@ApiModelProperty("商品订单状态 -1关闭 0待支付 1已支付 2已退款")
 	private Integer orderGoodsStatus;
 
 	/** 已收金额 */
@@ -178,4 +178,5 @@ public class OrderListVo {
 	/** 商品类型 1视频2题库 3补考 4前培  */
 	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
 	private Integer goodsType;
+
 }

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

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="class_name" column="gradeName"/>
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
+        <result property="orderStatus" column="order_status"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -120,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDetail" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
         SELECT
         og.*,
+        o.order_status,
         g.`code`,
         g.goods_name,
         g.goods_type,

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

@@ -62,7 +62,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="goodsPrice" column="goods_price"/>
         <result property="goodsRealPrice" column="goods_real_price"/>
-        <result property="orderGoodsStatus" column="order_goods_status"/>
 
         <result property="idCard" column="id_card"/>
         <result property="telphone" column="telphone"/>
@@ -99,7 +98,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             og.rebuy_order_goods_id,
             og.order_goods_id,
             og.goods_real_price,
-            og.status as order_goods_status,
             u.telphone,
             u.realname,
             u.id_card,