GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

按季导入商户 up

Browse Source
This commit is contained in:
zhuangdashia 2025-10-14 17:33:35 +08:00
parent 78a77537b7
commit a4b0c0c4d0
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
View File

@ -358,7 +358,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
lqw1.ne(mpsTraffic.getId() != null, MpsTraffic::getId, mpsTraffic.getId());
List<MpsTrafficVo> result1 = TrafficMapper.selectVoList(lqw1);
if (!result1.isEmpty()) {
throw new ServiceException("该代缴交警罚没款已存在，编号："+mpsTraffic.getTrafficNo());
throw new ServiceException("该代缴交警罚没款已存在,编号："+mpsTraffic.getTrafficNo());
}
}
//id

5
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/MpsImportNormalMerchant.java
View File

@ -70,6 +70,11 @@ public class MpsImportNormalMerchant extends TenantEntity {
*/
private String parentMerchantId;
/**
* 创建时间
*/
private Date createDate;
/**
* 来源
*/

7
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/bo/MpsImportNormalMerchantBo.java
View File

@ -68,6 +68,11 @@ public class MpsImportNormalMerchantBo extends BaseEntity {
*/
private String parentMerchantId;
/**
* 创建时间
*/
private Date createDate;
/**
* 来源
*/
@ -114,7 +119,7 @@ public class MpsImportNormalMerchantBo extends BaseEntity {
private String businessScope;
/**
* 经营范围（二级）
* 经营范围二级
*/
private String businessScopeSecondary;

10
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantImportVo.java
View File

@ -95,6 +95,13 @@ public class MpsImportNormalMerchantImportVo implements Serializable {
@ExcelProperty(value = "一级商户号")
private String parentMerchantId;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createDate;
/**
* 来源
*/
@ -152,8 +159,7 @@ public class MpsImportNormalMerchantImportVo implements Serializable {
/**
* 经营范围（二级）
*/
@ExcelProperty(value = "经营范围", converter = ExcelDictConvert.class)
// @ExcelDictFormat(readConverterExp = "二=级")
@ExcelProperty(value = "经营范围二级")
private String businessScopeSecondary;
/**

9
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantVo.java
View File

@ -85,6 +85,12 @@ public class MpsImportNormalMerchantVo implements Serializable {
@ExcelProperty(value = "一级商户号")
private String parentMerchantId;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createDate;
/**
* 来源
*/
@ -142,8 +148,7 @@ public class MpsImportNormalMerchantVo implements Serializable {
/**
* 经营范围（二级）
*/
@ExcelProperty(value = "经营范围", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "二=级")
@ExcelProperty(value = "经营范围二级")
private String businessScopeSecondary;
/**