退款申请列表

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

@@ -41,6 +41,15 @@ public class OrderGoodsRefundAddBo {
     /** 订单商品ID */
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
-
+    /** 审批状态 0 待审核 1初审通过 2复审通过 -1初审不通过 -2复审不通过 */
+    private Integer periodStatus;
+    /** 初审结果原因 */
+    private String periodReason;
+    /** 复审结果原因 */
+    private String periodReviewReason;
+    /** 初审用户名 */
+    private String periodUsername;
+    /** 复审用户名 */
+    private String periodReviewUsername;
 
 }

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

@@ -67,5 +67,15 @@ public class OrderGoodsRefundEditBo {
     /** 订单商品ID */
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
+    /** 审批状态 0 待审核 1初审通过 2复审通过 -1初审不通过 -2复审不通过 */
+    private Integer periodStatus;
+    /** 初审结果原因 */
+    private String periodReason;
+    /** 复审结果原因 */
+    private String periodReviewReason;
+    /** 初审用户名 */
+    private String periodUsername;
+    /** 复审用户名 */
+    private String periodReviewUsername;
 
 }

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

@@ -58,4 +58,16 @@ public class OrderGoodsRefundQueryBo extends BaseEntity {
 	/** 微信退款单号 */
 	@ApiModelProperty("微信退款单号")
 	private String wxpayRefundId;
+	@ApiModelProperty("退款类型 1小程序 2系统录单")
+	private Integer type;
+	/** 审批状态 0 待审核 1初审通过 2复审通过 -1初审不通过 -2复审不通过 */
+	private Integer periodStatus;
+	/** 初审结果原因 */
+	private String periodReason;
+	/** 复审结果原因 */
+	private String periodReviewReason;
+	/** 初审用户名 */
+	private String periodUsername;
+	/** 复审用户名 */
+	private String periodReviewUsername;
 }

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

@@ -81,7 +81,7 @@ public class OrderQueryBo extends BaseEntity {
 	@ApiModelProperty("收货地址")
 	private String address;
 	/** 订单来源 1业务员录单 */
-	@ApiModelProperty("订单来源 1业务员录单")
+	@ApiModelProperty("订单来源 1业务员普通单 2祥粤云学堂小程序 3祥粤云学堂网站 4祥粤e管证小程序 5业务员录单")
 	private Integer orderFrom;
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")
@@ -123,4 +123,6 @@ public class OrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("订单商品ID数组")
 	private List<Long> orderGoodsIds;
+
+	private List<Integer> orderFroms;
 }

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

@@ -90,4 +90,24 @@ public class OrderBillSheetVo {
 	@Excel(name = "收款时间")
 	@ApiModelProperty("收款时间")
 	private Long collectionTime;
+	/** 审批状态 0 待审核 1初审通过 2复审通过 -1初审不通过 -2复审不通过 */
+	@Excel(name = "审批状态 0 待审核 1初审通过 2复审通过 -1初审不通过 -2复审不通过")
+	@ApiModelProperty("审批状态 0 待审核 1初审通过 2复审通过 -1初审不通过 -2复审不通过")
+	private Integer periodStatus;
+	/** 初审结果原因 */
+	@Excel(name = "初审结果原因")
+	@ApiModelProperty("初审结果原因")
+	private String periodReason;
+	/** 复审结果原因 */
+	@Excel(name = "复审结果原因")
+	@ApiModelProperty("复审结果原因")
+	private String periodReviewReason;
+	/** 初审用户名 */
+	@Excel(name = "初审用户名")
+	@ApiModelProperty("初审用户名")
+	private String periodUsername;
+	/** 复审用户名 */
+	@Excel(name = "复审用户名")
+	@ApiModelProperty("复审用户名")
+	private String periodReviewUsername;
 }

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

@@ -19,6 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyImgs" column="apply_imgs"/>
         <result property="type" column="type"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="periodStatus" column="period_status"/>
+        <result property="periodReason" column="period_reason"/>
+        <result property="periodReviewReason" column="period_review_reason"/>
+        <result property="periodUsername" column="period_username"/>
+        <result property="periodReviewUsername" column="period_review_username"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsRefundVo" id="OrderGoodsRefundVoResult">
@@ -37,6 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyImgs" column="apply_imgs"/>
         <result property="type" column="type"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="periodStatus" column="period_status"/>
+        <result property="periodReason" column="period_reason"/>
+        <result property="periodReviewReason" column="period_review_reason"/>
+        <result property="periodUsername" column="period_username"/>
+        <result property="periodReviewUsername" column="period_review_username"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo" resultMap="OrderGoodsRefundVoResult">
@@ -51,6 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null">
             AND gr.user_id = #{userId}
         </if>
+        <if test="type != null">
+            AND gr.type = #{type}
+        </if>
+        <if test="periodStatus != null">
+            AND gr.period_status = #{periodStatus}
+        </if>
         ORDER BY gr.refund_id DESC
     </select>
 </mapper>

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

@@ -182,6 +182,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="orderFroms != null ">
+            AND o.order_from in
+            <foreach collection="orderFroms" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         ORDER BY o.order_id DESC
     </select>