From f17ea8046cd790469ab0dc7475987d091d1706f0 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 20 Nov 2023 09:56:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E5=AE=9A=E6=A8=A1=E6=9D=BF=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=94=BF=E7=AD=96=E4=BF=AE=E5=A4=8D=EF=BC=9B?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=A7=BB=E9=99=A4=E5=95=86=E5=9F=8E=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/controller/GoodsSkuController.java | 8 +-- .../serve/modules/goods/entity/GoodsSku.java | 10 +++ .../goods/entity/bo/GoodsCategoryRuleBo.java | 2 + .../modules/goods/entity/bo/GoodsSkuBo.java | 14 ++++- .../goods/service/GoodsSkuService.java | 6 ++ .../service/impl/GoodsSkuServiceImpl.java | 61 +++++++++++++++++++ .../qs/serve/modules/oms/entity/OmsOrder.java | 2 + .../service/impl/TbsCostApplyServiceImpl.java | 4 ++ .../impl/TzcPolicyApplicationServiceImpl.java | 1 + 9 files changed, 103 insertions(+), 5 deletions(-) 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 af4f68c8..3cc43971 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 @@ -111,11 +111,11 @@ public class GoodsSkuController { @PostMapping("/update") @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) @PreAuthorize("hasRole('goods:sku:update')") - public R update(@RequestBody GoodsSkuBo param){ + public R update(@RequestBody @Valid GoodsSkuBo param){ if(param.getSkuId()==null){ return R.error(); } - goodsSkuService.editSku(param); + goodsSkuService.editSku2(param); return R.ok(); } @@ -144,8 +144,8 @@ public class GoodsSkuController { @PostMapping("/save") @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.UPDATE) @PreAuthorize("hasRole('goods:sku:update')") - public R save(@RequestBody GoodsSkuBo param){ - goodsSkuService.editSku(param); + public R save(@RequestBody @Valid GoodsSkuBo param){ + goodsSkuService.editSku2(param); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index 6ea7859c..5de65ac6 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -93,8 +93,18 @@ public class GoodsSku implements Serializable { /** 备注 */ private String remark; + /** 产地 */ + @NotNull(message = "产地不能为空") private String belong; + /** 包装 */ + @NotNull(message = "包装不能为空") + private String wrapVal; + + /** 口味 */ + @NotNull(message = "口味不能为空") + private String tasteVal; + /** 最后更新时间 */ @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryRuleBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryRuleBo.java index 59849661..80f78385 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryRuleBo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryRuleBo.java @@ -27,6 +27,8 @@ public class GoodsCategoryRuleBo { /** 启用状态 */ private Integer enableFlag; + private Integer sort; + /** 备注 */ private String remark; diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java index 565add79..4f900335 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java @@ -66,7 +66,7 @@ public class GoodsSkuBo implements Serializable { /** 备注 */ private String remark; - /** 规格值Ids(更新操作可为空) */ + /** 已取消：规格值Ids(更新操作可为空) */ private List specValueIds; /** 可投放费用标识 */ @@ -75,8 +75,20 @@ public class GoodsSkuBo implements Serializable { /** 下单标识 */ private Integer orderFlag; + /** 产地 */ + @NotNull(message = "产地不能为空") private String belong; + /** 包装 */ + @NotNull(message = "包装不能为空") + private String wrapVal; + + /** 口味 */ + @NotNull(message = "口味不能为空") + private String tasteVal; + private Integer specialFlag; + + } diff --git a/src/main/java/com/qs/serve/modules/goods/service/GoodsSkuService.java b/src/main/java/com/qs/serve/modules/goods/service/GoodsSkuService.java index d5b89b9f..19910611 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/GoodsSkuService.java +++ b/src/main/java/com/qs/serve/modules/goods/service/GoodsSkuService.java @@ -38,5 +38,11 @@ public interface GoodsSkuService extends IService { void editSku(GoodsSkuBo goodSkuVo); + /** + * 移除商城解构 + * @param goodSkuVo + */ + void editSku2(GoodsSkuBo goodSkuVo); + } 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 8f50fb7b..7a2f1907 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 @@ -228,5 +228,66 @@ public class GoodsSkuServiceImpl extends ServiceImpl im } + @Override + public void editSku2(GoodsSkuBo goodSkuVo) { + GoodsSku dbGoodSku = null; + if(goodSkuVo.getSkuId()!=null){ + dbGoodSku = this.getById(goodSkuVo.getSkuId()); + if(dbGoodSku==null){ + Assert.throwEx("数据不存在"); + } + } + GoodsSku goodsSku = CopierUtil.copy(goodSkuVo,new GoodsSku()); + if(dbGoodSku!=null){ + if(goodsSku.getSpuId()!=null&&!goodsSku.getSpuId().equals(dbGoodSku.getSpuId())){ + Assert.throwEx("规格编码已被其它商品使用"); + } + goodsSku.setId(dbGoodSku.getId()); + } + if(goodSkuVo.getSpecValueIds()!=null){ + if(goodSkuVo.getSpecValueIds().size()!= GoodsConst.SPEC_COUNT){ + Assert.throwEx("规格值数量缺失"); + } + List goodsSpecValues = goodsSpecValueService.listByIds(goodSkuVo.getSpecValueIds()); + Set specIds = goodsSpecValues.stream().map(GoodsSpecValue::getSpecId).collect(Collectors.toSet()); + if(specIds.size()!=GoodsConst.SPEC_COUNT){ + Assert.throwEx("规格数量缺失"); + } + //校验规格值 + String specInfos = goodsSku.getBelong().trim()+";"+goodsSku.getTasteVal().trim()+";"+goodsSku.getWrapVal().trim(); + LambdaQueryWrapper checkSkuSpec = new LambdaQueryWrapper<>(); + checkSkuSpec.eq(GoodsSku::getSpuId,goodsSku.getId()); + checkSkuSpec.eq(GoodsSku::getSpecInfos,specInfos); + if(goodsSku.getId()!=null){ + checkSkuSpec.ne(GoodsSku::getId,goodsSku.getId()); + } + Long checkSkuSpecCount = super.count(checkSkuSpec); + if(checkSkuSpecCount>0){ + Assert.throwEx("相同规格已存在"); + } + goodsSku.setSpecInfos(specInfos); + this.saveOrUpdate(goodsSku); + + }else { + this.updateById(goodsSku); + } + //更新特殊标识 + LambdaQueryWrapper specialSkuLqw = new LambdaQueryWrapper<>(); + specialSkuLqw.eq(GoodsSku::getSpecialFlag,1); + specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getId()); + List specialSkuList = super.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(goodSkuVo.getSpecialFlag().equals(1)){ + spu.setSpecialSkuId(goodsSku1.getId()); + }else { + spu.setSpecialSkuId(0L); + } + spuMapper.updateById(spu); + } + } } diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java index 148c1c12..7ccc13f9 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java @@ -85,10 +85,12 @@ public class OmsOrder implements Serializable { /** 制单人名称 */ @Length(max = 20,message = "制单人名称长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) private String userName; /** 制单人ERP编码 */ @Length(max = 32,message = "制单人ERP编码长度不能超过32字") + @TableField(condition = SqlCondition.LIKE) private String userCode; /** 制单人手机号 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index e5b88401..871a2822 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -569,6 +569,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl();