|
@@ -231,7 +231,7 @@ public class StatisticsDataScheduler {
|
|
|
List<GoodsDonSku> goodsDonSkus = Optional.ofNullable(goodsDonSkuService.list(Wrappers.lambdaQuery(GoodsDonSku.class).in(GoodsDonSku::getId, skuIdMaps.keySet()))).orElse(new ArrayList<>());
|
|
List<GoodsDonSku> goodsDonSkus = Optional.ofNullable(goodsDonSkuService.list(Wrappers.lambdaQuery(GoodsDonSku.class).in(GoodsDonSku::getId, skuIdMaps.keySet()))).orElse(new ArrayList<>());
|
|
|
for (GoodsDonSku donSkus : goodsDonSkus) {
|
|
for (GoodsDonSku donSkus : goodsDonSkus) {
|
|
|
int size = skuIdMaps.get(donSkus.getId()).size();
|
|
int size = skuIdMaps.get(donSkus.getId()).size();
|
|
|
- if (donSkus.getSpecVal().contains(payType.get(0))) {
|
|
|
|
|
|
|
+ if (donSkus.getSpecVal().contains(payType.get(0)) && !donSkus.getSpecVal().contains(payType.get(2))) {
|
|
|
numOfMonthOrder += size;
|
|
numOfMonthOrder += size;
|
|
|
} else if (donSkus.getSpecVal().contains(payType.get(1))) {
|
|
} else if (donSkus.getSpecVal().contains(payType.get(1))) {
|
|
|
numOfSeasonOrder += size;
|
|
numOfSeasonOrder += size;
|