From f847ebf512bfda9ee89aaabd294b06197671cfd4 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 29 Aug 2024 10:42:22 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aspu=E5=92=8Csku=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/controller/GoodsSkuController.java | 281 ------------ .../controller/GoodsSkuOptionController.java | 412 ++++++++++++++++++ .../controller/GoodsSpuOptionController.java | 38 +- .../goods/entity/bo/GoodsSkuSpecialBo.java | 31 ++ .../goods/entity/bo/GoodsSkuStateBo.java | 60 +++ .../goods/entity/bo/GoodsSpuStateBo.java | 62 +++ .../service/impl/GoodsSkuServiceImpl.java | 4 +- 7 files changed, 588 insertions(+), 300 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java create mode 100644 src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuSpecialBo.java create mode 100644 src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuStateBo.java create mode 100644 src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuStateBo.java diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index e32295a8..900d52df 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -133,88 +133,6 @@ public class GoodsSkuController { return R.ok(goodsSku); } - /** - * 编辑 - * @param param - * @return - */ - @PostMapping("/update") - @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) - @PreAuthorize("hasRole('goods:sku:update')") - public R update(@RequestBody @Valid GoodsSkuBo param){ - if(param.getSkuId()==null){ - return R.error(); - } - goodsSkuService.editSku2(param); - goodsSpuService.updateOnlineOfflineFlat(param.getSpuId()); - return R.ok(); - } - - /** - * 开启/关闭sku - * @param skuId - * @param enable - * @return - */ - @GetMapping("/enable") - @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) - @PreAuthorize("hasRole('goods:sku:update')") - public R update(Long skuId,Integer enable){ - GoodsSku param = new GoodsSku(); - param.setId(skuId); - param.setEnable(enable.equals(1)?1:0); - goodsSkuService.updateById(param); - return R.ok(); - } - - /** - * 编辑 - * @param param - * @return - */ - @PostMapping("/save") - @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) - @PreAuthorize("hasRole('goods:sku:update')") - public R save(@RequestBody @Valid GoodsSkuBo param){ - goodsSkuService.editSku2(param); - goodsSpuService.updateOnlineOfflineFlat(param.getSpuId()); - return R.ok(); - } - - /** - * 删除sku - * @param id - * @return - */ - @DeleteMapping("/deleteById/{id}") - @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.DELETE) - @PreAuthorize("hasRole('goods:sku:delete')") - public R deleteById(@PathVariable("id") Long id){ - GoodsSku sku = goodsSkuService.getById(id); - QueryWrapper lqw1 = new QueryWrapper<>(); - lqw1.eq("target_type", TbsGoodsType.sku.name()); - lqw1.eq("target_id",id); - if(activityGoodsService.count(lqw1)>0){ - return R.error("活动含有当前商品，删除失败"); - } - if(budgetConditionService.count(lqw1)>0){ - return R.error("预算含有当前商品，删除失败"); - } - if(salePlanGoodsService.count(lqw1)>0){ - return R.error("销售计划含有当前商品，删除失败"); - } - if(policyGoodsService.count(lqw1)>0){ - return R.error("政策含有当前商品，删除失败"); - } - goodsSkuMapper.updateSkuCodeAndDelFlag(id, StringUtils.genShortId()); - //删除商品规格值 - LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); - lqw2.eq(GoodsSkuSpecValue::getSkuId,id); - goodsSkuSpecValueService.remove(lqw2); - goodsSpuService.updateOnlineOfflineFlat(sku.getSpuId()); - return R.ok(); - } - /** * 导出 * @param param @@ -233,204 +151,5 @@ public class GoodsSkuController { return R.ok(result); } - /** - * 通过skuCode对基本信息更新 - * @param param - * @return - */ - @PostMapping("/updateBySkuCode") - public R updateBySkuCode(@RequestBody GoodsSku param){ - param.setId(null); - param.setSpuId(null); - GoodsSku sku = goodsSkuService.getByCode(param.getSkuCode()); - if(sku==null){ - return R.errorNotFound(); - } - param.setId(sku.getId()); - if(param.getBelong()!=null&¶m.getBelong().contains("产")){ - param.setBelong(param.getBelong().replace("产","")); - } - goodsSkuService.updateById(param); - return R.ok(); - } - - /** - * 导入 - * @param param - * @return - */ - @PostMapping("/importSku") - @SysLog(module = SystemModule.GOODS, title = "import", biz = BizType.INSERT) - public R importSpu(@RequestBody @Valid GoodsSkuImportBo param){ - final String UPDATE = "2"; - final String DELETE = "3"; - final String SAVE = "1"; - boolean throwEx = false; - Map> skuItemList = param.getSkuList().stream() - .filter(a->a.getOpt()!=null).collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt)); - //处理删除 - List delList = skuItemList.get(DELETE); - if(delList!=null){ - List delSkuCodes = delList.stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).collect(Collectors.toList()); - QueryWrapper lqw1 = new QueryWrapper<>(); - lqw1.eq("target_type", TbsGoodsType.sku.name()); - lqw1.in("target_code",delSkuCodes); - lqw1.select("target_code"); - List activityGoodsList = activityGoodsService.list(lqw1); - List budgetConditionList = budgetConditionService.list(lqw1); - List salePlanGoodsList = salePlanGoodsService.list(lqw1); - for (TbsActivityGoods item : activityGoodsList) { - for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { - if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ - skuItem.setErrMsg(skuItem.getErrMsg()==null?"活动含有当前商品，删除失败；":skuItem.getErrMsg()+"\n活动含有当前商品，删除失败；"); - throwEx = true; - } - } - } - for (TbsBudgetCondition item : budgetConditionList) { - for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { - if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ - skuItem.setErrMsg(skuItem.getErrMsg()==null?"预算含有当前商品，删除失败；":skuItem.getErrMsg()+"\n预算含有当前商品，删除失败；"); - throwEx = true; - } - } - } - for (SalePlanGoods item : salePlanGoodsList) { - for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { - if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ - skuItem.setErrMsg(skuItem.getErrMsg()==null?"销售计划含有当前商品，删除失败；":skuItem.getErrMsg()+"\n销售计划含有当前商品，删除失败；"); - throwEx = true; - } - } - } - //执行删除 - List skuCodeToDelList = param.getSkuList().stream() - .filter(a->a.getErrMsg()==null) - .map(GoodsSkuImportBo.SkuItem::getSkuCode) - .collect(Collectors.toList()); - if(skuCodeToDelList.size()>0){ - LambdaQueryWrapper delLqw = new LambdaQueryWrapper<>(); - delLqw.in(GoodsSku::getSkuCode,skuCodeToDelList); - goodsSkuService.remove(delLqw); - } - } - - //处理更新和新增 - List skuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).distinct().collect(Collectors.toList()); - List spuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSpuCode).distinct().collect(Collectors.toList()); - List skuList = goodsSkuService.getByCodes(skuCodes); - List spuList = goodsSpuService.getByCodes(spuCodes); - for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { - String opt = skuItem.getOpt(); - if(opt==null){ - continue; - } - if(opt.equals(DELETE)){ - continue; - } - GoodsSku sku = this.selectSku(skuList,skuItem.getSkuCode()); - GoodsSpu spu = this.selectSpu(spuList,skuItem.getSpuCode()); - - if(StringUtils.hasText(skuItem.getSpuCode())&&spu==null){ - skuItem.setErrMsg(skuItem.getErrMsg()==null?"无匹配SKU"+skuItem.getSpuCode()+"编码产品，更新失败；":skuItem.getErrMsg()+"\n无匹配编码产品，更新失败；"); - throwEx = true; - continue; - } - - if(UPDATE.equals(opt)){ - //更新 - if(sku==null){ - skuItem.setErrMsg(skuItem.getErrMsg()==null?"无匹配编码产品，更新失败；":skuItem.getErrMsg()+"\n无匹配编码产品，更新失败；"); - throwEx = true; - continue; - } - GoodsSku goodsSku = buildByImportItem(skuItem); - goodsSku.setId(sku.getId()); - - if(spu!=null){ - goodsSku.setSpuId(spu.getId()); - goodsSku.setBookName(spu.getBookName()); - goodsSku.setBookBelong(spu.getBookBelong()); - } - goodsSkuService.updateById(goodsSku); - }else if (SAVE.equals(opt)){ - //保存 - if(sku!=null){ - skuItem.setErrMsg(skuItem.getErrMsg()==null?"编码重复，新增失败；":skuItem.getErrMsg()+"\n编码重复，新增失败；"); - throwEx = true; - continue; - } - if(spu==null){ - skuItem.setErrMsg(skuItem.getErrMsg()==null?"SKU不存在，新增失败；":skuItem.getErrMsg()+"\nSKU不存在，新增失败；"); - throwEx = true; - continue; - } - GoodsSku addSku = buildByImportItem(skuItem); - addSku.setSpuId(spu.getId()); - addSku.setBookName(spu.getBookName()); - addSku.setBookBelong(spu.getBookBelong()); - goodsSkuService.save(addSku); - } - } - for (GoodsSpu spu : spuList) { - goodsSpuService.updateOnlineOfflineFlat(spu.getId()); - } - if(throwEx){ - return R.ok(param.getSkuList(),"错误数据"); - } - return R.ok(); - } - - private GoodsSku buildByImportItem(GoodsSkuImportBo.SkuItem skuItem){ - GoodsSku udpSku = new GoodsSku(); - udpSku.setSkuCode(skuItem.getSkuCode()); - udpSku.setSkuName(skuItem.getSkuName()); - udpSku.setSalesPrice(skuItem.getSalesPrice()); - udpSku.setMarketPrice(skuItem.getSalesPrice()); - udpSku.setCostPrice(skuItem.getSalesPrice()); - udpSku.setStock(skuItem.getStock()); - udpSku.setWeight(skuItem.getWeight()); - udpSku.setVolume(skuItem.getVolume()); - udpSku.setMinPurchase(skuItem.getMinPurchase()); - udpSku.setOrderFlag(skuItem.getOrderFlag()); - udpSku.setSpecialFlag(skuItem.getSpecialFlag()); - udpSku.setCostFlag(skuItem.getCostFlag()); - udpSku.setCostPrice(skuItem.getCostPrice()); - udpSku.setMarketPrice(skuItem.getMarketPrice()); - udpSku.setBelong(skuItem.getBelong()); - udpSku.setWrapVal(skuItem.getWrapVal()); - udpSku.setTasteVal(skuItem.getTasteVal()); - udpSku.setSpecInfos(skuItem.getBelong()+";"+skuItem.getTasteVal()+";"+skuItem.getWrapVal()); - udpSku.setRemark(skuItem.getRemark()); - udpSku.setEnable(skuItem.getEnable()); - udpSku.setInvUnitWeight(skuItem.getInvUnitWeight()); - return udpSku; - } - - private GoodsSku selectSku( List skuList, String skuCode){ - if(skuCode!=null){ - for (GoodsSku goodsSku : skuList) { - if(goodsSku.getSkuCode()==null){ - continue; - } - if(goodsSku.getSkuCode().equals(skuCode)){ - return goodsSku; - } - } - } - return null; - } - - private GoodsSpu selectSpu( List spuList, String skuCode){ - if(skuCode!=null){ - for (GoodsSpu goodsSpu : spuList) { - if(goodsSpu.getSpuCode().equals(skuCode)){ - return goodsSpu; - } - } - } - return null; - } - } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java new file mode 100644 index 00000000..c43ccbce --- /dev/null +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java @@ -0,0 +1,412 @@ +package com.qs.serve.modules.goods.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qs.serve.common.config.DevEnvironmentConfig; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.SpringUtils; +import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.bms.common.BookAccountUtil; +import com.qs.serve.modules.goods.entity.GoodsSku; +import com.qs.serve.modules.goods.entity.GoodsSkuSpecValue; +import com.qs.serve.modules.goods.entity.GoodsSpu; +import com.qs.serve.modules.goods.entity.bo.GoodsSkuBo; +import com.qs.serve.modules.goods.entity.bo.GoodsSkuImportBo; +import com.qs.serve.modules.goods.entity.bo.GoodsSkuSpecialBo; +import com.qs.serve.modules.goods.entity.bo.GoodsSkuStateBo; +import com.qs.serve.modules.goods.entity.vo.GoodSkuVo; +import com.qs.serve.modules.goods.entity.vo.GoodsSkuExportVo; +import com.qs.serve.modules.goods.entity.vo.GoodsSkuSpecValueVo; +import com.qs.serve.modules.goods.mapper.GoodsSkuMapper; +import com.qs.serve.modules.goods.mapper.GoodsSpuMapper; +import com.qs.serve.modules.goods.service.GoodsSkuService; +import com.qs.serve.modules.goods.service.GoodsSkuSpecValueService; +import com.qs.serve.modules.goods.service.GoodsSpuService; +import com.qs.serve.modules.sale.entity.SalePlanGoods; +import com.qs.serve.modules.sale.service.SalePlanGoodsService; +import com.qs.serve.modules.tbs.common.TbsGoodsType; +import com.qs.serve.modules.tbs.entity.TbsActivityGoods; +import com.qs.serve.modules.tbs.entity.TbsBudgetCondition; +import com.qs.serve.modules.tbs.service.TbsActivityGoodsService; +import com.qs.serve.modules.tbs.service.TbsBudgetConditionService; +import com.qs.serve.modules.tzc.service.TzcPolicyGoodsService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.stream.Collectors; + +/** + * 商品 sku + * @author YenHex + * @since 2022-10-09 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("goods/sku") +public class GoodsSkuOptionController { + + private GoodsSkuMapper goodsSkuMapper; + private GoodsSkuService goodsSkuService; + private GoodsSpuService goodsSpuService; + private GoodsSkuSpecValueService goodsSkuSpecValueService; + private TbsActivityGoodsService activityGoodsService; + private TbsBudgetConditionService budgetConditionService; + private SalePlanGoodsService salePlanGoodsService; + private TzcPolicyGoodsService policyGoodsService; + + + /** + * 编辑 + * @param param + * @return + */ + @PostMapping("/updateStateBatch") + @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) + @PreAuthorize("hasRole('goods:sku:update')") + public R updateStateBatch(@RequestBody @Valid GoodsSkuStateBo param){ + param.initProp(); + GoodsSku goodsSku = new GoodsSku(); + goodsSku.setEnable(param.getEnable()); + goodsSku.setOrderFlag(param.getOrderFlag()); + goodsSku.setCostFlag(param.getCostFlag()); + goodsSku.setOrderOfflineFlag(param.getOrderOfflineFlag()); + goodsSku.setOrderOnlineFlag(param.getOrderOnlineFlag()); + goodsSkuService.update(goodsSku,new LambdaQueryWrapper() + .in(GoodsSku::getId,param.getSkuIds())); + goodsSpuService.initSkuNum(); + return R.ok(); + } + + /** + * 编辑 + * @param param + * @return + */ + @PostMapping("/updateSpecialFlagBatch") + @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) + @PreAuthorize("hasRole('goods:sku:update')") + public R updateSpecialFlagBatch(@RequestBody @Valid GoodsSkuSpecialBo param){ + Integer flag = param.getSpecialFlag(); + for (Long skuId : param.getSkuIds()) { + GoodsSku sku = goodsSkuService.getById(skuId); + LambdaQueryWrapper specialSkuLqw = new LambdaQueryWrapper<>(); + specialSkuLqw.eq(GoodsSku::getSpecialFlag,1); + specialSkuLqw.eq(GoodsSku::getSpuId,sku.getSpuId()); + List specialSkuList = goodsSkuService.list(specialSkuLqw); + if(specialSkuList.size()>0){ + GoodsSku goodsSku1 = specialSkuList.get(0); + GoodsSpuMapper spuMapper = SpringUtils.getBean(GoodsSpuMapper.class); + GoodsSpu spu = new GoodsSpu(); + spu.setId(goodsSku1.getSpuId()); + if(flag.equals(1)){ + spu.setSpecialSkuId(goodsSku1.getId()); + }else { + spu.setSpecialSkuId(0L); + } + spuMapper.updateById(spu); + } + sku.setSpecialFlag(flag); + goodsSkuService.updateById(sku); + } + goodsSpuService.initSkuNum(); + return R.ok(); + } + + /** + * 编辑 + * @param param + * @return + */ + @PostMapping("/update") + @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) + @PreAuthorize("hasRole('goods:sku:update')") + public R update(@RequestBody @Valid GoodsSkuBo param){ + if(param.getSkuId()==null){ + return R.error(); + } + goodsSkuService.editSku2(param); + goodsSpuService.updateOnlineOfflineFlat(param.getSpuId()); + return R.ok(); + } + + /** + * 开启/关闭sku + * @param skuId + * @param enable + * @return + */ + @GetMapping("/enable") + @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) + @PreAuthorize("hasRole('goods:sku:update')") + public R update(Long skuId,Integer enable){ + GoodsSku param = new GoodsSku(); + param.setId(skuId); + param.setEnable(enable.equals(1)?1:0); + goodsSkuService.updateById(param); + return R.ok(); + } + + /** + * 编辑 + * @param param + * @return + */ + @PostMapping("/save") + @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) + @PreAuthorize("hasRole('goods:sku:update')") + public R save(@RequestBody @Valid GoodsSkuBo param){ + goodsSkuService.editSku2(param); + goodsSpuService.updateOnlineOfflineFlat(param.getSpuId()); + return R.ok(); + } + + /** + * 删除sku + * @param id + * @return + */ + @DeleteMapping("/deleteById/{id}") + @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.DELETE) + @PreAuthorize("hasRole('goods:sku:delete')") + public R deleteById(@PathVariable("id") Long id){ + GoodsSku sku = goodsSkuService.getById(id); + QueryWrapper lqw1 = new QueryWrapper<>(); + lqw1.eq("target_type", TbsGoodsType.sku.name()); + lqw1.eq("target_id",id); + if(activityGoodsService.count(lqw1)>0){ + return R.error("活动含有当前商品，删除失败"); + } + if(budgetConditionService.count(lqw1)>0){ + return R.error("预算含有当前商品，删除失败"); + } + if(salePlanGoodsService.count(lqw1)>0){ + return R.error("销售计划含有当前商品，删除失败"); + } + if(policyGoodsService.count(lqw1)>0){ + return R.error("政策含有当前商品，删除失败"); + } + goodsSkuMapper.updateSkuCodeAndDelFlag(id, StringUtils.genShortId()); + //删除商品规格值 + LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); + lqw2.eq(GoodsSkuSpecValue::getSkuId,id); + goodsSkuSpecValueService.remove(lqw2); + goodsSpuService.updateOnlineOfflineFlat(sku.getSpuId()); + return R.ok(); + } + + + /** + * 通过skuCode对基本信息更新 + * @param param + * @return + */ + @PostMapping("/updateBySkuCode") + public R updateBySkuCode(@RequestBody GoodsSku param){ + param.setId(null); + param.setSpuId(null); + GoodsSku sku = goodsSkuService.getByCode(param.getSkuCode()); + if(sku==null){ + return R.errorNotFound(); + } + param.setId(sku.getId()); + if(param.getBelong()!=null&¶m.getBelong().contains("产")){ + param.setBelong(param.getBelong().replace("产","")); + } + goodsSkuService.updateById(param); + return R.ok(); + } + + /** + * 导入 + * @param param + * @return + */ + @PostMapping("/importSku") + @SysLog(module = SystemModule.GOODS, title = "import", biz = BizType.INSERT) + public R importSpu(@RequestBody @Valid GoodsSkuImportBo param){ + final String UPDATE = "2"; + final String DELETE = "3"; + final String SAVE = "1"; + boolean throwEx = false; + Map> skuItemList = param.getSkuList().stream() + .filter(a->a.getOpt()!=null).collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt)); + //处理删除 + List delList = skuItemList.get(DELETE); + if(delList!=null){ + List delSkuCodes = delList.stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).collect(Collectors.toList()); + QueryWrapper lqw1 = new QueryWrapper<>(); + lqw1.eq("target_type", TbsGoodsType.sku.name()); + lqw1.in("target_code",delSkuCodes); + lqw1.select("target_code"); + List activityGoodsList = activityGoodsService.list(lqw1); + List budgetConditionList = budgetConditionService.list(lqw1); + List salePlanGoodsList = salePlanGoodsService.list(lqw1); + for (TbsActivityGoods item : activityGoodsList) { + for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { + if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ + skuItem.setErrMsg(skuItem.getErrMsg()==null?"活动含有当前商品，删除失败；":skuItem.getErrMsg()+"\n活动含有当前商品，删除失败；"); + throwEx = true; + } + } + } + for (TbsBudgetCondition item : budgetConditionList) { + for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { + if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ + skuItem.setErrMsg(skuItem.getErrMsg()==null?"预算含有当前商品，删除失败；":skuItem.getErrMsg()+"\n预算含有当前商品，删除失败；"); + throwEx = true; + } + } + } + for (SalePlanGoods item : salePlanGoodsList) { + for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { + if(item.getTargetCode().equals(skuItem.getSkuCode())&&DELETE.equals(skuItem.getOpt())){ + skuItem.setErrMsg(skuItem.getErrMsg()==null?"销售计划含有当前商品，删除失败；":skuItem.getErrMsg()+"\n销售计划含有当前商品，删除失败；"); + throwEx = true; + } + } + } + //执行删除 + List skuCodeToDelList = param.getSkuList().stream() + .filter(a->a.getErrMsg()==null) + .map(GoodsSkuImportBo.SkuItem::getSkuCode) + .collect(Collectors.toList()); + if(skuCodeToDelList.size()>0){ + LambdaQueryWrapper delLqw = new LambdaQueryWrapper<>(); + delLqw.in(GoodsSku::getSkuCode,skuCodeToDelList); + goodsSkuService.remove(delLqw); + } + } + + //处理更新和新增 + List skuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).distinct().collect(Collectors.toList()); + List spuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSpuCode).distinct().collect(Collectors.toList()); + List skuList = goodsSkuService.getByCodes(skuCodes); + List spuList = goodsSpuService.getByCodes(spuCodes); + for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { + String opt = skuItem.getOpt(); + if(opt==null){ + continue; + } + if(opt.equals(DELETE)){ + continue; + } + GoodsSku sku = this.selectSku(skuList,skuItem.getSkuCode()); + GoodsSpu spu = this.selectSpu(spuList,skuItem.getSpuCode()); + + if(StringUtils.hasText(skuItem.getSpuCode())&&spu==null){ + skuItem.setErrMsg(skuItem.getErrMsg()==null?"无匹配SKU"+skuItem.getSpuCode()+"编码产品，更新失败；":skuItem.getErrMsg()+"\n无匹配编码产品，更新失败；"); + throwEx = true; + continue; + } + + if(UPDATE.equals(opt)){ + //更新 + if(sku==null){ + skuItem.setErrMsg(skuItem.getErrMsg()==null?"无匹配编码产品，更新失败；":skuItem.getErrMsg()+"\n无匹配编码产品，更新失败；"); + throwEx = true; + continue; + } + GoodsSku goodsSku = buildByImportItem(skuItem); + goodsSku.setId(sku.getId()); + + if(spu!=null){ + goodsSku.setSpuId(spu.getId()); + goodsSku.setBookName(spu.getBookName()); + goodsSku.setBookBelong(spu.getBookBelong()); + } + goodsSkuService.updateById(goodsSku); + }else if (SAVE.equals(opt)){ + //保存 + if(sku!=null){ + skuItem.setErrMsg(skuItem.getErrMsg()==null?"编码重复，新增失败；":skuItem.getErrMsg()+"\n编码重复，新增失败；"); + throwEx = true; + continue; + } + if(spu==null){ + skuItem.setErrMsg(skuItem.getErrMsg()==null?"SKU不存在，新增失败；":skuItem.getErrMsg()+"\nSKU不存在，新增失败；"); + throwEx = true; + continue; + } + GoodsSku addSku = buildByImportItem(skuItem); + addSku.setSpuId(spu.getId()); + addSku.setBookName(spu.getBookName()); + addSku.setBookBelong(spu.getBookBelong()); + goodsSkuService.save(addSku); + } + } + for (GoodsSpu spu : spuList) { + goodsSpuService.updateOnlineOfflineFlat(spu.getId()); + } + if(throwEx){ + return R.ok(param.getSkuList(),"错误数据"); + } + return R.ok(); + } + + private GoodsSku buildByImportItem(GoodsSkuImportBo.SkuItem skuItem){ + GoodsSku udpSku = new GoodsSku(); + udpSku.setSkuCode(skuItem.getSkuCode()); + udpSku.setSkuName(skuItem.getSkuName()); + udpSku.setSalesPrice(skuItem.getSalesPrice()); + udpSku.setMarketPrice(skuItem.getSalesPrice()); + udpSku.setCostPrice(skuItem.getSalesPrice()); + udpSku.setStock(skuItem.getStock()); + udpSku.setWeight(skuItem.getWeight()); + udpSku.setVolume(skuItem.getVolume()); + udpSku.setMinPurchase(skuItem.getMinPurchase()); + udpSku.setOrderFlag(skuItem.getOrderFlag()); + udpSku.setSpecialFlag(skuItem.getSpecialFlag()); + udpSku.setCostFlag(skuItem.getCostFlag()); + udpSku.setCostPrice(skuItem.getCostPrice()); + udpSku.setMarketPrice(skuItem.getMarketPrice()); + udpSku.setBelong(skuItem.getBelong()); + udpSku.setWrapVal(skuItem.getWrapVal()); + udpSku.setTasteVal(skuItem.getTasteVal()); + udpSku.setSpecInfos(skuItem.getBelong()+";"+skuItem.getTasteVal()+";"+skuItem.getWrapVal()); + udpSku.setRemark(skuItem.getRemark()); + udpSku.setEnable(skuItem.getEnable()); + udpSku.setInvUnitWeight(skuItem.getInvUnitWeight()); + return udpSku; + } + + private GoodsSku selectSku( List skuList, String skuCode){ + if(skuCode!=null){ + for (GoodsSku goodsSku : skuList) { + if(goodsSku.getSkuCode()==null){ + continue; + } + if(goodsSku.getSkuCode().equals(skuCode)){ + return goodsSku; + } + } + } + return null; + } + + private GoodsSpu selectSpu( List spuList, String skuCode){ + if(skuCode!=null){ + for (GoodsSpu goodsSpu : spuList) { + if(goodsSpu.getSpuCode().equals(skuCode)){ + return goodsSpu; + } + } + } + return null; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuOptionController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuOptionController.java index 9adefb68..9f425f89 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuOptionController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuOptionController.java @@ -1,34 +1,22 @@ package com.qs.serve.modules.goods.controller; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.annotation.SysLog; -import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; -import com.qs.serve.modules.bms.common.BookAccountUtil; -import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.service.BmsSupplierService; import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper; -import com.qs.serve.modules.goods.common.GoodsConst; import com.qs.serve.modules.goods.entity.*; import com.qs.serve.modules.goods.entity.bo.GoodsSpuBo; import com.qs.serve.modules.goods.entity.bo.GoodsSpuImportBo; -import com.qs.serve.modules.goods.entity.dto.GoodsAccrIdsDto; -import com.qs.serve.modules.goods.entity.dto.GoodsRuleItemDTO; -import com.qs.serve.modules.goods.entity.dto.InventoryCusPrice; -import com.qs.serve.modules.goods.entity.so.GoodsHisOrderQuery; -import com.qs.serve.modules.goods.entity.vo.GoodsSpuExportVo; -import com.qs.serve.modules.goods.entity.vo.GoodsSpuVo; +import com.qs.serve.modules.goods.entity.bo.GoodsSpuStateBo; import com.qs.serve.modules.goods.mapper.GoodsSkuMapper; import com.qs.serve.modules.goods.mapper.GoodsSpuMapper; import com.qs.serve.modules.goods.service.*; -import com.qs.serve.modules.oms.entity.dto.OmsSpuToSkuKey; import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService; import com.qs.serve.modules.tbs.common.TbsGoodsType; import com.qs.serve.modules.tbs.service.TbsActivityGoodsService; @@ -36,15 +24,11 @@ import com.qs.serve.modules.tbs.service.TbsBudgetConditionService; import io.netty.util.internal.StringUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.time.LocalDate; import java.util.*; -import java.util.stream.Collectors; /** * 商品 spu @@ -93,6 +77,26 @@ public class GoodsSpuOptionController { return R.ok(); } + /** + * 商品上下架,可下单状态,可投放费用状态(批量) + * @param param + * @return + */ + @GetMapping("/updateStateBatch") + @SysLog(module = SystemModule.GOODS, title = "spu", biz = BizType.UPDATE) + public R updateShelfBatch(@RequestBody GoodsSpuStateBo param){ + param.initProp(); + GoodsSpu goodsSpu = new GoodsSpu(); + goodsSpu.setShelf(param.getShelfState()); + goodsSpu.setOrderFlag(param.getOrderFlag()); + goodsSpu.setCostFlag(param.getCostFlag()); + goodsSpu.setOrderOfflineFlag(param.getOrderOfflineFlag()); + goodsSpu.setOrderOnlineFlag(param.getOrderOnlineFlag()); + goodsSpuService.update(goodsSpu,new LambdaQueryWrapper() + .in(GoodsSpu::getId,param.getSpuIds())); + return R.ok(); + } + /** * 翻页搜索 diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuSpecialBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuSpecialBo.java new file mode 100644 index 00000000..497caea3 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuSpecialBo.java @@ -0,0 +1,31 @@ +package com.qs.serve.modules.goods.entity.bo; + +import lombok.Data; + +import java.util.List; + +/** + * @author YenHex + * @since 2024/8/29 + */ +@Data +public class GoodsSkuSpecialBo { + + /** + * SKU-ID列表 + */ + private List skuIds; + + /** + * 线上下单 + */ + private Integer specialFlag; + + + public void initProp(){ + if(specialFlag!=null&&specialFlag!=1&&specialFlag!=0){ + specialFlag = null; + } + } + +} diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuStateBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuStateBo.java new file mode 100644 index 00000000..4c660352 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuStateBo.java @@ -0,0 +1,60 @@ +package com.qs.serve.modules.goods.entity.bo; + +import lombok.Data; + +import java.util.List; + +/** + * @author YenHex + * @since 2024/8/29 + */ +@Data +public class GoodsSkuStateBo { + + /** + * SKU-ID列表 + */ + private List skuIds; + + /** 是否开启 1、是；0否 */ + private Integer enable; + + /** + * 可下单状态 + */ + private Integer orderFlag; + + /** + * 可投放费用状态 + */ + private Integer costFlag; + + /** + * 线上下单 + */ + private Integer orderOfflineFlag; + + /** + * 线下下单 + */ + private Integer orderOnlineFlag; + + public void initProp(){ + if(enable!=null&&enable!=1&&enable!=0){ + enable = null; + } + if(orderFlag!=null&&orderFlag!=1&&orderFlag!=0){ + orderFlag = null; + } + if(costFlag!=null&&costFlag!=1&&costFlag!=0){ + costFlag = null; + } + if(orderOfflineFlag!=null&&orderOfflineFlag!=1&&orderOfflineFlag!=0){ + orderOfflineFlag = null; + } + if(orderOnlineFlag!=null&&orderOnlineFlag!=1&&orderOnlineFlag!=0){ + orderOnlineFlag = null; + } + } + +} diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuStateBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuStateBo.java new file mode 100644 index 00000000..39e5e6f7 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuStateBo.java @@ -0,0 +1,62 @@ +package com.qs.serve.modules.goods.entity.bo; + +import lombok.Data; + +import java.util.List; + +/** + * @author YenHex + * @since 2024/8/29 + */ +@Data +public class GoodsSpuStateBo { + + /** + * SPU-ID列表 + */ + private List spuIds; + + /** + * 是否上架 + */ + private Integer shelfState; + + /** + * 可下单状态 + */ + private Integer orderFlag; + + /** + * 可投放费用状态 + */ + private Integer costFlag; + + /** + * 线上下单 + */ + private Integer orderOfflineFlag; + + /** + * 线下下单 + */ + private Integer orderOnlineFlag; + + public void initProp(){ + if(shelfState!=null&&shelfState!=1&&shelfState!=0){ + shelfState = null; + } + if(orderFlag!=null&&orderFlag!=1&&orderFlag!=0){ + orderFlag = null; + } + if(costFlag!=null&&costFlag!=1&&costFlag!=0){ + costFlag = null; + } + if(orderOfflineFlag!=null&&orderOfflineFlag!=1&&orderOfflineFlag!=0){ + orderOfflineFlag = null; + } + if(orderOnlineFlag!=null&&orderOnlineFlag!=1&&orderOnlineFlag!=0){ + orderOnlineFlag = null; + } + } + +} diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java index 3cd84d2f..86871ecc 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java @@ -221,7 +221,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl im //更新特殊标识 LambdaQueryWrapper specialSkuLqw = new LambdaQueryWrapper<>(); specialSkuLqw.eq(GoodsSku::getSpecialFlag,1); - specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getId()); + specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getSpuId()); List specialSkuList = super.list(specialSkuLqw); if(specialSkuList.size()>0){ GoodsSku goodsSku1 = specialSkuList.get(0); @@ -325,7 +325,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl im if(!goodsSku.getSpuId().equals(0L)){ LambdaQueryWrapper specialSkuLqw = new LambdaQueryWrapper<>(); specialSkuLqw.eq(GoodsSku::getSpecialFlag,1); - specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getId()); + specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getSpuId()); List specialSkuList = super.list(specialSkuLqw); if(specialSkuList.size()>0){ GoodsSku goodsSku1 = specialSkuList.get(0);