From 83c56b01c49a766ebb480d5701c3638ce58f14c2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 22 Dec 2023 15:07:53 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 275 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 216 insertions(+), 59 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
index 0ebb028..fb462ea 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
@@ -12,6 +13,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,6 +49,13 @@
}
@Override
+ public IPage<AdminMallGoodsVo> getAppCategoryListInPage(MallGoods mallGoods, QueryRequest request) {
+ Page<AdminMallGoodsVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminMallGoodsVo> adminMallGoodsVos = this.baseMapper.selectMallAppGoodsInPage(page, mallGoods);
+ return adminMallGoodsVos;
+ }
+
+ @Override
@Transactional
public FebsResponse addMallGoods(AddMallGoodsDto addMallGoodsDto) {
String goodsName = addMallGoodsDto.getGoodsName();
@@ -73,40 +82,46 @@
return new FebsResponse().fail().message("商品分类不能为空");
}
- List<AddMallGoodsSkuDto> addSkus = addMallGoodsDto.getAddMallGoodsSkuDtos();
- if (CollUtil.isEmpty(addSkus)) {
- return new FebsResponse().fail().message("商品规格不能为空");
- }
- for (AddMallGoodsSkuDto addSku : addSkus) {
- String skuName = addSku.getSkuName();
- if (StrUtil.isEmpty(skuName)) {
- return new FebsResponse().fail().message("商品规格名称不能为空");
+ if (addMallGoodsDto.getIsSku() == 1) {
+ List<AddMallGoodsSkuDto> addSkus = addMallGoodsDto.getAddMallGoodsSkuDtos();
+ if (CollUtil.isEmpty(addSkus)) {
+ return new FebsResponse().fail().message("商品规格不能为空");
}
- String skuImage = addSku.getSkuImage();
- if (StrUtil.isEmpty(skuImage)) {
- return new FebsResponse().fail().message("商品规格图片不能为空");
- }
- Integer skuVolume = addSku.getSkuVolume() == null ? 0 : addSku.getSkuVolume();
- if (skuVolume < 0) {
- return new FebsResponse().fail().message("商品规格销售数量不能小于0");
- }
- Integer stock = addSku.getStock() == null ? 0 : addSku.getStock();
- if (stock < 0) {
- return new FebsResponse().fail().message("商品规格库存必须大于0");
- }
- String originalPrice = addSku.getOriginalPrice();
- if (StrUtil.isEmpty(originalPrice)) {
- return new FebsResponse().fail().message("商品规格原价不能为空");
- }
- String presentPrice = addSku.getPresentPrice();
- if (StrUtil.isEmpty(presentPrice)) {
- return new FebsResponse().fail().message("商品规格现价不能为空");
+ for (AddMallGoodsSkuDto addSku : addSkus) {
+ String skuName = addSku.getSkuName();
+ if (StrUtil.isEmpty(skuName)) {
+ return new FebsResponse().fail().message("商品规格名称不能为空");
+ }
+ String skuImage = addSku.getSkuImage();
+ if (StrUtil.isEmpty(skuImage)) {
+ return new FebsResponse().fail().message("商品规格图片不能为空");
+ }
+ Integer skuVolume = addSku.getSkuVolume() == null ? 0 : addSku.getSkuVolume();
+ if (skuVolume < 0) {
+ return new FebsResponse().fail().message("商品规格销售数量不能小于0");
+ }
+ Integer stock = addSku.getStock() == null ? 0 : addSku.getStock();
+ if (stock < 0) {
+ return new FebsResponse().fail().message("商品规格库存必须大于0");
+ }
+ String originalPrice = addSku.getOriginalPrice();
+ if (StrUtil.isEmpty(originalPrice)) {
+ return new FebsResponse().fail().message("商品规格原价不能为空");
+ }
+ String presentPrice = addSku.getPresentPrice();
+ if (StrUtil.isEmpty(presentPrice)) {
+ return new FebsResponse().fail().message("商品规格现价不能为空");
+ }
}
}
}
//新增商品
MallGoods mallGoods = MallGoodsConversion.INSTANCE.dtoToEntity(addMallGoodsDto);
mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
+
+ if (mallGoods.getHasCarriage() == 2) {
+ mallGoods.setCarriage(BigDecimal.ZERO);
+ }
mallGoodsMapper.insert(mallGoods);
String thumbs = addMallGoodsDto.getThumbs();
@@ -126,6 +141,27 @@
}
if (addMallGoodsDto.getGoodsType() == 2) {
+ return new FebsResponse().success().message("添加成功");
+ }
+
+ // 单规格
+ if (addMallGoodsDto.getIsSku() == 2) {
+ MallGoodsStyle style = new MallGoodsStyle();
+ style.setGoodsId(mallGoods.getId());
+ style.setName(mallGoods.getGoodsName());
+ mallGoodsStyleMapper.insert(style);
+
+ MallGoodsSku sku = new MallGoodsSku();
+ sku.setGoodsId(mallGoods.getId());
+ sku.setSkuImage(mallGoods.getThumb());
+ sku.setSkuName(mallGoods.getGoodsName());
+ sku.setCostPrice(mallGoods.getCostPrice());
+ sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
+ sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
+ sku.setSkuVolume(mallGoods.getVolume());
+ sku.setStock(mallGoods.getStock());
+ sku.setStyleId(style.getId());
+ mallGoodsSkuMapper.insert(sku);
return new FebsResponse().success().message("添加成功");
}
@@ -166,6 +202,23 @@
}
return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse addMallAppGoods(AddMallGoodsDto addMallGoodsDto) {
+ String goodsNo = addMallGoodsDto.getGoodsNo();
+ Integer mallGoodsByGoodsNo = mallGoodsMapper.selectMallGoodsCountByGoodsNo(goodsNo);
+ if (mallGoodsByGoodsNo > 0) {
+ return new FebsResponse().fail().message("商品编号不能重复");
+ }
+ //新增商品
+ MallGoods mallGoods = MallGoodsConversion.INSTANCE.dtoToEntity(addMallGoodsDto);
+ mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
+ mallGoods.setIsApp(AppContants.IS_APP_GOODS);
+ mallGoodsMapper.insert(mallGoods);
+ return new FebsResponse().success().message("添加成功");
+
}
@Override
@@ -262,44 +315,62 @@
if (mallGoodsByGoodsNo > 0) {
return new FebsResponse().fail().message("商品编号不能重复");
}
- Long categoryId = mallGoodsUpdateDto.getCategoryId();
- if (ObjectUtil.isEmpty(categoryId)) {
- return new FebsResponse().fail().message("商品分类不能为空");
- }
- List<MailGoodsSkuDto> addSkus = mallGoodsUpdateDto.getMailGoodsSkuDto();
- if (CollUtil.isEmpty(addSkus)) {
- return new FebsResponse().fail().message("商品规格不能为空");
- }
- for (MailGoodsSkuDto addSku : addSkus) {
- String skuName = addSku.getSkuName();
- if (StrUtil.isEmpty(skuName)) {
- return new FebsResponse().fail().message("商品规格名称不能为空");
- }
- String skuImage = addSku.getSkuImage();
- if (StrUtil.isEmpty(skuImage)) {
- return new FebsResponse().fail().message("商品规格图片不能为空");
- }
- Integer skuVolume = addSku.getSkuVolume() == null ? 0 : addSku.getSkuVolume();
- if (skuVolume < 0) {
- return new FebsResponse().fail().message("商品规格销售数量不能小于0");
- }
- Integer stock = addSku.getStock() == null ? 0 : addSku.getStock();
- if (stock < 0) {
- return new FebsResponse().fail().message("商品规格库存必须大于0");
- }
- BigDecimal originalPrice = addSku.getOriginalPrice();
- if (originalPrice.compareTo(BigDecimal.ZERO) <= 0) {
- return new FebsResponse().fail().message("商品规格原价不能小于0");
- }
- BigDecimal presentPrice = addSku.getPresentPrice();
- if (presentPrice.compareTo(BigDecimal.ZERO) <= 0) {
- return new FebsResponse().fail().message("商品规格现价不能小于0");
+
+ if (mallGoodsUpdateDto.getGoodsType() != 2) {
+ Long categoryId = mallGoodsUpdateDto.getCategoryId();
+ if (ObjectUtil.isEmpty(categoryId)) {
+ return new FebsResponse().fail().message("商品分类不能为空");
}
+ if (mallGoodsUpdateDto.getIsSku() == 1) {
+ List<MailGoodsSkuDto> addSkus = mallGoodsUpdateDto.getMailGoodsSkuDto();
+ if (CollUtil.isEmpty(addSkus)) {
+ return new FebsResponse().fail().message("商品规格不能为空");
+ }
+ for (MailGoodsSkuDto addSku : addSkus) {
+ String skuName = addSku.getSkuName();
+ if (StrUtil.isEmpty(skuName)) {
+ return new FebsResponse().fail().message("商品规格名称不能为空");
+ }
+ String skuImage = addSku.getSkuImage();
+ if (StrUtil.isEmpty(skuImage)) {
+ return new FebsResponse().fail().message("商品规格图片不能为空");
+ }
+ Integer skuVolume = addSku.getSkuVolume() == null ? 0 : addSku.getSkuVolume();
+ if (skuVolume < 0) {
+ return new FebsResponse().fail().message("商品规格销售数量不能小于0");
+ }
+ Integer stock = addSku.getStock() == null ? 0 : addSku.getStock();
+ if (stock < 0) {
+ return new FebsResponse().fail().message("商品规格库存必须大于0");
+ }
+ BigDecimal originalPrice = addSku.getOriginalPrice();
+ if (originalPrice.compareTo(BigDecimal.ZERO) <= 0) {
+ return new FebsResponse().fail().message("商品规格原价不能小于0");
+ }
+ BigDecimal presentPrice = addSku.getPresentPrice();
+ if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
+ return new FebsResponse().fail().message("商品规格现价不能小于0");
+ }
+
+ }
+ }
}
+
//新增商品
MallGoods mallGoods = mallGoodsMapper.selectById(mallGoodsUpdateDto.getId());
+
+ // 若原来不为多规格或编辑后也不为多规格，则清空样式和规格
+ if (mallGoods.getIsSku() == 2 || mallGoodsUpdateDto.getIsSku() == 2) {
+ mallGoodsSkuMapper.deleteByGoodsId(mallGoods.getId());
+ mallGoodsStyleMapper.deleteByGoodsId(mallGoods.getId());
+ }
+
BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
+ if (mallGoods.getHasCarriage() == 2) {
+ mallGoods.setCarriage(BigDecimal.ZERO);
+ }
+
mallGoodsMapper.updateById(mallGoods);
mallGoodsImagesMapper.deleteByGoodsId(mallGoodsUpdateDto.getId());
@@ -318,6 +389,33 @@
}
}
}
+
+ if (mallGoodsUpdateDto.getGoodsType() == 2) {
+ return new FebsResponse().success().message("编辑成功");
+ }
+
+ // 单规格
+ if (mallGoodsUpdateDto.getIsSku() == 2) {
+ MallGoodsStyle style = new MallGoodsStyle();
+ style.setGoodsId(mallGoods.getId());
+ style.setName(mallGoods.getGoodsName());
+ mallGoodsStyleMapper.insert(style);
+
+ MallGoodsSku sku = new MallGoodsSku();
+ sku.setGoodsId(mallGoods.getId());
+ sku.setSkuImage(mallGoods.getThumb());
+ sku.setSkuName(mallGoods.getGoodsName());
+ sku.setCostPrice(mallGoods.getCostPrice());
+ sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
+ sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
+ sku.setSkuVolume(mallGoods.getVolume());
+ sku.setStock(mallGoods.getStock());
+ sku.setStyleId(style.getId());
+ mallGoodsSkuMapper.insert(sku);
+ return new FebsResponse().success().message("添加成功");
+ }
+
+
// 删除已存在sku
List<Long> delSkuIds = mallGoodsUpdateDto.getDelSkuId();
@@ -397,9 +495,68 @@
}
@Override
+ public FebsResponse updateAppMallGoods(MallGoodsUpdateDto mallGoodsUpdateDto) {
+ //新增商品
+ MallGoods mallGoods = mallGoodsMapper.selectById(mallGoodsUpdateDto.getId());
+ BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
+ mallGoodsMapper.updateById(mallGoods);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
public List<AdminMallGoodsTreeVo> getAllGoodsTree() {
return mallGoodsMapper.getAllGoodsTree();
}
+ @Override
+ public FebsResponse goodsHot(Long id) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(id);
+ if (ObjectUtil.isEmpty(mallGoods)) {
+ return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
+ }
+ mallGoods.setIsHot(MallGoods.ISHOT_STATE_YES);
+ mallGoodsMapper.updateById(mallGoods);
+ return new FebsResponse().success();
+ }
+ @Override
+ public FebsResponse goodsNotHot(Long id) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(id);
+ if (ObjectUtil.isEmpty(mallGoods)) {
+ return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
+ }
+ mallGoods.setIsHot(MallGoods.ISHOT_STATE_NO);
+ mallGoodsMapper.updateById(mallGoods);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public IPage<AdminHomeDeliverySettingVo> getDeliveryHomeListInPage(AdminHomeDeliverySettingVo adminHomeDeliverySetting, QueryRequest request) {
+ Page<DataDictionaryCustom> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<DataDictionaryCustom> dataDictionaryCustomIPage = this.baseMapper.getDeliveryHomeListInPage(page, adminHomeDeliverySetting);
+ List<DataDictionaryCustom> records = dataDictionaryCustomIPage.getRecords();
+ List<AdminHomeDeliverySettingVo> adminHomeDeliverySettingVos = new ArrayList<>();
+ if(CollUtil.isNotEmpty(records)){
+ for(DataDictionaryCustom dataDictionaryCustom : records){
+ AdminHomeDeliverySettingVo adminHomeDeliverySettingVo = JSONUtil.toBean(dataDictionaryCustom.getValue(), AdminHomeDeliverySettingVo.class);
+ adminHomeDeliverySettingVo.setId(dataDictionaryCustom.getId());
+ adminHomeDeliverySettingVos.add(adminHomeDeliverySettingVo);
+ }
+ }
+ IPage<AdminHomeDeliverySettingVo> adminHomeDeliverySettingVoIPage = new Page<>();
+ adminHomeDeliverySettingVoIPage.setRecords(adminHomeDeliverySettingVos);
+ adminHomeDeliverySettingVoIPage.setTotal(dataDictionaryCustomIPage.getTotal());
+ return adminHomeDeliverySettingVoIPage;
+ }
+
+
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ @Override
+ public FebsResponse deliveryHomeUpdate(AdminHomeDeliverySettingVo adminHomeDeliverySettingVo) {
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectById(adminHomeDeliverySettingVo.getId());
+ adminHomeDeliverySettingVo.setId(null);
+ dataDictionaryCustom.setValue(JSONUtil.toJsonStr(adminHomeDeliverySettingVo));
+ dataDictionaryCustomMapper.updateById(dataDictionaryCustom);
+ return new FebsResponse().success();
+ }
}
--
Gitblit v1.9.1