|
|
@@ -297,7 +297,7 @@ public class StatisticsDataDayServiceImpl implements StatisticsDataDayService {
|
|
|
*/
|
|
|
private void streamingAccountDataStatistics(Long goodsId, Boolean isSkuStatistics, StreamingAccountData streamingAccountData, List<StreamingAccountData> dataSave, Date yesZeroDate, Date thisZeroDate) {
|
|
|
//规格
|
|
|
- List<GoodsDonSku> skuList = Optional.ofNullable(goodsDonSkuService.list(Wrappers.lambdaQuery(GoodsDonSku.class).eq(GoodsDonSku::getGoodsId, goodsId).select(GoodsDonSku::getId))).orElse(new ArrayList<>());
|
|
|
+ List<GoodsDonSku> skuList = Optional.ofNullable(goodsDonSkuService.list(Wrappers.lambdaQuery(GoodsDonSku.class).eq(GoodsDonSku::getGoodsId, goodsId).select(GoodsDonSku::getId, GoodsDonSku::getIsMirror, GoodsDonSku::getNum))).orElse(new ArrayList<>());
|
|
|
List<Long> skuIds = skuList.stream().map(GoodsDonSku::getId).collect(Collectors.toList());
|
|
|
if (CollUtil.isNotEmpty(skuIds)) {
|
|
|
List<OrderDon> orderDons = Optional.ofNullable(accountService.getNoAppleOneOrderDon(skuIds, yesZeroDate, thisZeroDate, Constant.noOrderStatus)).orElse(new ArrayList<>());
|
|
|
@@ -334,11 +334,11 @@ public class StatisticsDataDayServiceImpl implements StatisticsDataDayService {
|
|
|
mirrorSkuIds.add(sku.getId());
|
|
|
continue;
|
|
|
}
|
|
|
- if (sku.getNum() == 1) {
|
|
|
+ if (sku.getNum() != null && sku.getNum() == 1) {
|
|
|
singleSkuIds.add(sku.getId());
|
|
|
continue;
|
|
|
}
|
|
|
- if (sku.getNum() > 1) {
|
|
|
+ if (sku.getNum() != null && sku.getNum() > 1) {
|
|
|
moreSkuIds.add(sku.getId());
|
|
|
continue;
|
|
|
}
|