feat(shop): 新增电子围栏功能并重构仓库模块
- 添加 ShopStoreFence 实体类及相关数据库表映射 - 实现 ShopStoreFenceController 提供完整的 CRUD 操作接口 - 创建 ShopStoreFenceService 和 ShopStoreFenceServiceImpl 业务逻辑层 - 设计 ShopStoreFenceParam 查询参数类支持条件筛选 - 新建 ShopStoreFenceMapper 及其 XML 映射文件 - 将原有的 ShopWarehouse 重命名为 ShopStoreWarehouse 并更新相关引用 - 修改 GltTicketOrderMapper 和 ShopOrderMapper 中的仓库表关联关系 - 更新 ShopWarehouse 相关的所有控制器、服务、参数和映射文件命名 - 在订单相关查询中将 shop_warehouse 表替换为 shop_store_warehouse 表 - 为仓库控制器添加用户登录信息自动填充功能
This commit is contained in:
@@ -145,13 +145,13 @@ public class CreditJudicialDocumentController extends BaseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据企业名称匹配企业并更新 companyId(匹配 CreditCompany.name / CreditCompany.matchName)
|
* 根据“当事人/第三人”文本中包含的企业名称匹配企业并更新 companyId(匹配 CreditCompany.name / CreditCompany.matchName)
|
||||||
*
|
*
|
||||||
* <p>默认仅更新 companyId=0 的记录;如需覆盖更新,传 onlyNull=false。</p>
|
* <p>默认仅更新 companyId=0 的记录;如需覆盖更新,传 onlyNull=false。</p>
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("hasAuthority('credit:creditJudicialDocument:update')")
|
@PreAuthorize("hasAuthority('credit:creditJudicialDocument:update')")
|
||||||
@OperationLog
|
@OperationLog
|
||||||
@Operation(summary = "根据企业名称匹配并更新companyId")
|
@Operation(summary = "根据当事人字段包含企业名称匹配并更新companyId")
|
||||||
@PostMapping("/company-id/refresh")
|
@PostMapping("/company-id/refresh")
|
||||||
public ApiResult<Map<String, Object>> refreshCompanyIdByCompanyName(
|
public ApiResult<Map<String, Object>> refreshCompanyIdByCompanyName(
|
||||||
@RequestParam(value = "onlyNull", required = false, defaultValue = "true") Boolean onlyNull,
|
@RequestParam(value = "onlyNull", required = false, defaultValue = "true") Boolean onlyNull,
|
||||||
@@ -160,7 +160,7 @@ public class CreditJudicialDocumentController extends BaseController {
|
|||||||
User loginUser = getLoginUser();
|
User loginUser = getLoginUser();
|
||||||
Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
|
Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
|
||||||
|
|
||||||
BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
|
BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
|
||||||
creditJudicialDocumentService,
|
creditJudicialDocumentService,
|
||||||
creditCompanyService,
|
creditCompanyService,
|
||||||
currentTenantId,
|
currentTenantId,
|
||||||
@@ -168,13 +168,14 @@ public class CreditJudicialDocumentController extends BaseController {
|
|||||||
limit,
|
limit,
|
||||||
CreditJudicialDocument::getId,
|
CreditJudicialDocument::getId,
|
||||||
CreditJudicialDocument::setId,
|
CreditJudicialDocument::setId,
|
||||||
CreditJudicialDocument::getAppellee,
|
|
||||||
CreditJudicialDocument::getCompanyId,
|
CreditJudicialDocument::getCompanyId,
|
||||||
CreditJudicialDocument::setCompanyId,
|
CreditJudicialDocument::setCompanyId,
|
||||||
CreditJudicialDocument::getHasData,
|
CreditJudicialDocument::getHasData,
|
||||||
CreditJudicialDocument::setHasData,
|
CreditJudicialDocument::setHasData,
|
||||||
CreditJudicialDocument::getTenantId,
|
CreditJudicialDocument::getTenantId,
|
||||||
CreditJudicialDocument::new
|
CreditJudicialDocument::new,
|
||||||
|
// 需求:otherPartiesThirdParty 字段包含企业名称时,回填 companyId
|
||||||
|
CreditJudicialDocument::getOtherPartiesThirdParty
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!stats.anyDataRead) {
|
if (!stats.anyDataRead) {
|
||||||
|
|||||||
Reference in New Issue
Block a user