|
@ -230,45 +230,49 @@ public class GoodsSkuController { |
|
|
Map<String,List<GoodsSkuImportBo.SkuItem>> skuItemList = param.getSkuList().stream().collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt)); |
|
|
Map<String,List<GoodsSkuImportBo.SkuItem>> skuItemList = param.getSkuList().stream().collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt)); |
|
|
//处理删除
|
|
|
//处理删除
|
|
|
List<GoodsSkuImportBo.SkuItem> delList = skuItemList.get(DELETE); |
|
|
List<GoodsSkuImportBo.SkuItem> delList = skuItemList.get(DELETE); |
|
|
List<String> delSkuCodes = delList.stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).collect(Collectors.toList()); |
|
|
if(delList!=null){ |
|
|
QueryWrapper lqw1 = new QueryWrapper<>(); |
|
|
List<String> delSkuCodes = delList.stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).collect(Collectors.toList()); |
|
|
lqw1.eq("target_type", TbsGoodsType.sku.name()); |
|
|
QueryWrapper lqw1 = new QueryWrapper<>(); |
|
|
lqw1.eq("target_code",delSkuCodes); |
|
|
lqw1.eq("target_type", TbsGoodsType.sku.name()); |
|
|
lqw1.select("target_code"); |
|
|
lqw1.eq("target_code",delSkuCodes); |
|
|
List<TbsActivityGoods> activityGoodsList = activityGoodsService.list(lqw1); |
|
|
lqw1.select("target_code"); |
|
|
List<TbsBudgetCondition> budgetConditionList = budgetConditionService.list(lqw1); |
|
|
List<TbsActivityGoods> activityGoodsList = activityGoodsService.list(lqw1); |
|
|
List<SalePlanGoods> salePlanGoodsList = salePlanGoodsService.list(lqw1); |
|
|
List<TbsBudgetCondition> budgetConditionList = budgetConditionService.list(lqw1); |
|
|
for (TbsActivityGoods item : activityGoodsList) { |
|
|
List<SalePlanGoods> salePlanGoodsList = salePlanGoodsService.list(lqw1); |
|
|
for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { |
|
|
for (TbsActivityGoods item : activityGoodsList) { |
|
|
if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ |
|
|
for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { |
|
|
skuItem.setErrMsg(skuItem.getErrMsg()==null?"活动含有当前商品,删除失败;":skuItem.getErrMsg()+"\n活动含有当前商品,删除失败;"); |
|
|
if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ |
|
|
|
|
|
skuItem.setErrMsg(skuItem.getErrMsg()==null?"活动含有当前商品,删除失败;":skuItem.getErrMsg()+"\n活动含有当前商品,删除失败;"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
for (TbsBudgetCondition item : budgetConditionList) { |
|
|
for (TbsBudgetCondition item : budgetConditionList) { |
|
|
for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { |
|
|
for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { |
|
|
if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ |
|
|
if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ |
|
|
skuItem.setErrMsg(skuItem.getErrMsg()==null?"预算含有当前商品,删除失败;":skuItem.getErrMsg()+"\n预算含有当前商品,删除失败;"); |
|
|
skuItem.setErrMsg(skuItem.getErrMsg()==null?"预算含有当前商品,删除失败;":skuItem.getErrMsg()+"\n预算含有当前商品,删除失败;"); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
for (SalePlanGoods item : salePlanGoodsList) { |
|
|
for (SalePlanGoods item : salePlanGoodsList) { |
|
|
for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { |
|
|
for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { |
|
|
if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ |
|
|
if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ |
|
|
skuItem.setErrMsg(skuItem.getErrMsg()==null?"销售计划含有当前商品,删除失败;":skuItem.getErrMsg()+"\n销售计划含有当前商品,删除失败;"); |
|
|
skuItem.setErrMsg(skuItem.getErrMsg()==null?"销售计划含有当前商品,删除失败;":skuItem.getErrMsg()+"\n销售计划含有当前商品,删除失败;"); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
//执行删除
|
|
|
|
|
|
List<String> skuCodeToDelList = param.getSkuList().stream() |
|
|
|
|
|
.filter(a->a.getErrMsg()==null) |
|
|
|
|
|
.map(GoodsSkuImportBo.SkuItem::getSkuCode) |
|
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
if(skuCodeToDelList.size()>0){ |
|
|
|
|
|
LambdaQueryWrapper<GoodsSku> delLqw = new LambdaQueryWrapper<>(); |
|
|
|
|
|
delLqw.in(GoodsSku::getSkuCode,skuCodeToDelList); |
|
|
|
|
|
goodsSkuService.remove(delLqw); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
//执行删除
|
|
|
|
|
|
List<String> skuCodeToDelList = param.getSkuList().stream() |
|
|
|
|
|
.filter(a->a.getErrMsg()==null) |
|
|
|
|
|
.map(GoodsSkuImportBo.SkuItem::getSkuCode) |
|
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
if(skuCodeToDelList.size()>0){ |
|
|
|
|
|
LambdaQueryWrapper<GoodsSku> delLqw = new LambdaQueryWrapper<>(); |
|
|
|
|
|
delLqw.in(GoodsSku::getSkuCode,skuCodeToDelList); |
|
|
|
|
|
goodsSkuService.remove(delLqw); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//处理更新和新增
|
|
|
//处理更新和新增
|
|
|
List<String> skuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).distinct().collect(Collectors.toList()); |
|
|
List<String> skuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).distinct().collect(Collectors.toList()); |
|
@ -337,18 +341,28 @@ public class GoodsSkuController { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private GoodsSku selectSku( List<GoodsSku> skuList, String skuCode){ |
|
|
private GoodsSku selectSku( List<GoodsSku> skuList, String skuCode){ |
|
|
for (GoodsSku goodsSku : skuList) { |
|
|
if(skuCode!=null){ |
|
|
if(goodsSku.getSkuCode().equals(skuCode)){ |
|
|
for (GoodsSku goodsSku : skuList) { |
|
|
return goodsSku; |
|
|
if(goodsSku.getSkuCode()==null){ |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
|
|
|
if(goodsSku.getSkuCode().equals(skuCode)){ |
|
|
|
|
|
return goodsSku; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private GoodsSpu selectSpu( List<GoodsSpu> spuList, String skuCode){ |
|
|
private GoodsSpu selectSpu( List<GoodsSpu> spuList, String skuCode){ |
|
|
for (GoodsSpu goodsSpu : spuList) { |
|
|
if(skuCode!=null){ |
|
|
if(goodsSpu.getSkuCode().equals(skuCode)){ |
|
|
for (GoodsSpu goodsSpu : spuList) { |
|
|
return goodsSpu; |
|
|
if(goodsSpu.getSkuCode()==null){ |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
|
|
|
if(goodsSpu.getSkuCode().equals(skuCode)){ |
|
|
|
|
|
return goodsSpu; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return null; |
|
|
return null; |
|
|