|
@@ -87,7 +87,7 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
|
|
|
return null;
|
|
|
}
|
|
|
List<PayWay> list = payWayService.list(new LambdaQueryWrapper<PayWay>().eq(PayWay::getParentId, 0));
|
|
|
- Map<Integer, PayWay> payWayMap = list.stream().collect(Collectors.toMap(PayWay::getId, PayWay -> PayWay));
|
|
|
+ Map<Long, PayWay> payWayMap = list.stream().collect(Collectors.toMap(PayWay::getId, PayWay -> PayWay));
|
|
|
convert.getRecords().forEach(t -> {
|
|
|
PayWay payWayInfo = payWayMap.get(t.getPayWayId());
|
|
|
if (t.getPayWayId() == null || payWayInfo == null) {
|