share_store
/
ss-common-goods
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

12.19

master
wangpengfei 4 months ago
parent
1e16f89e0f
commit
00419647da
3 changed files with 66 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
  2. 30
      src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
  3. 2
      src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailService.java

49
src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
View File

@ -81,7 +81,7 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
return rb.success().setData(p);
}
if (StringUtils.isNotBlank(query.getName())) {
qw.like("b.title", query.getName());
qw.like("a.goodsName", query.getName());
}
qw.orderByAsc("sortNo");
IPage<GoodsSku> page = PagerUtil.queryToPage(pq);
@ -144,7 +144,7 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
if(dtos.size()!=0){
List<GoodsSku> skus=baseMapper.selectList(new QueryWrapper<GoodsSku>().eq("goodsSpuSid",dtos.get(0).getGoodsSpuSid()));
for (GoodsSku goodsSku : skus) {
baseMapper.delete(new QueryWrapper<GoodsSku>(goodsSku).eq("sid",goodsSku.getSid()));
// baseMapper.delete(new QueryWrapper<GoodsSku>(goodsSku).eq("sid",goodsSku.getSid()));
GoodsSkuExtend extend=goodsSkuExtendService.getOne(new QueryWrapper<GoodsSkuExtend>().eq("goodsSkuSid",goodsSku.getSid()));
goodsSkuExtendService.delete(extend.getSid());
}
@ -184,7 +184,52 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
return rb.success().setMsg("成功").setData(skus);
}
@Transactional
public ResultBean<List<GoodsSku>> saveOrUpdate1(List<GoodsSkuDto> dtos) {
ResultBean rb = ResultBean.fireFail();
if(dtos.size()!=0){
List<GoodsSku> skus=baseMapper.selectList(new QueryWrapper<GoodsSku>().eq("goodsSpuSid",dtos.get(0).getGoodsSpuSid()));
for (GoodsSku goodsSku : skus) {
// baseMapper.delete(new QueryWrapper<GoodsSku>(goodsSku).eq("sid",goodsSku.getSid()));
GoodsSkuExtend extend=goodsSkuExtendService.getOne(new QueryWrapper<GoodsSkuExtend>().eq("goodsSkuSid",goodsSku.getSid()));
goodsSkuExtendService.delete(extend.getSid());
}
}
List<GoodsSku> skus=new ArrayList<>();
for (GoodsSkuDto dto : dtos) {
GoodsSku sku = baseMapper.selectOne(new QueryWrapper<GoodsSku>().eq("sid", dto.getSid()));
String sid = "";
if (null != sku) {
sid = dto.getSid();
GoodsSku wmsGoods = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsGoods);
wmsGoods.setModifyTime(new Date());
baseMapper.updateById(wmsGoods);
dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid());
if(dto.getGoodsSkuSubunit()!=null){
dto.getGoodsSkuSubunit().setSkuSid(wmsGoods.getSid());
goodsSkuSubunitService.saveOrUpdate(dto.getGoodsSkuSubunit());
}
goodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend());
skus.add(wmsGoods);
} else {
GoodsSku wmsGoods = new GoodsSku();
BeanUtil.copyProperties(dto, wmsGoods);
wmsGoods.setCreateTime(new DateTime());
wmsGoods.setSid(UUID.randomUUID().toString());
baseMapper.insert(wmsGoods);
dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid());
if(dto.getGoodsSkuSubunit()!=null){
dto.getGoodsSkuSubunit().setSkuSid(wmsGoods.getSid());
goodsSkuSubunitService.saveOrUpdate(dto.getGoodsSkuSubunit());
}
goodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend());
skus.add(wmsGoods);
}
}
return rb.success().setMsg("成功").setData(skus);
}
public ResultBean<GoodsSkuVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
GoodsSkuVo vo = baseMapper.getSkuBySid(sid);

30
src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
View File

@ -154,6 +154,7 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
String sid = "";
GoodsSpu spun = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("sid", dto.getSid()));
GoodsUnit goodsUnit = goodsUnitService.getOne(new QueryWrapper<GoodsUnit>().eq("sid", dto.getGoodsUnitSid()));
GoodsSpu spu1 = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("goodsCode", dto.getGoodsCode()));
if (null != goodsUnit) {
dto.setGoodsUnitName(goodsUnit.getUnitName());
}
@ -170,8 +171,13 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
dto.setSortNo("0");
}
if (spun != null) {
if (!spun.getSid().equals(dto.getSid())) {
return rb.setMsg("商品编码重复");
// if (!spun.getSid().equals(dto.getSid())) {
// return rb.setMsg("商品编码重复");
// }
if(spu1!=null){
if (!spu1.getSid().equals(spun.getSid())) {
return rb.setMsg("商品编码重复");
}
}
for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
if(StringUtils.isBlank(baseGoodsSkus.getGoodsSkuCode())){
@ -292,7 +298,7 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
GoodsSpu spun = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("sid", dto.getSid()));
GoodsUnit goodsUnit = goodsUnitService.getOne(new QueryWrapper<GoodsUnit>().eq("sid", dto.getGoodsUnitSid()));
GoodsSpu spu1 = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("goodsName", dto.getGoodsName()));
GoodsSpu spu1 = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("goodsCode", dto.getGoodsCode()));
if (null != goodsUnit) {
dto.setGoodsUnitName(goodsUnit.getUnitName());
}
@ -313,15 +319,15 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
if (spun != null) {
if(spu1!=null){
if (!spu1.getSid().equals(spun.getSid())) {
return rb.setMsg("商品名称重复");
return rb.setMsg("商品规格编码重复");
}
}
for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
if(StringUtils.isNotBlank(baseGoodsSkus.getTitle())){
GoodsSku sku=goodsSkuService.getOne(new QueryWrapper<GoodsSku>().eq("title",baseGoodsSkus.getTitle()));
if(StringUtils.isNotBlank(baseGoodsSkus.getGoodsSkuCode())){
GoodsSku sku=goodsSkuService.getOne(new QueryWrapper<GoodsSku>().eq("goodsSkuCode",baseGoodsSkus.getGoodsSkuCode()));
if(sku!=null){
if(!baseGoodsSkus.getSid().equals(sku.getSid())){
return rb.setMsg("商品sku名重复");
return rb.setMsg("商品规格编码重复");
}
}
}
@ -338,18 +344,18 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
dto.getBaseGoodsSkus().forEach(s -> {
s.setGoodsSpuSid(wmsGoods.getSid());
});
skus=goodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus()).getData();
skus=goodsSkuService.saveOrUpdate1(dto.getBaseGoodsSkus()).getData();
baseGoodsSpuDetailService.saveOrUpdate(dto.getBaseGoodsSpuDetail());
baseMapper.updateById(wmsGoods);
} else {
if (spu1 != null) {
return rb.setMsg("商品spu名重复");
return rb.setMsg("商品规格编码重复");
}
for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
GoodsSku sku1=goodsSkuService.getOne(new QueryWrapper<GoodsSku>().eq("title",baseGoodsSkus.getTitle()));
GoodsSku sku1=goodsSkuService.getOne(new QueryWrapper<GoodsSku>().eq("goodsSkuCode",baseGoodsSkus.getGoodsSkuCode()));
if(sku1!=null){
return rb.setMsg("商品sku名重复");
return rb.setMsg("商品规格编码重复");
}
}
GoodsSpu wmsGoods = new GoodsSpu();
@ -366,7 +372,7 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
dto.getBaseGoodsSkus().forEach(s -> {
s.setGoodsSpuSid(wmsGoods.getSid());
});
skus=goodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus()).getData();
skus=goodsSkuService.saveOrUpdate1(dto.getBaseGoodsSkus()).getData();
baseGoodsSpuDetailService.saveOrUpdate(dto.getBaseGoodsSpuDetail());
baseMapper.insert(wmsGoods);
}

2
src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailService.java
View File

@ -62,7 +62,7 @@ public class BaseGoodsSpuDetailService extends MybatisBaseService<GoodsSpuDetail
if (null!=detail) {
sid = dto.getSid();
GoodsSpuDetail goodsSpuDetail = fetchBySid(detail.getSid());
BeanUtil.copyProperties(dto, goodsSpuDetail);
BeanUtil.copyProperties(dto, goodsSpuDetail,"id","sid");
goodsSpuDetail.setModifyTime(new Date());
baseMapper.updateById(goodsSpuDetail);
} else {

Write Preview
Loading…
Cancel
Save