add 退款列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderGoodsRefundController.java

@@ -50,7 +50,7 @@ public class OrderGoodsRefundController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<OrderGoodsRefundVo> list(OrderGoodsRefundQueryBo bo) {
         startPage();
-        List<OrderGoodsRefundVo> list = iOrderGoodsRefundService.queryList(bo);
+        List<OrderGoodsRefundVo> list = iOrderGoodsRefundService.selectList(bo);
         return getDataTable(list);
     }
 

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

@@ -51,5 +51,11 @@ public class OrderGoodsRefundAddBo {
     private String periodUsername;
     /** 复审用户名 */
     private String periodReviewUsername;
+    /** 初审时间 */
+    @ApiModelProperty("初审时间")
+    private Long periodTime;
+    /** 复审时间 */
+    @ApiModelProperty("复审时间")
+    private Long periodReviewTime;
 
 }

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

@@ -77,5 +77,11 @@ public class OrderGoodsRefundEditBo {
     private String periodUsername;
     /** 复审用户名 */
     private String periodReviewUsername;
+    /** 初审时间 */
+    @ApiModelProperty("初审时间")
+    private Long periodTime;
+    /** 复审时间 */
+    @ApiModelProperty("复审时间")
+    private Long periodReviewTime;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoodsRefund.java

@@ -57,4 +57,18 @@ private static final long serialVersionUID=1L;
     private Integer type;
     /** 订单商品ID */
     private Long orderGoodsId;
+    /** 审批状态 0 待审核 1初审通过 2复审通过 -1初审不通过 -2复审不通过 */
+    private Integer periodStatus;
+    /** 初审结果原因 */
+    private String periodReason;
+    /** 复审结果原因 */
+    private String periodReviewReason;
+    /** 初审用户名 */
+    private String periodUsername;
+    /** 复审用户名 */
+    private String periodReviewUsername;
+    /** 初审时间 */
+    private Long periodTime;
+    /** 复审时间 */
+    private Long periodReviewTime;
 }

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

@@ -75,4 +75,32 @@ public class OrderGoodsRefundVo {
 	@Excel(name = "订单商品ID")
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
+	/** 审批状态 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;
+	/** 初审时间 */
+	@Excel(name = "初审时间")
+	@ApiModelProperty("初审时间")
+	private Long periodTime;
+	/** 复审时间 */
+	@Excel(name = "复审时间")
+	@ApiModelProperty("复审时间")
+	private Long periodReviewTime;
 }

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

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodReviewReason" column="period_review_reason"/>
         <result property="periodUsername" column="period_username"/>
         <result property="periodReviewUsername" column="period_review_username"/>
+        <result property="periodTime" column="period_time"/>
+        <result property="periodReviewTime" column="period_review_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsRefundVo" id="OrderGoodsRefundVoResult">
@@ -47,6 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodReviewReason" column="period_review_reason"/>
         <result property="periodUsername" column="period_username"/>
         <result property="periodReviewUsername" column="period_review_username"/>
+        <result property="periodTime" column="period_time"/>
+        <result property="periodReviewTime" column="period_review_time"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo" resultMap="OrderGoodsRefundVoResult">
@@ -58,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             order_goods_refund gr
                 LEFT JOIN goods g ON gr.goods_id = g.goods_id
         where 1=1
-        <if test="userId != null">
+        <if test="userId != null and userId != ''">
             AND gr.user_id = #{userId}
         </if>
         <if test="type != null">