余额退款充值优惠相关逻辑优化：补充过期权益余额未使用完的情况处理

service/src/main/java/com/kym/service/enplus/impl/EnNotifyServiceImpl.java

@@ -291,8 +291,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
             // 结束时间
             var endTime = LocalDateTime.parse(data.getString("EndTime"), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 
-            // 处理充值权益优惠逻辑/优惠券优惠逻辑
-            // 优惠金额
+            // 处理充值权益优惠逻辑/优惠券优惠逻辑/账户优惠金额记录处理逻辑（涉及退款扣减优惠，在NoDiscountHandle中处理）
             DiscountStrategyFactory.getDiscountStrategy(chargeOrder.getDiscountType()).computeDiscount(chargeOrder, account);
 
             // 更新订单优惠金额

service/src/main/java/com/kym/service/factory/DiscountStrategyFactory.java

@@ -36,7 +36,7 @@ public class DiscountStrategyFactory {
         } else if (Activity.DISCOUNT_TYPE_服务费折扣权益.equals(discountType)) {
             return new RechargeRightsDiscountHandle(orderRechargeRightsService, userRechargeRightsService);
         } else {
-            return new NoDiscountHandle();
+            return new NoDiscountHandle(userRechargeRightsService);
         }
     }
 }

service/src/main/java/com/kym/service/miniapp/impl/NoDiscountHandle.java

@@ -1,10 +1,16 @@
 package com.kym.service.miniapp.impl;
 
+import com.kym.common.utils.CommUtil;
 import com.kym.entity.miniapp.Account;
 import com.kym.entity.miniapp.ChargeOrder;
+import com.kym.entity.miniapp.UserRechargeRights;
 import com.kym.service.miniapp.DiscountService;
+import com.kym.service.miniapp.UserRechargeRightsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
 
 /**
  * 无优惠策略
@@ -15,13 +21,62 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class NoDiscountHandle implements DiscountService {
 
+    private final UserRechargeRightsService userRechargeRightsService;
+
+    public NoDiscountHandle(UserRechargeRightsService userRechargeRightsService) {
+        this.userRechargeRightsService = userRechargeRightsService;
+    }
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void computeDiscount(ChargeOrder chargeOrder, Account account) {
+        /*
+         *权益只有用完才可以账户减去优惠金额，自然过期怎么处理？
+         * 自然过期的充值权益更新状态为失效
+         * 扣费时，查询该用户的充值权益，判断是否有未用完权益余额就过期的权益，如果有则继续扣减余额，直到扣减完余额再将Account中的优惠金额减去该权益的历史总优惠金额
+         */
+        int discountAmount = 0;
+        int totalMoney = chargeOrder.getTotalMoney();
+        var userRechargeRightsUpdates = new ArrayList<UserRechargeRights>();
+
+        // 没有用完就过期失效的充值权益
+        var userRechargeRightsList = userRechargeRightsService.lambdaQuery()
+                .eq(UserRechargeRights::getUserId, chargeOrder.getUserId())
+                .lt(UserRechargeRights::getRightsBalance, 0)
+                .orderByAsc(UserRechargeRights::getEndTime)
+                .list();
+
+        if (CommUtil.isNotEmptyAndNull(userRechargeRightsList)) {
+            while (totalMoney > 0) {
+                for (UserRechargeRights userRechargeRights : userRechargeRightsList) {
+                    // 权益余额金额足够支付本次订单
+                    if (totalMoney > userRechargeRights.getRightsBalance()) {
+                        totalMoney = 0;
+                        userRechargeRights.setRightsBalance(0);
+                        userRechargeRightsUpdates.add(userRechargeRights);
+                        discountAmount += userRechargeRights.getDiscountAmount();
+                        break;
+                    } else {
+                        totalMoney -= userRechargeRights.getRightsBalance();
+                        userRechargeRights.setRightsBalance(userRechargeRights.getRightsBalance() - totalMoney);
+                        userRechargeRightsUpdates.add(userRechargeRights);
+                        discountAmount += userRechargeRights.getDiscountAmount();
+                    }
+                }
+
+            }
+
+            // 更新自然过期的权益余额数据
+            userRechargeRightsService.updateBatchById(userRechargeRightsUpdates);
+            // 更新账户优惠金额
+            account.setDiscountAmount(account.getDiscountAmount() - discountAmount);
+        }
+
+
         chargeOrder.setDiscountAmount(0);
         chargeOrder.setServiceMoneyDiscount(0);
     }
 
-    ;
-
 
 }
+