|
@@ -289,7 +289,7 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
|
|
|
//平台服务商
|
|
//平台服务商
|
|
|
QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
|
|
QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
|
|
|
queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
|
|
queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
|
|
|
- queryWrapperCpSubcontractor.eq("subcontractor_id", hlwPaymentEntity.getSubcontractorId());
|
|
|
|
|
|
|
+ queryWrapperCpSubcontractor.eq("subcontractor_id", hlwPayment.getSubcontractorId());
|
|
|
queryWrapperCpSubcontractor.le("start_date", now());
|
|
queryWrapperCpSubcontractor.le("start_date", now());
|
|
|
queryWrapperCpSubcontractor.ge("end_date", now());
|
|
queryWrapperCpSubcontractor.ge("end_date", now());
|
|
|
HlwCpSubcontractor hlwCpSubcontractor = hlwCpSubcontractorService.getOne(queryWrapperCpSubcontractor);
|
|
HlwCpSubcontractor hlwCpSubcontractor = hlwCpSubcontractorService.getOne(queryWrapperCpSubcontractor);
|
|
@@ -605,7 +605,7 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
|
|
|
//平台服务商
|
|
//平台服务商
|
|
|
QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
|
|
QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
|
|
|
queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
|
|
queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
|
|
|
- queryWrapperCpSubcontractor.eq("subcontractor_id", hlwPaymentEntity.getSubcontractorId());
|
|
|
|
|
|
|
+ queryWrapperCpSubcontractor.eq("subcontractor_id", hlwPayment.getSubcontractorId());
|
|
|
queryWrapperCpSubcontractor.le("start_date", now());
|
|
queryWrapperCpSubcontractor.le("start_date", now());
|
|
|
queryWrapperCpSubcontractor.ge("end_date", now());
|
|
queryWrapperCpSubcontractor.ge("end_date", now());
|
|
|
HlwCpSubcontractor hlwCpSubcontractor = hlwCpSubcontractorService.getOne(queryWrapperCpSubcontractor);
|
|
HlwCpSubcontractor hlwCpSubcontractor = hlwCpSubcontractorService.getOne(queryWrapperCpSubcontractor);
|