✨ 支持生成账单时选择收款账户
This commit is contained in:
+7
@@ -167,6 +167,13 @@ public class ArBillController extends BaseController {
|
||||
return success(account);
|
||||
}
|
||||
|
||||
/** 生成账单时选择同币种启用账户,账号只返回脱敏值。 */
|
||||
@PreAuthorize("@ss.hasPermi('ar:bill:generate')")
|
||||
@GetMapping("/bank-account-options")
|
||||
public AjaxResult bankAccountOptions(@RequestParam(defaultValue = "CNY") String currency) {
|
||||
return success(billService.selectMaskedBankAccounts(currency));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生成账单前的订单计费结果。
|
||||
*/
|
||||
|
||||
+116
@@ -0,0 +1,116 @@
|
||||
package com.bms.receivable;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.ArgumentMatchers.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import java.sql.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.bms.common.core.domain.model.LoginUser;
|
||||
import com.bms.common.exception.ServiceException;
|
||||
import com.bms.customer.customerinfo.domain.BmsCustomerOption;
|
||||
import com.bms.customer.customerinfo.mapper.BmsCustomerMapper;
|
||||
import com.bms.receivable.domain.ArBankAccount;
|
||||
import com.bms.receivable.domain.ArBill;
|
||||
import com.bms.receivable.domain.vo.ArBillGenerateRequest;
|
||||
import com.bms.receivable.mapper.ArBankAccountMapper;
|
||||
import com.bms.receivable.mapper.ArBillGenerateTaskMapper;
|
||||
import com.bms.receivable.mapper.ArBillMapper;
|
||||
import com.bms.receivable.security.ArBillScopeResolver;
|
||||
import com.bms.receivable.service.IArBillLogService;
|
||||
import com.bms.receivable.service.impl.ArBillServiceImpl;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
class ArBillGenerateBankAccountTest {
|
||||
private final ArBillServiceImpl service = new ArBillServiceImpl();
|
||||
private final ArBillMapper bills = mock(ArBillMapper.class);
|
||||
private final ArBankAccountMapper accounts = mock(ArBankAccountMapper.class);
|
||||
private final ArBillGenerateTaskMapper tasks = mock(ArBillGenerateTaskMapper.class);
|
||||
private final ArBillScopeResolver scope = mock(ArBillScopeResolver.class);
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
LoginUser login = new LoginUser();
|
||||
login.setUserId(1L);
|
||||
SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(login, null, List.of()));
|
||||
ReflectionTestUtils.setField(service, "billMapper", bills);
|
||||
ReflectionTestUtils.setField(service, "bankAccountMapper", accounts);
|
||||
ReflectionTestUtils.setField(service, "generateTaskMapper", tasks);
|
||||
ReflectionTestUtils.setField(service, "billScope", scope);
|
||||
ReflectionTestUtils.setField(service, "customerMapper", mock(BmsCustomerMapper.class));
|
||||
ReflectionTestUtils.setField(service, "eventPublisher", mock(ApplicationEventPublisher.class));
|
||||
ReflectionTestUtils.setField(service, "logService", mock(IArBillLogService.class));
|
||||
BmsCustomerOption customer = new BmsCustomerOption();
|
||||
customer.setCustomerCode("C1");
|
||||
customer.setCustomerName("客户");
|
||||
when(scope.requireCustomerAccessible(1L)).thenReturn(customer);
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void clearLogin() { SecurityContextHolder.clearContext(); }
|
||||
|
||||
@Test
|
||||
void selectedAccountIsValidatedAndSavedAsBillSnapshot() {
|
||||
ArBankAccount account = account("CNY");
|
||||
when(accounts.selectEnabledById(9L)).thenReturn(account);
|
||||
ArBillGenerateRequest request = request();
|
||||
request.setBankAccountId(9L);
|
||||
request.setBankAccountNo("前端伪造的账号");
|
||||
service.generateBill(request, "admin", "request-1");
|
||||
|
||||
ArgumentCaptor<ArBill> saved = ArgumentCaptor.forClass(ArBill.class);
|
||||
verify(bills).insertArBill(saved.capture());
|
||||
assertEquals(account.getAccountName(), saved.getValue().getBankAccountName());
|
||||
assertEquals(account.getAccountNo(), saved.getValue().getBankAccountNo());
|
||||
assertEquals(account.getBankName(), saved.getValue().getBankName());
|
||||
verify(accounts, never()).selectDefaultByCurrency(anyString());
|
||||
}
|
||||
|
||||
@Test
|
||||
void missingOrWrongCurrencyAccountCannotCreateBillAndOldRequestsUseDefault() {
|
||||
ArBillGenerateRequest request = request();
|
||||
request.setBankAccountId(9L);
|
||||
assertThrows(ServiceException.class, () -> service.generateBill(request, "admin", "missing"));
|
||||
when(accounts.selectEnabledById(9L)).thenReturn(account("USD"));
|
||||
assertThrows(ServiceException.class, () -> service.generateBill(request, "admin", "wrong-currency"));
|
||||
verify(bills, never()).insertArBill(any());
|
||||
|
||||
request.setBankAccountId(null);
|
||||
when(accounts.selectDefaultByCurrency("CNY")).thenReturn(account("CNY"));
|
||||
assertDoesNotThrow(() -> service.generateBill(request, "admin", "legacy"));
|
||||
verify(accounts).selectDefaultByCurrency("CNY");
|
||||
}
|
||||
|
||||
@Test
|
||||
void bankAccountOptionsMaskNumbersWithoutSpaces() {
|
||||
ArBankAccount account = account("CNY");
|
||||
when(accounts.selectEnabledList("CNY")).thenReturn(List.of(account));
|
||||
assertEquals("****2050", service.selectMaskedBankAccounts("CNY").get(0).getAccountNo());
|
||||
}
|
||||
|
||||
private static ArBankAccount account(String currency) {
|
||||
ArBankAccount account = new ArBankAccount();
|
||||
account.setAccountName("收款单位");
|
||||
account.setAccountNo("8602 1110 0008 9205 0");
|
||||
account.setBankName("开户行");
|
||||
account.setCurrency(currency);
|
||||
return account;
|
||||
}
|
||||
|
||||
private static ArBillGenerateRequest request() {
|
||||
ArBillGenerateRequest request = new ArBillGenerateRequest();
|
||||
request.setCustomerId(1L);
|
||||
request.setBillName("测试账单");
|
||||
request.setBillPeriodEnd(Date.valueOf("2026-10-31"));
|
||||
request.setSourceBillIds(List.of(1L));
|
||||
return request;
|
||||
}
|
||||
}
|
||||
+35
@@ -111,6 +111,41 @@ class ArBillTemplateSelectionTest {
|
||||
assertEquals("应收账单汇总模板", options.get(0).getTemplateName());
|
||||
}
|
||||
|
||||
@Test
|
||||
void fixedPayeeTemplatesRejectMismatchesBeforeCreatingExportTasks() {
|
||||
ArExportTemplate fixed = template(3L, ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE);
|
||||
fixed.setStorageKey("templates/receivable/ar_bill_template_gz.xlsx");
|
||||
when(templates.selectEnabledById(3L, "AR_BILL", bill.getBillDate())).thenReturn(fixed);
|
||||
bill.setBankAccountName("威狮国际供应链(深圳)有限公司广州分公司");
|
||||
bill.setBankAccountNo("44050129162500001250");
|
||||
bill.setBankName("中国建设银行股份有限公司广州设计之都支行");
|
||||
assertEquals(3L, service.exportBill(7L, 3L, "admin", "matching").getTemplateId());
|
||||
|
||||
bill.setBankAccountNo("1234567890");
|
||||
ServiceException error = assertThrows(ServiceException.class,
|
||||
() -> service.exportBill(7L, 3L, "admin", "mismatch"));
|
||||
assertTrue(error.getMessage().contains("收款信息"));
|
||||
verify(exports, times(1)).insert(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void fixedPayeeTemplateValidationChecksNameAccountAndBankForBothTemplates() {
|
||||
ArBillWorkbookWriters writers = new ArBillWorkbookWriters(new DefaultArBillWorkbookWriter(), new SummaryArBillWorkbookWriter());
|
||||
ArExportTemplate fixed = template(3L, ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE);
|
||||
fixed.setStorageKey("templates/receivable/ar_bill_template_jy.xlsx");
|
||||
bill.setBankAccountName("威狮国际集运物流(深圳)有限公司");
|
||||
bill.setBankAccountNo("86021110000892050");
|
||||
bill.setBankName("宁波银行深圳后海支行");
|
||||
assertDoesNotThrow(() -> writers.validatePayee(bill, fixed));
|
||||
bill.setBankName("其他银行");
|
||||
assertThrows(ServiceException.class, () -> writers.validatePayee(bill, fixed));
|
||||
bill.setBankName("宁波银行深圳后海支行");
|
||||
bill.setBankAccountName("其他公司");
|
||||
assertThrows(ServiceException.class, () -> writers.validatePayee(bill, fixed));
|
||||
bill.setBankAccountName(null);
|
||||
assertThrows(ServiceException.class, () -> writers.validatePayee(bill, fixed));
|
||||
}
|
||||
|
||||
@Test
|
||||
void mapperQueriesEnforceBusinessStatusEffectiveDatesAndTaskTemplate() throws Exception {
|
||||
Configuration configuration = new Configuration();
|
||||
|
||||
Reference in New Issue
Block a user