From b3b3987e17a80b4fe6bc29f3835429058eb2e0fc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Mar 2023 10:26:59 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java | 4 ++++
src/main/resources/mapper/modules/MallGoodsMapper.xml | 2 --
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java | 8 --------
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallShoppingCartServiceImpl.java | 10 ++++++++++
src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java | 3 +++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java | 3 +++
6 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
index 2f6a93d..6d03651 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
@@ -127,4 +127,7 @@
*/
private Integer scorePercent;
+ @TableField(exist = false)
+ private BigDecimal scorePercentNum;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
index 6135e77..3e92f91 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
@@ -66,6 +66,9 @@
objectQueryWrapper.eq("goods_id",id);
Integer commentCount = mallGoodsCommentMapper.selectCount(objectQueryWrapper);
mallGoodsDetailsVo.setCommentCount(commentCount);
+ Integer scorePercent = mallGoodsDetailsVo.getScorePercent();
+ mallGoodsDetailsVo.setScorePercentNum(new BigDecimal(scorePercent).multiply(new BigDecimal(0.01)));
+
return mallGoodsDetailsVo;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallShoppingCartServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallShoppingCartServiceImpl.java
index 73f3c5a..c6185a4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallShoppingCartServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallShoppingCartServiceImpl.java
@@ -4,18 +4,21 @@
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.conversion.MallShoppingCartConversion;
import cc.mrbird.febs.mall.dto.AddCartDto;
+import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallGoodsSku;
import cc.mrbird.febs.mall.entity.MallShoppingCart;
import cc.mrbird.febs.mall.mapper.MallGoodsSkuMapper;
import cc.mrbird.febs.mall.mapper.MallShoppingCartMapper;
import cc.mrbird.febs.mall.service.IApiMallShoppingCartService;
import cc.mrbird.febs.mall.vo.ShoppingCartGoodsVo;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -33,6 +36,13 @@
public List<ShoppingCartGoodsVo> findCartGoodsList() {
Long memberId = LoginUserUtil.getLoginUser().getId();
List<MallShoppingCart> carts = this.baseMapper.selectCartGoodsList(memberId);
+ if(CollUtil.isNotEmpty(carts)){
+ for(MallShoppingCart mallShoppingCart : carts){
+ MallGoods goods = mallShoppingCart.getGoods();
+ Integer scorePercent = goods.getScorePercent();
+ goods.setScorePercentNum(new BigDecimal(scorePercent).multiply(new BigDecimal(0.01)));
+ }
+ }
return MallShoppingCartConversion.INSTANCE.entityListToVoList(carts);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
index 7d7769c..f4e2264 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
@@ -79,4 +79,8 @@
* 积分兑换比例
*/
private Integer scorePercent;
+ /**
+ * 积分兑换比例
+ */
+ private BigDecimal scorePercentNum;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
index 24215b8..bc3d4d4 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
@@ -40,12 +40,4 @@
@ApiModelProperty(value = "是否有运费 1-是 2-包邮")
private Integer hasCarriage;
- /**
- * 排序位置
- */
- private Integer sortCnt;
- /**
- * 积分兑换比例
- */
- private Integer scorePercent;
}
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 013cf8f..6c70925 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -74,8 +74,6 @@
a.present_price,
a.score,
a.is_hot,
- a.score_percent,
- a.sort_cnt,
min(b.present_price) price,
sum(b.sku_volume) saleVolume
from mall_goods a
--
Gitblit v1.9.1