管理员收入新增salaryEvent查询条件

rc-service/rc-inner-api/wallet-inner/wallet-inner-api/src/main/java/com/red/circle/wallet/inner/endpoint/salary/api/UserSalaryAccountClientApi.java

@@ -53,6 +53,7 @@ public interface UserSalaryAccountClientApi {
   @GetMapping("/total-income")
   ResultResponse<BigDecimal> getTotalIncome(@RequestParam("userId") Long userId,
                                             @RequestParam("salaryType") String salaryType,
+                                            @RequestParam("salaryEvent") String salaryEvent,
                                             @RequestParam(value = "startTime", required = false) String startTime,
                                             @RequestParam(value = "endTime", required = false) String endTime);
 

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/RechargeUserServiceImpl.java

@@ -125,6 +125,7 @@ public class RechargeUserServiceImpl implements RechargeUserService {
 
       return new RechargeSummaryVO()
           .setTotalIncome(userSalaryAccountClient.getTotalIncome(cmd.getReqUserId(), "ADMIN_SALARY",
+                  "SALARY_ADMIN",
                   startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
                   endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).getBody())
           .setCurrentMonthRecharge(currentMonthRecharge)

rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/query/SalaryTotalIncomeQryExe.java

@@ -21,10 +21,11 @@ public class SalaryTotalIncomeQryExe {
 
   private final SalaryAccountRunningWaterService salaryAccountRunningWaterService;
 
-  public BigDecimal execute(Long userId, SalaryType salaryType,  String startTime, String endTime) {
+  public BigDecimal execute(Long userId, SalaryType salaryType, String salaryEvent, String startTime, String endTime) {
     LambdaQueryWrapper<SalaryAccountRunningWater> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SalaryAccountRunningWater::getUserId, userId)
         .eq(SalaryAccountRunningWater::getSalaryType, salaryType.getCode())
+        .eq(SalaryAccountRunningWater::getSalaryEvent, salaryEvent)
         .eq(SalaryAccountRunningWater::getType, 0)
             .gt(StringUtils.hasText(startTime), TimestampBaseEntity::getCreateTime, startTime)
             .lt(StringUtils.hasText(endTime), TimestampBaseEntity::getCreateTime, endTime);

rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/service/SalaryAccountServiceImpl.java

@@ -63,7 +63,7 @@ public class SalaryAccountServiceImpl implements SalaryAccountService {
     }
 
     @Override
-    public BigDecimal getTotalIncome(Long userId, String salaryType, String startTime, String endTime) {
+    public BigDecimal getTotalIncome(Long userId, String salaryType, String salaryEvent, String startTime, String endTime) {
-        return salaryTotalIncomeQryExe.execute(userId, Objects.requireNonNull(SalaryType.of(salaryType)), startTime, endTime);
+        return salaryTotalIncomeQryExe.execute(userId, Objects.requireNonNull(SalaryType.of(salaryType)), salaryEvent, startTime, endTime);
     }
 }

rc-service/rc-service-wallet/wallet-client/src/main/java/com/red/circle/wallet/app/service/SalaryAccountService.java

@@ -54,5 +54,5 @@ public interface SalaryAccountService {
    * @param salaryType 工资类型
    * @return 累计收入
    */
-  BigDecimal getTotalIncome(Long userId, String salaryType, String startTime, String endTime);
+  BigDecimal getTotalIncome(Long userId, String salaryType, String salaryEvent, String startTime, String endTime);
 }

rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/endpoint/salary/UserSalaryAccountClientEndpoint.java

@@ -52,7 +52,7 @@ public class UserSalaryAccountClientEndpoint implements UserSalaryAccountClientA
   }
 
   @Override
-  public ResultResponse<BigDecimal> getTotalIncome(Long userId, String salaryType, String startTime, String endTime) {
+  public ResultResponse<BigDecimal> getTotalIncome(Long userId, String salaryType, String salaryEvent, String startTime, String endTime) {
-    return ResultResponse.success(userSalaryAccountClientService.getTotalIncome(userId, salaryType, startTime, endTime));
+    return ResultResponse.success(userSalaryAccountClientService.getTotalIncome(userId, salaryType, salaryEvent, startTime, endTime));
   }
 }

rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/salary/UserSalaryAccountClientService.java

@@ -38,5 +38,5 @@ public interface UserSalaryAccountClientService {
   /**
    * 查询用户累计收入.
    */
-  BigDecimal getTotalIncome(Long userId, String salaryType, String startTime, String endTime);
+  BigDecimal getTotalIncome(Long userId, String salaryType, String salaryEvent, String startTime, String endTime);
 }

rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/salary/impl/UserSalaryAccountClientServiceImpl.java

@@ -70,8 +70,8 @@ public class UserSalaryAccountClientServiceImpl implements UserSalaryAccountClie
   }
 
   @Override
-  public BigDecimal getTotalIncome(Long userId, String salaryType, String startTime, String endTime) {
+  public BigDecimal getTotalIncome(Long userId, String salaryType, String salaryEvent, String startTime, String endTime) {
-    BigDecimal totalIncome = salaryAccountService.getTotalIncome(userId, salaryType, startTime, endTime);
+    BigDecimal totalIncome = salaryAccountService.getTotalIncome(userId, salaryType, salaryEvent, startTime, endTime);
     return totalIncome != null ? totalIncome : BigDecimal.ZERO;
   }
 }