Merge remote-tracking branch 'origin/test' into test_zxm_user

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

@@ -5,9 +5,7 @@ import com.yd.common.result.Result;
 import com.yd.csf.api.service.ApiSalaryService;
 import com.yd.csf.feign.client.salary.ApiSalaryFeignClient;
 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.feign.response.salary.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 薪资单信息
@@ -180,5 +179,33 @@ public class ApiSalaryController implements ApiSalaryFeignClient {
         return apiSalaryService.calculateTotalAmount(request);
     }
 
+    /**
+     * 查询薪资单转介人列表信息
+     * @return
+     */
+    @Override
+    public Result<List<ApiSalaryBrokerListResponse>> brokerList(String name) {
+        return apiSalaryService.brokerList(name);
+    }
+
+    /**
+     * 电子薪资单-导出
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<ApiSalaryExportResponse> export(ApiSalaryExportRequest request) {
+        return apiSalaryService.export(request);
+    }
+
+    /**
+     * 条件查询-电子薪资单列表信息（查询已推送薪资单信息）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<ApiSalaryConditionListResponse> conditionList(ApiSalaryConditionListRequest request) {
+        return apiSalaryService.conditionList(request);
+    }
 
 }

yd-csf-api/src/main/java/com/yd/csf/api/dto/AlgorithmDto.java

@@ -16,6 +16,11 @@ import java.util.List;
 public class AlgorithmDto {
 
     /**
+     * 期数（数字代表第几年）
+     */
+    private Integer issueNumber;
+
+    /**
      * 保单发佣批次ID
      */
     private String batchBizId;

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

@@ -3,11 +3,10 @@ package com.yd.csf.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 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.feign.response.salary.*;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 public interface ApiSalaryService {
     Result<IPage<ApiSalaryPageResponse>> page(ApiSalaryPageRequest request);
@@ -39,4 +38,10 @@ public interface ApiSalaryService {
     Result<BigDecimal> calculatePaidAmount(ApiSalaryCalculatePaidAmountRequest request);
 
     Result<BigDecimal> calculateTotalAmount(ApiSalaryCalculateTotalAmountRequest request);
+
+    Result<ApiSalaryConditionListResponse> conditionList(ApiSalaryConditionListRequest request);
+
+    Result<ApiSalaryExportResponse> export(ApiSalaryExportRequest request);
+
+    Result<List<ApiSalaryBrokerListResponse>> brokerList(String name);
 }

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

@@ -17,6 +17,7 @@ import com.yd.csf.feign.request.basiclawcalculate.ApiGenerateBillingRequest;
 import com.yd.csf.feign.response.basiclawcalculate.ApiGenerateBillingResponse;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.enums.FortuneStatusEnum;
+import com.yd.csf.service.enums.RuleItemConfigEnum;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.service.*;
 import com.yd.insurance.base.feign.client.ApiRelProductAnnouncementFeignClient;
@@ -407,6 +408,16 @@ public class ApiBasicLawCalculateServiceImpl implements ApiBasicLawCalculateServ
         if (CollectionUtils.isEmpty(ruleItemConfigList)) {
             throw new BusinessException("基本法项目列表不存在");
         }
+        //根据期数字段，判断是否是续期（续年）来过滤对应的销售佣金项目，续期期数保留续期销售项目剔除首期的销售佣金项目，首期期数保留首期的销售佣金项目剔除续期销售佣金项目
+        if (algorithmDto.getIssueNumber() != null) {
+            if (algorithmDto.getIssueNumber() == 1) {
+                //首期->剔除非首期（续期）的销售佣金项目
+                ruleItemConfigList.removeIf(item -> RuleItemConfigEnum.XQ_XS_YJ.getItemCode().equals(item.getItemCode()));
+            }else {
+                //续期->剔除首期销售佣金项目
+                ruleItemConfigList.removeIf(item -> RuleItemConfigEnum.XS_YJ.getItemCode().equals(item.getItemCode()));
+            }
+        }
         log.info("查询基本法类型绑定的基本法项目列表 - 执行顺序，数值越小越先执行，用于控制佣金项目的计算顺序->出参：{}", JSON.toJSONString(algorithmDto));
         List<AlgorithmResDto> algorithmResDtoList = new ArrayList<>();
         //遍历基本法项目 - 计算对应值

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

@@ -546,7 +546,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                         resDto.setAlgorithmResDtoList(result.getData());
                         collectResDtos.add(resDto);
 
-                        if (!CollectionUtils.isEmpty(commissionRuleBindingList)) {
+                        //续年度只发销售佣金，其他奖项均不发放
+                        if (!CollectionUtils.isEmpty(commissionRuleBindingList) && i == 1) {
                             for (CommissionRuleBinding binding : commissionRuleBindingList) {
                                 Result<List<AlgorithmResDto>> result1 = executeReward(ExecuteBillingDto.builder()
                                         .clientUserBizId(binding.getTargetId())
@@ -793,6 +794,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
 
         //保单出账先执行销售佣金基本法项目，入完到积分明细表里后，再执行保单绑定人的其他基本法项目
         Result<List<AlgorithmResDto>> result = apiBasicLawCalculateService.policyBrokerAlgorithm(AlgorithmDto.builder()
+                .issueNumber(dto.getIssueNumber())
                 .brokerBizId(brokerDto.getBrokerBizId())
                 .clientUserBizId(brokerDto.getBrokerBizId())
                 .sqlTemplateParamDto(SqlTemplateParamDto.builder()

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

@@ -3,13 +3,17 @@ package com.yd.csf.feign.client.salary;
 import com.yd.common.result.Result;
 import com.yd.csf.feign.fallback.salary.ApiSalaryFeignFallbackFactory;
 import com.yd.csf.feign.request.salary.*;
+import com.yd.csf.feign.response.salary.ApiSalaryBrokerListResponse;
+import com.yd.csf.feign.response.salary.ApiSalaryConditionListResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryDetailResponse;
+import com.yd.csf.feign.response.salary.ApiSalaryExportResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 香港保险服务-薪资单信息Feign客户端
@@ -136,4 +140,27 @@ public interface ApiSalaryFeignClient {
      */
     @PostMapping("/calculate/totalAmount")
     Result<BigDecimal> calculateTotalAmount(@Validated @RequestBody ApiSalaryCalculateTotalAmountRequest request);
+
+    /**
+     * 查询薪资单转介人列表信息
+     * @return
+     */
+    @GetMapping("/broker/list")
+    Result<List<ApiSalaryBrokerListResponse>> brokerList(@RequestParam(value = "name",required = false) String name);
+
+    /**
+     * 电子薪资单-导出
+     * @param request
+     * @return
+     */
+    @PostMapping("/salary/export")
+    Result<ApiSalaryExportResponse> export(@Validated @RequestBody ApiSalaryExportRequest request);
+
+    /**
+     * 条件查询-电子薪资单列表信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/condition/list")
+    Result<ApiSalaryConditionListResponse> conditionList(@Validated @RequestBody ApiSalaryConditionListRequest request);
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/salary/ApiSalaryBatchAddDTO.java

@@ -49,11 +49,16 @@ public class ApiSalaryBatchAddDTO {
 
     //========以下是薪资汇款明细字段，两个汇款明细对象
     /**
-     * 收款银行1
+     * 收款银行1ID
      */
     private String bank1;
 
     /**
+     * 收款银行1名称
+     */
+    private String bank1Name;
+
+    /**
      * 账户尾号1
      */
     private String accountEndNo1;
@@ -79,11 +84,16 @@ public class ApiSalaryBatchAddDTO {
     private String remark1;
 
     /**
-     * 收款银行1
+     * 收款银行2ID
      */
     private String bank2;
 
     /**
+     * 收款银行2名称
+     */
+    private String bank2Name;
+
+    /**
      * 账户尾号1
      */
     private String accountEndNo2;

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/salaryremittance/ApiSalaryRemittanceDTO.java

@@ -13,11 +13,16 @@ public class ApiSalaryRemittanceDTO {
     private String salaryRemittanceBizId;
 
     /**
-     * 收款银行
+     * 收款银行ID
      */
     private String bank;
 
     /**
+     * 收款银行名称
+     */
+    private String bankName;
+
+    /**
      * 账户尾号
      */
     private String accountEndNo;

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

@@ -3,13 +3,17 @@ package com.yd.csf.feign.fallback.salary;
 import com.yd.common.result.Result;
 import com.yd.csf.feign.client.salary.ApiSalaryFeignClient;
 import com.yd.csf.feign.request.salary.*;
+import com.yd.csf.feign.response.salary.ApiSalaryBrokerListResponse;
+import com.yd.csf.feign.response.salary.ApiSalaryConditionListResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryDetailResponse;
+import com.yd.csf.feign.response.salary.ApiSalaryExportResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 香港保险服务-薪资单信息Feign降级处理
@@ -94,6 +98,21 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
             public Result<BigDecimal> calculateTotalAmount(ApiSalaryCalculateTotalAmountRequest request) {
                 return null;
             }
+
+            @Override
+            public Result<List<ApiSalaryBrokerListResponse>> brokerList(String name) {
+                return null;
+            }
+
+            @Override
+            public Result<ApiSalaryExportResponse> export(ApiSalaryExportRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result<ApiSalaryConditionListResponse> conditionList(ApiSalaryConditionListRequest request) {
+                return null;
+            }
         };
     }
 }

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

@@ -43,6 +43,11 @@ public class ApiSalaryAddRequest {
     private BigDecimal otherAmount;
 
     /**
+     * 通用备注
+     */
+    private String remark;
+
+    /**
      * 其他调整的备注
      */
     private String otherRemark;

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

+package com.yd.csf.feign.request.salary;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ApiSalaryConditionListRequest {
+
+    /**
+     * 手机号（用于和CSF系统人员信息匹配）
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+
+    /**
+     * 薪资年份（格式：yyyy）
+     */
+    @NotBlank(message = "薪资年份不能为空")
+    private String year;
+}

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

@@ -53,6 +53,11 @@ public class ApiSalaryEditRequest {
     private String otherRemark;
 
     /**
+     * 通用备注
+     */
+    private String remark;
+
+    /**
      * 实发总金额（单位：HKD）
      */
     private BigDecimal paidAmount;

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

+package com.yd.csf.feign.request.salary;
+
+import lombok.Data;
+
+@Data
+public class ApiSalaryExportRequest {
+
+    /**
+     * 转介人名称
+     */
+    private String brokerName;
+
+    /**
+     * 薪资月份（同出账月，如：202605）
+     */
+    private String month;
+
+    /**
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
+     */
+    private String status;
+
+}

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

@@ -15,4 +15,14 @@ public class ApiSalaryPageRequest extends PageDto {
      * 薪资月份（同出账月，如：202605）
      */
     private String month;
+
+    /**
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
+     */
+    private String status;
+
+    /**
+     * 发放编号
+     */
+    private String salaryNo;
 }

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

@@ -20,4 +20,9 @@ public class ApiSalaryPushPageRequest extends PageDto {
      * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
      */
     private String status;
+
+    /**
+     * 发放编号
+     */
+    private String salaryNo;
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryBrokerListResponse.java

+package com.yd.csf.feign.response.salary;
+
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class ApiSalaryBrokerListResponse {
+
+    /**
+     * 转介人
+     */
+    private String broker;
+
+    /**
+     * 转介人业务id
+     */
+    private String brokerBizId;
+
+    /**
+     * 内部编号
+     */
+    private String internalNumber;
+
+    /**
+     * 月份列表（格式： 202606）
+     */
+    private List<String> monthList;
+}

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryConditionListResponse.java

+package com.yd.csf.feign.response.salary;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiSalaryConditionListResponse {
+
+    /**
+     * 列表数量
+     */
+    private Integer count;
+
+    /**
+     * 薪资列表信息
+     */
+    private List<ApiSalaryConditionResponse> conditionResponseList;
+}

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryConditionResponse.java

+package com.yd.csf.feign.response.salary;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ApiSalaryConditionResponse {
+
+    /**
+     * 薪资单表唯一业务ID
+     */
+    private String salaryBizId;
+
+    /**
+     * 薪资年月（同出账月，如：xxxx年MM月）
+     */
+    private String yearMonth;
+
+    /**
+     * 实发总金额（单位：HKD）
+     */
+    private BigDecimal paidAmount;
+
+    /**
+     * 状态名称
+     */
+    private String statusName;
+}

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryDetailResponse.java

@@ -53,11 +53,31 @@ public class ApiSalaryDetailResponse {
     private String otherRemark;
 
     /**
+     * 通用备注
+     */
+    private String remark;
+
+    /**
      * 实发总金额（单位：HKD）
      */
     private BigDecimal paidAmount;
 
     /**
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
+     */
+    private String status;
+
+    /**
+     * 取消薪资备注
+     */
+    private String cancelRemark;
+
+    /**
+     * 转介人内部编号
+     */
+    private String internalNumber;
+
+    /**
      * 薪资汇款明细封装的DTO
      */
     private ApiSalaryRemittanceFzDTO apiSalaryRemittanceFzDTO;

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryExportResponse.java

+package com.yd.csf.feign.response.salary;
+
+import lombok.Data;
+
+@Data
+public class ApiSalaryExportResponse {
+
+    private String url;
+}

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPageResponse.java

 package com.yd.csf.feign.response.salary;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -18,6 +19,11 @@ public class ApiSalaryPageResponse {
     private String salaryBizId;
 
     /**
+     * 转介人业务id
+     */
+    private String brokerBizId;
+
+    /**
      * 转介人名称
      */
     private String brokerName;
@@ -60,5 +66,11 @@ public class ApiSalaryPageResponse {
     /**
      * 制作时间（创建时间）
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
+
+    /**
+     * 通用备注
+     */
+    private String remark;
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPushPageResponse.java

 package com.yd.csf.feign.response.salary;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -9,6 +10,16 @@ import java.time.LocalDateTime;
 public class ApiSalaryPushPageResponse {
 
     /**
+     * 薪资单表唯一业务ID
+     */
+    private String salaryBizId;
+
+    /**
+     * 发放编号
+     */
+    private String salaryNo;
+
+    /**
      * 转介人名称
      */
     private String brokerName;
@@ -51,5 +62,11 @@ public class ApiSalaryPushPageResponse {
     /**
      * 制作时间（创建时间）
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
+
+    /**
+     * 通用备注
+     */
+    private String remark;
 }

yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneQueryRequest.java

@@ -72,6 +72,18 @@ public class FortuneQueryRequest extends PageDto implements Serializable {
     private String payoutDateEnd;
 
     /**
+     * 出账年月（实）开始
+     */
+    @Schema(description = "出账年月（实）开始 格式：yyyy-MM")
+    private String actualPayoutDateStart;
+
+    /**
+     * 出账年月（实）结束
+     */
+    @Schema(description = "出账年月（实）结束 格式：yyyy-MM")
+    private String actualPayoutDateEnd;
+
+    /**
      * 检核年月
      */
     @Schema(description = "检核年月，格式：yyyy-MM")

yd-csf-service/src/main/java/com/yd/csf/service/enums/CommissionRuleConfigEnum.java

+package com.yd.csf.service.enums;
+
+/**
+ * 基本法类型枚举
+ */
+public enum CommissionRuleConfigEnum {
+
+    BZ_JBF("commission_rule_config_dJea6a7rM8j38zK5","RULE6623256596","标准基本法"),
+
+    ;
+
+    /**
+     * 基本法配置表唯一业务ID
+     */
+    private String ruleBizId;
+
+    /**
+     * 基本法编码
+     */
+    private String ruleCode;
+
+    /**
+     * 基本法名称
+     */
+    private String ruleName;
+
+    //构造函数
+    CommissionRuleConfigEnum(String ruleBizId, String ruleCode,String ruleName) {
+        this.ruleBizId = ruleBizId;
+        this.ruleCode = ruleCode;
+        this.ruleName = ruleName;
+    }
+
+    public String getRuleBizId() {
+        return ruleBizId;
+    }
+
+    public String getRuleCode() {
+        return ruleCode;
+    }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+}

yd-csf-service/src/main/java/com/yd/csf/service/enums/RuleItemConfigEnum.java

+package com.yd.csf.service.enums;
+
+/**
+ * 基本法项目枚举
+ */
+public enum RuleItemConfigEnum {
+
+    XS_YJ("rule_item_config_FePX0vpJQ9bU1vEo","commission_rule_config_dJea6a7rM8j38zK5","ITEM4736190590","销售佣金"),
+    XQ_XS_YJ("rule_item_config_Gxw21FGdwg29RFz","commission_rule_config_dJea6a7rM8j38zK5","ITEM4570368732","续期销售佣金"),
+
+    ;
+
+    /**
+     * 基本法项目配置表唯一业务ID
+     */
+    private String ruleItemBizId;
+
+    /**
+     * 基本法配置表唯一业务ID
+     */
+    private String ruleBizId;
+
+    /**
+     * 基本法项目编码
+     */
+    private String itemCode;
+
+    /**
+     * 基本法项目名称
+     */
+    private String itemName;
+
+    //构造函数
+    RuleItemConfigEnum(String ruleItemBizId, String ruleBizId,String itemCode,String itemName) {
+        this.ruleItemBizId = ruleItemBizId;
+        this.ruleBizId = ruleBizId;
+        this.itemCode = itemCode;
+        this.itemName = itemName;
+    }
+
+    public String getRuleItemBizId() {
+        return ruleItemBizId;
+    }
+
+    public String getRuleBizId() {
+        return ruleBizId;
+    }
+
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+}

yd-csf-service/src/main/java/com/yd/csf/service/model/Salary.java

 package com.yd.csf.service.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -148,7 +146,7 @@ public class Salary implements Serializable {
     /**
      * 创建人名称
      */
-    @TableField("creator_name")
+    @TableField(value = "creator_name", fill = FieldFill.INSERT)
     private String creatorName;
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/model/SalaryRemittance.java

@@ -44,12 +44,18 @@ public class SalaryRemittance implements Serializable {
     private String salaryBizId;
 
     /**
-     * 收款银行
+     * 收款银行ID
      */
     @TableField("bank")
     private String bank;
 
     /**
+     * 收款银行名称
+     */
+    @TableField("bank_name")
+    private String bankName;
+
+    /**
      * 账户尾号
      */
     @TableField("account_end_no")

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

@@ -45,4 +45,5 @@ public interface FortuneAccountService extends IService<FortuneAccount> {
     List<FortuneAccount> queryList(String brokerBizId,String month,String status);
 
     List<FortuneAccount> queryList(List<Map.Entry<String, String>> pairs, String status);
+
 }

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

@@ -4,6 +4,7 @@ import com.yd.csf.service.model.SalaryRemittance;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +21,11 @@ public interface ISalaryRemittanceService extends IService<SalaryRemittance> {
     List<SalaryRemittance> queryList(String salaryBizId);
 
     SalaryRemittance queryOne(String salaryRemittanceBizId);
+
+    /**
+     * 批量根据薪资单业务ID列表查询汇款明细，并按 salaryBizId 分组返回 Map
+     * @param salaryBizIds 薪资单业务ID列表
+     * @return Map<salaryBizId, List<SalaryRemittance>>
+     */
+    Map<String, List<SalaryRemittance>> queryListBySalaryBizIds(List<String> salaryBizIds);
 }

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

@@ -105,6 +105,21 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             // 2. 获取该月的最后一天
             payoutDateEnd = yearMonth.atEndOfMonth();
         }
+
+        // 出账年月（实）开始
+        LocalDate actualPayoutDateStart = null;
+        if (StringUtils.isNotBlank(fortuneQueryRequest.getActualPayoutDateStart())) {
+            actualPayoutDateStart = LocalDate.parse(fortuneQueryRequest.getActualPayoutDateStart() + "-01");
+        }
+        // 出账年月（实）结束 月最后一天
+        LocalDate actualPayoutDateEnd = null;
+        if (StringUtils.isNotBlank(fortuneQueryRequest.getActualPayoutDateEnd())) {
+            // 1. 先解析为 YearMonth (专门处理年月)
+            YearMonth yearMonth = YearMonth.parse(fortuneQueryRequest.getActualPayoutDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM"));
+            // 2. 获取该月的最后一天
+            actualPayoutDateEnd = yearMonth.atEndOfMonth();
+        }
+
         String brokerName = fortuneQueryRequest.getBrokerName();
 
         // 入账状态
@@ -116,8 +131,12 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         queryWrapper.in(CollUtil.isNotEmpty(insuranceCompanyBizIdList), "insurance_company_biz_id", insuranceCompanyBizIdList);
         queryWrapper.in(CollUtil.isNotEmpty(productLaunchBizIdList), "product_launch_biz_id", productLaunchBizIdList);
 
-        queryWrapper.gt(ObjectUtils.isNotEmpty(payoutDateStart), "payout_date", payoutDateStart);
-        queryWrapper.lt(ObjectUtils.isNotEmpty(payoutDateEnd), "payout_date", payoutDateEnd);
+        queryWrapper.ge(ObjectUtils.isNotEmpty(payoutDateStart), "payout_date", payoutDateStart);
+        queryWrapper.le(ObjectUtils.isNotEmpty(payoutDateEnd), "payout_date", payoutDateEnd);
+
+        queryWrapper.ge(ObjectUtils.isNotEmpty(actualPayoutDateStart), "actual_payout_date", actualPayoutDateStart);
+        queryWrapper.le(ObjectUtils.isNotEmpty(actualPayoutDateEnd), "actual_payout_date", actualPayoutDateEnd);
+
         queryWrapper.like(StringUtils.isNotBlank(brokerName), "broker", "%" + brokerName + "%");
 
         // 入账状态, 关联查询 commission_expected 表

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

@@ -5,9 +5,12 @@ import com.yd.csf.service.model.SalaryRemittance;
 import com.yd.csf.service.dao.SalaryRemittanceMapper;
 import com.yd.csf.service.service.ISalaryRemittanceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,4 +41,20 @@ public class SalaryRemittanceServiceImpl extends ServiceImpl<SalaryRemittanceMap
                 .eq(SalaryRemittance::getSalaryRemittanceBizId,salaryRemittanceBizId)
                 .last(" limit 1 "));
     }
+
+    @Override
+    public Map<String, List<SalaryRemittance>> queryListBySalaryBizIds(List<String> salaryBizIds) {
+        if (CollectionUtils.isEmpty(salaryBizIds)) {
+            return java.util.Collections.emptyMap();
+        }
+        // 批量查询
+        List<SalaryRemittance> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<SalaryRemittance>()
+                        .in(SalaryRemittance::getSalaryBizId, salaryBizIds)
+                        .orderByAsc(SalaryRemittance::getCreateTime) // 按需排序
+        );
+        // 按 salaryBizId 分组
+        return list.stream()
+                .collect(Collectors.groupingBy(SalaryRemittance::getSalaryBizId));
+    }
 }

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

@@ -3,6 +3,7 @@ package com.yd.csf.service.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.csf.feign.enums.SalaryStatusEnum;
 import com.yd.csf.feign.request.salary.ApiSalaryPageRequest;
 import com.yd.csf.feign.request.salary.ApiSalaryPushPageRequest;
 import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
@@ -42,6 +43,7 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
         return this.baseMapper.selectOne(new LambdaQueryWrapper<Salary>()
                 .eq(Salary::getBrokerBizId,brokerBizId)
                 .eq(Salary::getMonth,month)
+                .ne(Salary::getStatus, SalaryStatusEnum.YQX.getItemValue())
                 .ne(isExcludeMy,Salary::getSalaryBizId,salaryBizId)
                 .last(" limit 1 ")
         );

yd-csf-service/src/main/resources/mappers/SalaryMapper.xml

@@ -6,6 +6,7 @@
         SELECT
         s.salary_no,
         s.salary_biz_id,
+        s.broker_biz_id,
         s.broker_name,
         s.internal_number,
         s.paid_amount,
@@ -13,9 +14,11 @@
         s.status,
         s.creator_name,
         s.create_time,
+        s.remark,
         GROUP_CONCAT(DISTINCT sr.currency ORDER BY sr.currency SEPARATOR ';') AS currencyList
         FROM salary s
         LEFT JOIN salary_remittance sr ON s.salary_biz_id = sr.salary_biz_id AND sr.is_deleted = 0
+
         <where>
             <if test="request.brokerName != null and request.brokerName != ''">
                 AND s.broker_name LIKE CONCAT('%', #{request.brokerName}, '%')
@@ -23,6 +26,12 @@
             <if test="request.month != null and request.month != ''">
                 AND s.month = #{request.month}
             </if>
+            <if test="request.status != null and request.status != ''">
+                AND s.status = #{request.status}
+            </if>
+            <if test="request.salaryNo != null and request.salaryNo != ''">
+                AND s.salary_no LIKE CONCAT('%', #{request.salaryNo}, '%')
+            </if>
             AND s.is_deleted = 0
         </where>
         GROUP BY s.salary_biz_id
@@ -31,6 +40,7 @@
 
     <select id="pushPage" resultType="com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse">
         select
+        s.salary_biz_id,
         s.broker_name,
         s.month,
         s.paid_amount,
@@ -39,7 +49,9 @@
         s.other_remark,
         s.status,
         s.creator_name,
-        s.create_time
+        s.create_time,
+        s.salary_no,
+        s.remark
         from salary s
         <where>
             <if test="request.brokerName != null and request.brokerName != ''">
@@ -51,6 +63,9 @@
             <if test="request.status != null and request.status != ''">
                 AND s.status = #{request.status}
             </if>
+            <if test="request.salaryNo != null and request.salaryNo != ''">
+                AND s.salary_no LIKE CONCAT('%', #{request.salaryNo}, '%')
+            </if>
             AND s.is_deleted = 0
         </where>
     </select>