fix 商品订单状态

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

@@ -271,6 +271,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         update.setRefundId(refundId);
         update.setUpdateTime(DateUtils.getNowTime());
         update.setWxpayRefundId(WxpayRefundId);
+        update.setRefundTime(DateUtils.getNowTime());
         this.updateById(update);
         //修改订单商品退款状态
         OrderGoods orderGoods = new OrderGoods();

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

@@ -241,4 +241,8 @@ public class OrderListVo {
     @ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
     private Integer goodsType;
 
+    /** 发票状态 1未开票 2已开票 -1 已退票 */
+    @Excel(name = "发票状态 1未开票 2已开票 -1 已退票")
+    @ApiModelProperty("发票状态 1未开票 2已开票 -1 已退票")
+    private Integer invoiceStatus;
 }

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

@@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodPlush" column="period_plush"/>
         <result property="goodsPayStatus" column="goods_pay_status"/>
         <result property="goodsType" column="goods_type"/>
+        <result property="invoiceStatus" column="invoice_status"/>
     </resultMap>
 
     <select id="getGradePeriod" parameterType="Map" resultType="integer">
@@ -109,7 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             og.goods_received,
             og.refund_status,
             og.pay_status as goods_pay_status,
-        (select cgu.period_plush from  class_grade_user cgu where cgu.grade_id = og.grade_id and cgu.user_id = o.user_id limit 1 ) period_plush
+        (select cgu.period_plush from  class_grade_user cgu where cgu.grade_id = og.grade_id and cgu.user_id = o.user_id limit 1 ) period_plush,
+        (SELECT oi.invoice_status FROM order_invoice oi LEFT JOIN order_invoice_order oio ON oio.invoice_id = oi.invoice_id WHERE
+        oio.order_goods_id = og.order_goods_id AND oi.period_status = 2) invoice_status
         FROM
             `order` o
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn