|
@@ -358,6 +358,8 @@ public class WorkerOldRefundManageLogic {
|
|
throw new RemoteServiceException("导入数据不能空");
|
|
throw new RemoteServiceException("导入数据不能空");
|
|
}
|
|
}
|
|
for (WebsitPartsSettlementRecord settlementRecord : partsSettlementRecords) {
|
|
for (WebsitPartsSettlementRecord settlementRecord : partsSettlementRecords) {
|
|
|
|
+ settlementRecord.setCompanyWechatId(adminUser.getCompanyWechatId())
|
|
|
|
+ .setCompanyWechatName(adminUser.getCompanyName());
|
|
if (StringUtils.isBlank(settlementRecord.getPgId()) || StringUtils.isBlank(settlementRecord.getWorkState()) ) {
|
|
if (StringUtils.isBlank(settlementRecord.getPgId()) || StringUtils.isBlank(settlementRecord.getWorkState()) ) {
|
|
throw new RemoteServiceException("导入的序号" + settlementRecord.getNo() + "数据异常,导入中止");
|
|
throw new RemoteServiceException("导入的序号" + settlementRecord.getNo() + "数据异常,导入中止");
|
|
}
|
|
}
|
|
@@ -388,6 +390,7 @@ public class WorkerOldRefundManageLogic {
|
|
List<WebsitPartsOldRefundManage> updateList = new ArrayList<>();
|
|
List<WebsitPartsOldRefundManage> updateList = new ArrayList<>();
|
|
for (List<String> pgIdList : splitList) {
|
|
for (List<String> pgIdList : splitList) {
|
|
final List<WebsitPartsOldRefundManage> partsOldRefundManageList = websitPartsOldRefundManageService.lambdaQuery()
|
|
final List<WebsitPartsOldRefundManage> partsOldRefundManageList = websitPartsOldRefundManageService.lambdaQuery()
|
|
|
|
+ .eq(WebsitPartsOldRefundManage::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
.in(WebsitPartsOldRefundManage::getPgId, pgIdList)
|
|
.in(WebsitPartsOldRefundManage::getPgId, pgIdList)
|
|
.eq(WebsitPartsOldRefundManage::getRepairFlag, repairFlag)
|
|
.eq(WebsitPartsOldRefundManage::getRepairFlag, repairFlag)
|
|
.eq(WebsitPartsOldRefundManage::getSettlementState, false)
|
|
.eq(WebsitPartsOldRefundManage::getSettlementState, false)
|
|
@@ -417,6 +420,7 @@ public class WorkerOldRefundManageLogic {
|
|
if(Collections.isEmpty(objects)) {
|
|
if(Collections.isEmpty(objects)) {
|
|
throw new RemoteServiceException("导入数据不能为空");
|
|
throw new RemoteServiceException("导入数据不能为空");
|
|
}
|
|
}
|
|
|
|
+ AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
StringBuilder msg = new StringBuilder();
|
|
StringBuilder msg = new StringBuilder();
|
|
LinkedHashSet<String> pgIds = new LinkedHashSet<>();
|
|
LinkedHashSet<String> pgIds = new LinkedHashSet<>();
|
|
for (Object data : objects) {
|
|
for (Object data : objects) {
|
|
@@ -429,6 +433,7 @@ public class WorkerOldRefundManageLogic {
|
|
List<List<String>> splitList = CollUtil.split(pgIds, 500);
|
|
List<List<String>> splitList = CollUtil.split(pgIds, 500);
|
|
for (List<String> pgIdList : splitList) {
|
|
for (List<String> pgIdList : splitList) {
|
|
final List<WebsitPartsOldRefundManage> partsOldRefundManageList = websitPartsOldRefundManageService.lambdaQuery()
|
|
final List<WebsitPartsOldRefundManage> partsOldRefundManageList = websitPartsOldRefundManageService.lambdaQuery()
|
|
|
|
+ .eq(WebsitPartsOldRefundManage::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
.in(WebsitPartsOldRefundManage::getPgId, pgIdList)
|
|
.in(WebsitPartsOldRefundManage::getPgId, pgIdList)
|
|
.eq(WebsitPartsOldRefundManage::getRepairFlag, repairFlag)
|
|
.eq(WebsitPartsOldRefundManage::getRepairFlag, repairFlag)
|
|
.list();
|
|
.list();
|