|
|
@@ -125,7 +125,7 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public ResponseDTO<List<BlinkStorageMarginDTO>> supportsStorageMarginQuery(String providerId) {
|
|
|
+ public ResponseDTO<PageResult<BlinkStorageMarginDTO>> supportsStorageMarginQueryPage(BlinkProviderQry qry) {
|
|
|
BlinkStorageMarginDTO marginDTO = new BlinkStorageMarginDTO();
|
|
|
marginDTO.setProviderId("1");
|
|
|
marginDTO.setMarginName("入库保证金");
|
|
|
@@ -139,6 +139,11 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
|
|
|
List<BlinkStorageMarginDTO> marginDTOS = new ArrayList<>();
|
|
|
marginDTOS.add(marginDTO);
|
|
|
marginDTOS.add(marginDTO);
|
|
|
- return ResponseDTO.ok(marginDTOS);
|
|
|
+ marginDTOS.add(marginDTO);
|
|
|
+ marginDTOS.add(marginDTO);
|
|
|
+ marginDTOS.add(marginDTO);
|
|
|
+ Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
|
|
|
+ PageResult<BlinkStorageMarginDTO> pageResult = BlinkPageUtil.convert2PageResult(page, marginDTOS);
|
|
|
+ return ResponseDTO.ok(pageResult);
|
|
|
}
|
|
|
}
|