From c619972c50577bb699be6ee099b5e2741882fabb Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 27 Dec 2023 16:15:59 +0800
Subject: [PATCH] 直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 95 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 1 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 5ed4b73..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;
@@ -43,6 +45,13 @@
public IPage<AdminMallGoodsVo> getCategoryListInPage(MallGoods mallGoods, QueryRequest request) {
Page<AdminMallGoodsVo> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<AdminMallGoodsVo> adminMallGoodsVos = this.baseMapper.selectMallGoodsInPage(page, mallGoods);
+ return adminMallGoodsVos;
+ }
+
+ @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;
}
@@ -109,6 +118,10 @@
//新增商品
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();
@@ -189,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
@@ -319,7 +349,7 @@
return new FebsResponse().fail().message("商品规格原价不能小于0");
}
BigDecimal presentPrice = addSku.getPresentPrice();
- if (presentPrice.compareTo(BigDecimal.ZERO) <= 0) {
+ if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
return new FebsResponse().fail().message("商品规格现价不能小于0");
}
@@ -337,6 +367,10 @@
}
BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
+ if (mallGoods.getHasCarriage() == 2) {
+ mallGoods.setCarriage(BigDecimal.ZERO);
+ }
+
mallGoodsMapper.updateById(mallGoods);
mallGoodsImagesMapper.deleteByGoodsId(mallGoodsUpdateDto.getId());
@@ -461,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