Skip to content

Y
yd-csf
Commit 8faa5287 by zhangxingmin
Options

Merge remote-tracking branch 'origin/dev' into prod

parents 4145799a de226113
Showing with 587 additions and 34 deletions
.idea/encodings.xml
......@@ -5,7 +5,6 @@
<file url="file://$PROJECT_DIR$/yd-csf-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/yd-csf-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/yd-csf-feign/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/yd-csf-feign/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/yd-csf-service/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/yd-csf-service/src/main/resources" charset="UTF-8" />
</component>
......
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiSalaryController.java
......@@ -5,10 +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.ApiSalaryBrokerListResponse;
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;
......@@ -191,5 +188,24 @@ public class ApiSalaryController implements ApiSalaryFeignClient {
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/service/ApiSalaryService.java
......@@ -3,10 +3,7 @@ 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.ApiSalaryBrokerListResponse;
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;
......@@ -42,5 +39,9 @@ public interface ApiSalaryService {
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/ApiSalaryServiceImpl.java
......@@ -18,10 +18,7 @@ import com.yd.csf.feign.dto.salaryremittance.ApiSalaryRemittanceDTO;
import com.yd.csf.feign.dto.salaryremittance.ApiSalaryRemittanceFzDTO;
import com.yd.csf.feign.enums.SalaryStatusEnum;
import com.yd.csf.feign.request.salary.*;
import com.yd.csf.feign.response.salary.ApiSalaryBrokerListResponse;
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 com.yd.csf.service.enums.FortuneAccountStatusEnum;
import com.yd.csf.service.model.FortuneAccount;
import com.yd.csf.service.model.PolicyFollow;
......@@ -33,6 +30,10 @@ import com.yd.csf.service.service.ISalaryService;
import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandListRequest;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
import com.yd.oss.feign.client.ApiExcelFeignClient;
import com.yd.oss.feign.dto.ExportResult;
import com.yd.oss.feign.dto.SheetExportConfig;
import com.yd.oss.feign.request.MultiSheetExportRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
......@@ -43,7 +44,9 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
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;
......@@ -73,6 +76,9 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
@Resource
private ApiUserSaleExpandFeignClient apiUserSaleExpandFeignClient;
@Autowired
private ApiExcelFeignClient apiExcelFeignClient;
/**
* 分页查询-制作薪资单列表信息
* @param request
......@@ -158,6 +164,18 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
}
fzDTO.setSalaryRemittanceDTOList(salaryRemittanceDTOList);
response.setApiSalaryRemittanceFzDTO(fzDTO);
//查询转介人信息
List<String> clientUserBizIdList = new ArrayList<>();
clientUserBizIdList.add(salary.getBrokerBizId());
ApiUserSaleExpandListRequest request = new ApiUserSaleExpandListRequest();
request.setClientUserBizIdList(clientUserBizIdList);
Result<List<ApiUserSaleExpandDetailResponse>> result = apiUserSaleExpandFeignClient.list(request);
if (CollectionUtils.isNotEmpty(result.getData())) {
List<ApiUserSaleExpandDetailResponse> responses = result.getData();
ApiUserSaleExpandDetailResponse detailResponse = responses.get(0);
response.setInternalNumber(detailResponse.getInternalNumber());
}
return Result.success(response);
}
......@@ -256,7 +274,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
throw new BusinessException("薪资单信息不存在");
}
if (!SalaryStatusEnum.DHD.getItemValue().equals(salary.getStatus())) {
throw new BusinessException("非待核对状态不能核对");
throw new BusinessException("必须待核对状态下，才能核对");
}
salary.setStatus(request.getStatus() == 1 ? SalaryStatusEnum.YHD.getItemValue() : SalaryStatusEnum.TH.getItemValue());
salary.setReturnRemark(request.getReturnRemark());
......@@ -276,7 +294,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
throw new BusinessException("薪资单信息不存在");
}
if (!SalaryStatusEnum.YHD.getItemValue().equals(salary.getStatus())) {
throw new BusinessException("非已核对状态不能推送");
throw new BusinessException("必须已核对状态下，才能推送");
}
salary.setStatus(SalaryStatusEnum.YTS.getItemValue());
iSalaryService.saveOrUpdate(salary);
......@@ -331,6 +349,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
remittance1.setSalaryBizId(salary.getSalaryBizId());
remittance1.setSalaryRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY_REMITTANCE.getCode()));
remittance1.setBank(dto.getBank1());
remittance1.setBankName(dto.getBank1Name());
remittance1.setAccountEndNo(dto.getAccountEndNo1());
remittance1.setCurrency(dto.getCurrency1());
remittance1.setAmount(dto.getAmount1());
......@@ -341,6 +360,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
remittance2.setSalaryBizId(salary.getSalaryBizId());
remittance2.setSalaryRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY_REMITTANCE.getCode()));
remittance2.setBank(dto.getBank2());
remittance2.setBankName(dto.getBank2Name());
remittance2.setAccountEndNo(dto.getAccountEndNo2());
remittance2.setCurrency(dto.getCurrency2());
remittance2.setAmount(dto.getAmount2());
......@@ -451,6 +471,287 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
}
/**
* 条件查询-电子薪资单列表信息
* @param request
* @return
*/
@Override
public Result<ApiSalaryConditionListResponse> conditionList(ApiSalaryConditionListRequest request) {
// 1. 根据手机号查询转介人信息
ApiUserSaleExpandListRequest listRequest = new ApiUserSaleExpandListRequest();
listRequest.setPhone(request.getMobile());
Result<List<ApiUserSaleExpandDetailResponse>> result = apiUserSaleExpandFeignClient.list(listRequest);
if (CollectionUtils.isEmpty(result.getData())) {
// 无转介人信息，返回空列表
ApiSalaryConditionListResponse response = new ApiSalaryConditionListResponse();
response.setCount(0);
response.setConditionResponseList(Collections.emptyList());
return Result.success(response);
}
// 取第一个转介人（通常一个手机号对应一个转介人）
ApiUserSaleExpandDetailResponse userDetail = result.getData().get(0);
String brokerBizId = userDetail.getClientUserBizId();
if (StringUtils.isBlank(brokerBizId)) {
// 转介人业务ID为空，返回空列表
ApiSalaryConditionListResponse response = new ApiSalaryConditionListResponse();
response.setCount(0);
response.setConditionResponseList(Collections.emptyList());
return Result.success(response);
}
// 2. 根据转介人业务ID和年份查询薪资单
String year = request.getYear();
LambdaQueryWrapper<Salary> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Salary::getBrokerBizId, brokerBizId)
.likeRight(Salary::getMonth, year) // month 为 yyyyMM，匹配前四位年份
.eq(Salary::getIsDeleted, 0)
.eq(Salary::getStatus, SalaryStatusEnum.YTS.getItemValue()) //已推送状态
.orderByDesc(Salary::getMonth); // 按月份降序排列（最近的在前面）
List<Salary> salaryList = iSalaryService.list(wrapper);
if (CollectionUtils.isEmpty(salaryList)) {
ApiSalaryConditionListResponse response = new ApiSalaryConditionListResponse();
response.setCount(0);
response.setConditionResponseList(Collections.emptyList());
return Result.success(response);
}
// 3. 转换为响应对象
List<ApiSalaryConditionResponse> conditionResponseList = salaryList.stream()
.map(salary -> {
ApiSalaryConditionResponse resp = new ApiSalaryConditionResponse();
resp.setSalaryBizId(salary.getSalaryBizId());
// 格式化月份为 "xxxx年MM月"
String month = salary.getMonth();
String yearMonth = formatYearMonth(month);
resp.setYearMonth(yearMonth);
resp.setPaidAmount(salary.getPaidAmount());
// 状态名称转换
// resp.setStatusName(getStatusDesc(salary.getStatus()));
resp.setStatusName("已发放");
return resp;
})
.collect(Collectors.toList());
// 4. 组装最终响应
ApiSalaryConditionListResponse response = new ApiSalaryConditionListResponse();
response.setCount(conditionResponseList.size());
response.setConditionResponseList(conditionResponseList);
return Result.success(response);
}
/**
* 将 yyyyMM 格式的月份转为 xxxx年MM月
*/
private String formatYearMonth(String month) {
if (StringUtils.isBlank(month) || month.length() != 6) {
return month;
}
try {
String year = month.substring(0, 4);
String mm = month.substring(4, 6);
return year + "年" + mm + "月";
} catch (Exception e) {
return month;
}
}
/**
* 电子薪资单-导出
* @param request
* @return
*/
@Override
public Result<ApiSalaryExportResponse> export(ApiSalaryExportRequest request) {
// 1. 构建查询条件
LambdaQueryWrapper<Salary> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Salary::getIsDeleted, 0);
if (StringUtils.isNotBlank(request.getBrokerName())) {
wrapper.like(Salary::getBrokerName, request.getBrokerName());
}
if (StringUtils.isNotBlank(request.getMonth())) {
wrapper.eq(Salary::getMonth, request.getMonth());
}
if (StringUtils.isNotBlank(request.getStatus())) {
wrapper.eq(Salary::getStatus, request.getStatus());
}
// 按创建时间排序（可选）
wrapper.orderByAsc(Salary::getCreateTime);
// 2. 查询薪资单列表
List<Salary> salaryList = iSalaryService.list(wrapper);
if (CollectionUtils.isEmpty(salaryList)) {
throw new BusinessException("未查询到符合条件的薪资单数据");
}
// 3. 收集所有转介人业务ID，批量查询团队和内部编号（避免循环调用Feign）
List<String> brokerBizIds = salaryList.stream()
.map(Salary::getBrokerBizId)
.filter(StringUtils::isNotBlank)
.distinct()
.collect(Collectors.toList());
Map<String, ApiUserSaleExpandDetailResponse> expandMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(brokerBizIds)) {
ApiUserSaleExpandListRequest expandRequest = new ApiUserSaleExpandListRequest();
expandRequest.setClientUserBizIdList(brokerBizIds);
Result<List<ApiUserSaleExpandDetailResponse>> expandResult =
apiUserSaleExpandFeignClient.list(expandRequest);
if (expandResult != null && CollectionUtils.isNotEmpty(expandResult.getData())) {
expandMap = expandResult.getData().stream()
.collect(Collectors.toMap(
ApiUserSaleExpandDetailResponse::getClientUserBizId,
Function.identity(),
(v1, v2) -> v1
));
}
}
// 4. 批量查询所有汇款明细（按 salaryBizId 分组）
List<String> salaryBizIds = salaryList.stream()
.map(Salary::getSalaryBizId)
.collect(Collectors.toList());
Map<String, List<SalaryRemittance>> remittanceMap =
iSalaryRemittanceService.queryListBySalaryBizIds(salaryBizIds);
// 5. 构建汇总总表数据（每个Salary一行）
List<Map<String, Object>> summaryList = new ArrayList<>();
// 6. 构建打款明细数据（每个Remittance一行）
List<Map<String, Object>> detailList = new ArrayList<>();
for (Salary salary : salaryList) {
// 获取团队和内部编号
String brokerBizId = salary.getBrokerBizId();
String teamName = "";
String internalNumber = salary.getInternalNumber() != null ? salary.getInternalNumber() : "";
if (StringUtils.isNotBlank(brokerBizId) && expandMap.containsKey(brokerBizId)) {
ApiUserSaleExpandDetailResponse detail = expandMap.get(brokerBizId);
teamName = detail.getTeamName() != null ? detail.getTeamName() : "";
if (StringUtils.isBlank(internalNumber)) {
internalNumber = detail.getInternalNumber() != null ? detail.getInternalNumber() : "";
}
}
// --- 汇总行 ---
Map<String, Object> summaryRow = new LinkedHashMap<>();
summaryRow.put("发放编号", salary.getSalaryNo());
summaryRow.put("所属团队", teamName);
summaryRow.put("姓名", salary.getBrokerName());
summaryRow.put("内部编号", internalNumber);
summaryRow.put("薪资月份", formatMonth(salary.getMonth()));
summaryRow.put("应发金额(HKD)", nullToZero(salary.getGrossAmount()));
summaryRow.put("MPF(HK)", nullToZero(salary.getMpfAmount()));
summaryRow.put("其他调整(HKD)", nullToZero(salary.getOtherAmount()));
summaryRow.put("实发金额(HKD)", nullToZero(salary.getPaidAmount()));
summaryRow.put("扣款合计", nullToZero(salary.getGrossAmount()).subtract(nullToZero(salary.getPaidAmount())));//扣款合计 = 应发-实发
summaryRow.put("备注", salary.getRemark() != null ? salary.getRemark() : "");
List<SalaryRemittance> rems = remittanceMap.getOrDefault(salary.getSalaryBizId(), Collections.emptyList());
summaryRow.put("打款账户数", rems.size());
summaryRow.put("发放状态", getStatusDesc(salary.getStatus()));
summaryRow.put("备注", salary.getRemark() != null ? salary.getRemark() : ""); // 第二个备注
summaryRow.put("制作人", salary.getCreatorName() != null ? salary.getCreatorName() : "");
summaryRow.put("制作时间", salary.getCreateTime() != null ?
salary.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : "");
summaryList.add(summaryRow);
// --- 明细行 ---
for (SalaryRemittance rem : rems) {
Map<String, Object> detailRow = new LinkedHashMap<>();
detailRow.put("发放编号", salary.getSalaryNo());
detailRow.put("所属团队", teamName);
detailRow.put("姓名", salary.getBrokerName());
detailRow.put("内部编号", internalNumber);
detailRow.put("薪资月份", formatMonth(salary.getMonth()));
detailRow.put("收款银行", rem.getBankName());
detailRow.put("账户尾号", rem.getAccountEndNo() != null ? rem.getAccountEndNo() : "");
detailRow.put("币种", rem.getCurrency() != null ? rem.getCurrency() : "");
detailRow.put("发放金额", nullToZero(rem.getAmount()));
detailRow.put("汇率", nullToZero(rem.getExchangeRate()));
detailRow.put("备注", rem.getRemark() != null ? rem.getRemark() : "");
detailList.add(detailRow);
}
}
// 7. 组装多 Sheet 导出请求
MultiSheetExportRequest exportRequest = new MultiSheetExportRequest();
// Sheet1: 汇总总表
SheetExportConfig sheet1 = new SheetExportConfig();
sheet1.setSheetName("汇总总表");
sheet1.setFieldNames(Arrays.asList(
"发放编号", "所属团队", "姓名", "内部编号", "薪资月份",
"应发金额(HKD)", "MPF(HK)", "其他调整(HKD)", "实发金额(HKD)",
"扣款合计", "备注", "打款账户数", "发放状态",
"备注", "制作人", "制作时间"
));
sheet1.setDataList(summaryList);
// Sheet2: 打款明细
SheetExportConfig sheet2 = new SheetExportConfig();
sheet2.setSheetName("打款明细");
sheet2.setFieldNames(Arrays.asList(
"发放编号", "所属团队", "姓名", "内部编号", "薪资月份",
"收款银行", "账户尾号", "币种", "发放金额", "汇率", "备注"
));
sheet2.setDataList(detailList);
exportRequest.setSheets(Arrays.asList(sheet1, sheet2));
exportRequest.setFileName("电子薪资单_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
exportRequest.setUploadToOss(true);
// 8. 调用 Feign 导出
Result<ExportResult> feignResult = apiExcelFeignClient.exportMultiSheet(exportRequest);
if (feignResult == null || feignResult.getCode() != 200) {
String errMsg = feignResult != null ? feignResult.getMsg() : "Feign调用失败";
throw new BusinessException("导出失败: " + errMsg);
}
// 9. 返回 URL
ApiSalaryExportResponse response = new ApiSalaryExportResponse();
response.setUrl(feignResult.getData().getOssUrl());
return Result.success(response);
}
/**
* 将 yyyyMM 格式转为 yyyy-MM（便于阅读）
*/
private String formatMonth(String month) {
if (StringUtils.isBlank(month) || month.length() != 6) {
return month;
}
try {
return month.substring(0, 4) + "-" + month.substring(4, 6);
} catch (Exception e) {
return month;
}
}
private BigDecimal nullToZero(BigDecimal value) {
return value != null ? value : BigDecimal.ZERO;
}
/**
* 状态码转中文描述
* @param status 状态值（如 "1"）
* @return 中文描述
*/
private String getStatusDesc(String status) {
if (status == null) {
return "";
}
// 根据数据库注释：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
switch (status) {
case "1": return "待提交";
case "2": return "待核对";
case "3": return "已核对";
case "4": return "退回";
case "5": return "已推送";
case "6": return "已取消";
default: return status;
}
}
/**
* 查询薪资单转介人列表信息
* @return
*/
......@@ -497,13 +798,15 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
//获取转介人详细详细列表
List<String> bizIdList = bizIdSet.stream().collect(Collectors.toList());
ApiUserSaleExpandListRequest request = new ApiUserSaleExpandListRequest();
request.setClientUserBizIdList(bizIdList);
Result<List<ApiUserSaleExpandDetailResponse>> result = apiUserSaleExpandFeignClient.list(request);
Map<String, ApiUserSaleExpandDetailResponse> policyFollowMap = null;
if (CollectionUtils.isNotEmpty(result.getData())) {
policyFollowMap = result.getData().stream()
.collect(Collectors.toMap(ApiUserSaleExpandDetailResponse::getClientUserBizId, Function.identity()));
if (CollectionUtils.isNotEmpty(bizIdList)) {
ApiUserSaleExpandListRequest request = new ApiUserSaleExpandListRequest();
request.setClientUserBizIdList(bizIdList);
Result<List<ApiUserSaleExpandDetailResponse>> result = apiUserSaleExpandFeignClient.list(request);
if (CollectionUtils.isNotEmpty(result.getData())) {
policyFollowMap = result.getData().stream()
.collect(Collectors.toMap(ApiUserSaleExpandDetailResponse::getClientUserBizId, Function.identity()));
}
}
// 组装响应对象
List<ApiSalaryBrokerListResponse> resultList = new ArrayList<>();
......@@ -634,12 +937,12 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
//创建需要校验的key值
List<String> checkKeys = new ArrayList<>();
for (ApiSalaryBatchAddDTO addDTO : apiSalaryBatchAddDTOList) {
//获取2条汇款明细的发放金额总和
BigDecimal totalAmount = statisticsAmountByBatchAdd(addDTO);
//校验totalAmount和实发金额是否相等
BigDecimal paidAmount = ObjectUtils.defaultIfNull(addDTO.getPaidAmount(), BigDecimal.ZERO);
if (paidAmount.compareTo(totalAmount) != 0){
//汇款明细合计总金额和实发总金额必须相等，记录key值
// 四舍五入保留两位小数后再比较
BigDecimal paidScaled = paidAmount.setScale(2, RoundingMode.HALF_UP);
BigDecimal totalScaled = totalAmount.setScale(2, RoundingMode.HALF_UP);
if (paidScaled.compareTo(totalScaled) != 0) {
String key = addDTO.getBrokerBizId() + "|" + addDTO.getMonth();
checkKeys.add(key);
}
......@@ -765,12 +1068,14 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
* @param totalAmount
* @return
*/
public void checkAmount(BigDecimal paidAmount,BigDecimal totalAmount) {
public void checkAmount(BigDecimal paidAmount, BigDecimal totalAmount) {
paidAmount = ObjectUtils.defaultIfNull(paidAmount, BigDecimal.ZERO);
totalAmount = ObjectUtils.defaultIfNull(totalAmount, BigDecimal.ZERO);
if (paidAmount.compareTo(totalAmount) != 0) {
//汇款明细合计总金额和实发总金额必须相等
throw new BusinessException("汇款明细合计总金额和实发总金额必须相等");
// 统一保留两位小数后比较
BigDecimal paidScaled = paidAmount.setScale(2, RoundingMode.HALF_UP);
BigDecimal totalScaled = totalAmount.setScale(2, RoundingMode.HALF_UP);
if (paidScaled.compareTo(totalScaled) != 0) {
throw new BusinessException("汇款明细合计总金额和实发总金额必须相等（精确到分）");
}
}
......
yd-csf-feign/src/main/java/com/yd/csf/feign/client/salary/ApiSalaryFeignClient.java
......@@ -4,7 +4,9 @@ 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.*;
......@@ -145,4 +147,20 @@ public interface ApiSalaryFeignClient {
*/
@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
......@@ -4,7 +4,9 @@ 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;
......@@ -101,6 +103,16 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
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/ApiSalaryConditionListRequest.java 0 → 100644
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/ApiSalaryExportRequest.java 0 → 100644
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
......@@ -20,4 +20,9 @@ public class ApiSalaryPageRequest extends PageDto {
* 薪资单状态：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/ApiSalaryConditionListResponse.java 0 → 100644
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 0 → 100644
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
......@@ -63,6 +63,21 @@ public class ApiSalaryDetailResponse {
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 0 → 100644
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
......@@ -68,4 +68,9 @@ 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;
......@@ -14,6 +15,11 @@ public class ApiSalaryPushPageResponse {
private String salaryBizId;
/**
* 发放编号
*/
private String salaryNo;
/**
* 转介人名称
*/
private String brokerName;
......@@ -56,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/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/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/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
......@@ -14,6 +14,7 @@
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
......@@ -28,6 +29,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>
GROUP BY s.salary_biz_id
......@@ -45,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 != ''">
......@@ -57,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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment