yangdamao 2 жил өмнө
parent
commit
53c2b85b1f

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

@@ -245,4 +245,7 @@ public class OrderListVo {
     @Excel(name = "发票状态 1未开票 2已开票 -1 已退票")
     @ApiModelProperty("发票状态 1未开票 2已开票 -1 已退票")
     private Integer invoiceStatus;
+
+    @ApiModelProperty("审批状态 0 待审核 1初审通过 2复审通过待退款  -1初审不通过 -2复审不通过 3已退款")
+    private Integer periodStatus;
 }

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

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chargingType" column="charging_type"/>
         <result property="orderFrom" column="order_from"/>
         <result property="status" column="status"/>
+        <result property="periodStatus" column="period_status"/>
 
         <result property="goodsName" column="goods_name"/>
         <result property="goodsId" column="goods_id"/>
@@ -321,9 +322,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectListApp" parameterType="com.zhongzheng.modules.order.bo.OrderQueryBo" resultMap="OrderResultVo">
         SELECT
-            o.*
+            o.*,
+            ogr.period_status
         FROM
-            `order` o where 1=1
+            `order` o LEFT JOIN order_goods_refund ogr on o.order_sn = ogr.order_sn
+        where 1=1
         <if test="userId != null">
             AND o.user_id = #{userId}
         </if>