From 37e8ba46879a6094938ad685b1054eb6446ae749 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 23 五月 2020 19:13:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java index 088fe29..155359a 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java @@ -144,17 +144,17 @@ @Override public List<ScanHistoryV2> getScanHistoryByDeviceOrUid(Long uid, String device, int page, int pageSize, - Integer source) { + Integer source, boolean notBackSuVip) { if (uid == null && StringUtil.isNullOrEmpty(device)) return null; - return scanHistoryV2Mapper.selectByDeviceOrUid(uid, device, (page - 1) * pageSize, pageSize, source); + return scanHistoryV2Mapper.selectByDeviceOrUid(uid, device, (page - 1) * pageSize, pageSize, source, notBackSuVip); } @Override - public long getCountByDeviceOrUid(Long uid, String device, Integer source) { + public long getCountByDeviceOrUid(Long uid, String device, Integer source, boolean notBackSuVip) { if (uid == null && StringUtil.isNullOrEmpty(device)) return 0; - Long count = scanHistoryV2Mapper.selectCountByDeviceOrUid(uid, device, source); + Long count = scanHistoryV2Mapper.selectCountByDeviceOrUid(uid, device, source, notBackSuVip); return count == null ? 0 : count; } -- Gitblit v1.8.0