From b0ecaa552c9f92870ed9a5fede29af852c19d782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 16 Aug 2024 14:16:20 +0800
Subject: [PATCH] 'commit'

---
 .../finance/service/UserRefundServiceImpl.java       | 12 ++++++++++--
 .../charge/task/controller/YltControllerForWx.java   |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Ylt/ms-finance/src/main/java/com/charge/finance/service/UserRefundServiceImpl.java b/Ylt/ms-finance/src/main/java/com/charge/finance/service/UserRefundServiceImpl.java
index 843a1c9..de8103f 100644
--- a/Ylt/ms-finance/src/main/java/com/charge/finance/service/UserRefundServiceImpl.java
+++ b/Ylt/ms-finance/src/main/java/com/charge/finance/service/UserRefundServiceImpl.java
@@ -261,14 +261,22 @@ public class UserRefundServiceImpl {
      * @return
      */
     public PreRefundInfoDTO recDataListNew(String userId) {
+        //预退费实体
         PreRefundInfoDTO result = new PreRefundInfoDTO();
+
         //查询用户当前可余额
         UserAccountDO userAccount = userAccountMapper.getUserAccountInfo(userId);
         BigDecimal money = userAccount.getUaRealBalance().setScale(2, BigDecimal.ROUND_HALF_UP);
-        //倒序查询当前的充值订单，限定在当前剩余余额内的范围
+
+        //倒序查询当前的充值订单
+        /**
+         -- pay_state=1   支付状态（0下单成功  1已支付 2 支付失败）
+         -- 退款状态（0未退款 1已退款  2 退款失败 3退款申请审核 4未退款驳回 5参加活动不可退款 6:似乎也是参加了活动，这里不清晰）
+         select * from t_account_recharge where user_id = 1129 and pay_state = '1'  and refund_state in ('0', '4', '6')   order by create_time desc
+         */
         List<AccountRechargeDO> rechargeDOList = accountRechargeDOMapper.getRefundableRechargeOrder(Long.parseLong(userId));
         List<RefundOrderInfoDTO> list = new ArrayList<>();
-        //进行筛选
+        //进行筛选，限定在当前剩余余额内的范围
         for (AccountRechargeDO accountRechargeDO : rechargeDOList) {
             //若是剩余余额已经全部回溯完，则跳出循环
             if (money.compareTo(BigDecimal.ZERO) <= 0) {
diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java
index 03a618f..73f8222 100644
--- a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java
+++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java
@@ -185,6 +185,7 @@ public class YltControllerForWx {
     }
 
     /**
+     * TODO
      * 功能：找出所有符合条件的退款单号列表
      * 1、没有参加充值活动
      * 2、用户余额小于50元（后台可以设置）