diff --git a/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java b/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java index 575d0a1..4a9e549 100644 --- a/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java +++ b/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java @@ -59,7 +59,7 @@ public class MiTuExportScheduledTask { // WeeklyHeavyStockReport(); // QuarterlyProductGroupingReport(); // customerTypeAnalysis(); - getBestSell(); +// getBestSell(); } // public static void main(String[] args) { diff --git a/src/main/java/com/mixi/service/TAppProductService.java b/src/main/java/com/mixi/service/TAppProductService.java index 5797eb1..751cd99 100644 --- a/src/main/java/com/mixi/service/TAppProductService.java +++ b/src/main/java/com/mixi/service/TAppProductService.java @@ -181,8 +181,9 @@ public class TAppProductService extends ServiceImpl { } if (!StringUtils.isEmpty(query.getMemberCode())) { productIds.retainAll(byItemAndType); + }else { + productIds.addAll(byItemAndType); } - productIds.addAll(byItemAndType); } if (CollectionUtils.isEmpty(productIds)) { return PageBaseResponse.success(new Page<>());