submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -175,4 +175,10 @@ public class TopOldOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("重写审核状态：1待审核 2审核中")
 	private Integer reCheckStatus;
+
+	@ApiModelProperty("退款开始时间")
+	private Long refundStartTime;
+
+	@ApiModelProperty("退款结束时间")
+	private Long refundEndTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOldOrderRefund.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.goods.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -64,6 +65,8 @@ private static final long serialVersionUID=1L;
     private Integer periodStatus;
     /** 退款时间 */
     private Long refundTime;
+    /** 支付审核时间 */
+    private Long payCheckTime;
     /** 机构ID*/
     private Long tenantId;
     /** 分成模式 1机构分成 2业务员分成*/

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1812,6 +1812,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOldOrderGoods orderGoods = topOrderGoodsService.getById(x.getOrderGoodsId());
                 x.setDivideModel(orderGoods.getDivideModel());
                 x.setDivideMoney(orderGoods.getDivideMoney());
+                x.setPayCheckTime(DateUtils.getNowTime());
             });
             topOldOrderRefundService.updateBatchById(orderRefundList.stream().map(x -> BeanUtil.toBean(x, TopOldOrderRefund.class)).collect(Collectors.toList()));
             update(new LambdaUpdateWrapper<TopOldOrder>()
@@ -1837,6 +1838,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOldOrderGoods orderGoods = topOrderGoodsService.getById(x.getOrderGoodsId());
                 x.setDivideModel(orderGoods.getDivideModel());
                 x.setDivideMoney(orderGoods.getDivideMoney());
+                x.setPayCheckTime(DateUtils.getNowTime());
             });
             topOldOrderRefundService.updateBatchById(orderRefundList.stream().map(x -> BeanUtil.toBean(x, TopOldOrderRefund.class)).collect(Collectors.toList()));
             topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderRefundVo.java

@@ -90,6 +90,9 @@ public class TopOldOrderRefundVo {
 	@ApiModelProperty("退款时间")
 	private Long refundTime;
 
+	@ApiModelProperty("支付审核时间")
+	private Long payCheckTime;
+
 	@ApiModelProperty("退款订单类型：1新系统，2旧系统")
 	private Integer refundType;
 

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -151,6 +151,18 @@
         <if test="tenantId != null and tenantId != ''">
             AND vto.tenant_id = #{tenantId}
         </if>
+        <if test="refundStartTime != null or refundEndTime != null">
+            AND (SELECT COUNT(*)
+            FROM top_old_order_refund tor
+            WHERE vto.order_sn = tor.order_sn AND tor.`status` = 1
+            <if test="refundStartTime != null and refundStartTime != ''">
+                AND tor.pay_check_tiem &gt;= 0
+            </if>
+            <if test="refundEndTime != null and refundEndTime != ''">
+                AND tor.pay_check_tiem &lt;= 0
+            </if>
+             ) > 0
+        </if>
         <if test="studentCheckStatus != null">
             AND (vto.order_from != 1
                 AND (SELECT COUNT(too.order_sn)