push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiSalaryController.java

@@ -141,6 +141,16 @@ public class ApiSalaryController implements ApiSalaryFeignClient {
     }
 
     /**
+     * 根据转介人和薪资年月查询应发总金额
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<BigDecimal> getGrossAmount(ApiSalaryGrossAmountRequest request) {
+        return null;
+    }
+
+    /**
      * 薪资单信息-汇款明细-查询汇率
      * @param request
      * @return

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiSalaryService.java

@@ -32,6 +32,8 @@ public interface ApiSalaryService {
 
     Result delSalaryRemittance(String salaryRemittanceBizId);
 
+    Result<BigDecimal> getGrossAmount(ApiSalaryGrossAmountRequest request);
+
     Result<BigDecimal> getExchangeRate(ApiSalaryExchangeRateRequest request);
 
     Result<BigDecimal> calculatePaidAmount(ApiSalaryCalculatePaidAmountRequest request);

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalaryServiceImpl.java

@@ -20,8 +20,11 @@ import com.yd.csf.feign.request.salary.*;
 import com.yd.csf.feign.response.salary.ApiSalaryDetailResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse;
+import com.yd.csf.service.enums.FortuneAccountStatusEnum;
+import com.yd.csf.service.model.FortuneAccount;
 import com.yd.csf.service.model.Salary;
 import com.yd.csf.service.model.SalaryRemittance;
+import com.yd.csf.service.service.FortuneAccountService;
 import com.yd.csf.service.service.ISalaryRemittanceService;
 import com.yd.csf.service.service.ISalaryService;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +53,9 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
     private ISalaryRemittanceService iSalaryRemittanceService;
 
     @Autowired
+    private FortuneAccountService fortuneAccountService;
+
+    @Autowired
     private ApiExchangeRateFeignClient apiExchangeRateFeignClient;
 
     /**
@@ -314,6 +320,21 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
     }
 
     /**
+     * 根据转介人和薪资年月查询应发总金额
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<BigDecimal> getGrossAmount(ApiSalaryGrossAmountRequest request) {
+        //根据转介人和薪资年月查询是否有完成出账的记录
+        List<FortuneAccount> fortuneAccountList = fortuneAccountService.queryList(request.getBrokerBizId(),request.getMonth(), FortuneAccountStatusEnum.SENT.getItemValue());
+        if (CollectionUtils.isEmpty(fortuneAccountList)) {
+
+        }
+        return null;
+    }
+
+    /**
      * 薪资单信息-汇款明细-查询汇率
      * @param request
      * @return

yd-csf-feign/src/main/java/com/yd/csf/feign/client/salary/ApiSalaryFeignClient.java

@@ -106,6 +106,14 @@ public interface ApiSalaryFeignClient {
     Result delSalaryRemittance(@NotBlank(message = "薪资汇款明细表唯一业务ID不能为空") @RequestParam(value = "salaryRemittanceBizId") String salaryRemittanceBizId);
 
     /**
+     * 根据转介人和薪资年月查询应发总金额
+     * @param request
+     * @return
+     */
+    @PostMapping("/get/grossAmount")
+    Result<BigDecimal> getGrossAmount(@Validated @RequestBody ApiSalaryGrossAmountRequest request);
+
+    /**
      * 薪资单信息-汇款明细-查询汇率
      * @param request
      * @return

yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/salary/ApiSalaryFeignFallbackFactory.java

@@ -76,6 +76,11 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
             }
 
             @Override
+            public Result<BigDecimal> getGrossAmount(ApiSalaryGrossAmountRequest request) {
+                return null;
+            }
+
+            @Override
             public Result<BigDecimal> getExchangeRate(ApiSalaryExchangeRateRequest request) {
                 return null;
             }

yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalaryGrossAmountRequest.java

+package com.yd.csf.feign.request.salary;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ApiSalaryGrossAmountRequest {
+
+    /**
+     * 转介人业务id
+     */
+    @NotBlank(message = "转介人业务id不能为空")
+    private String brokerBizId;
+
+    /**
+     * 薪资月份（同出账月，如：202605）
+     */
+    @NotBlank(message = "薪资月份不能为空")
+    private String month;
+
+}

yd-csf-service/src/main/java/com/yd/csf/service/service/FortuneAccountService.java

@@ -41,4 +41,6 @@ public interface FortuneAccountService extends IService<FortuneAccount> {
      FortuneAccountStatisticsVO getFortuneAccountStatistics(List<Long> fortuneAccountIdList);
 
     FortuneAccount queryOne(String fortuneAccountBizId);
+
+    List<FortuneAccount> queryList(String brokerBizId,String month,String status);
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java

@@ -2,7 +2,9 @@ package com.yd.csf.service.service.impl;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -501,6 +503,42 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
                 .last(" limit 1 ")
         );
     }
+
+    /**
+     * 查询出账记录列表
+     * @param brokerBizId 转介人唯一业务ID
+     * @param month       出账年月，例 202605
+     * @param status      出账状态
+     * @return
+     */
+    @Override
+    public List<FortuneAccount> queryList(String brokerBizId,
+                                          String month,
+                                          String status) {
+        LambdaQueryWrapper<FortuneAccount> wrapper = new LambdaQueryWrapper<>();
+
+        if (StringUtils.isNotBlank(brokerBizId)) {
+            wrapper.eq(FortuneAccount::getBrokerBizId, brokerBizId);
+        }
+
+        // 出账年月范围过滤（转换为当月第一天 ~ 当月最后一天）
+        if (StringUtils.isNotBlank(month)) {
+            YearMonth yearMonth = YearMonth.parse(month, DateTimeFormatter.ofPattern("yyyyMM"));
+            LocalDate startDate = yearMonth.atDay(1);
+            LocalDate endDate = yearMonth.atEndOfMonth();
+            wrapper.ge(FortuneAccount::getFortuneAccountDate, startDate)
+                    .le(FortuneAccount::getFortuneAccountDate, endDate);
+        }
+
+        if (StringUtils.isNotBlank(status)) {
+            wrapper.eq(FortuneAccount::getStatus, status);
+        }
+
+        wrapper.orderByDesc(FortuneAccount::getFortuneAccountDate);
+
+        // 执行查询
+        return list(wrapper);
+    }
 }