From 022a7ff7abf82cd2546e18071ade5228b4e2339f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 08 七月 2024 14:07:49 +0800
Subject: [PATCH] 管理后台营销员列表职级展示问题修改
---
meiya-admin/src/main/java/com/sinata/modular/mall/service/impl/MallGoodsServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meiya-admin/src/main/java/com/sinata/modular/mall/service/impl/MallGoodsServiceImpl.java b/meiya-admin/src/main/java/com/sinata/modular/mall/service/impl/MallGoodsServiceImpl.java
index 26803ad..e6f622f 100644
--- a/meiya-admin/src/main/java/com/sinata/modular/mall/service/impl/MallGoodsServiceImpl.java
+++ b/meiya-admin/src/main/java/com/sinata/modular/mall/service/impl/MallGoodsServiceImpl.java
@@ -95,8 +95,6 @@
List<MallGoodsSku> goodsSkus = mallGoods.getGoodsSkus().stream().peek(sku -> {
sku.setGoodsId(mallGoods.getId());
sku.setPrice(mallGoods.getPrice());
- sku.setPriceMember(mallGoods.getPriceMember());
- sku.setPriceSale(mallGoods.getPriceSale());
}).collect(Collectors.toList());
this.mallGoodsSkuService.insertBatch(goodsSkus);
}
@@ -105,9 +103,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateMallGoods(MallGoods mallGoods) {
+ MallGoods goods = this.selectById(mallGoods.getId());
if (mallGoods != null && mallGoods.getId() != null) {
// 添加后台消息通知
- addSystemNotice(this.selectById(mallGoods.getId()), mallGoods);
+ addSystemNotice(goods, mallGoods);
}
// 库存求和
@@ -137,8 +136,6 @@
.peek(sku -> {
sku.setGoodsId(mallGoods.getId());
sku.setPrice(mallGoods.getPrice());
- sku.setPriceMember(mallGoods.getPriceMember());
- sku.setPriceSale(mallGoods.getPriceSale());
})
.map(MallGoodsSku::getId)
.filter(Objects::nonNull)
@@ -163,13 +160,16 @@
public void addSystemNotice(MallGoods oldGoods, MallGoods newGoods) {
try {
StringBuffer updateStr = new StringBuffer();
- if (oldGoods.getPrice().compareTo(newGoods.getPrice()) != 0) {
+ if (oldGoods.getPrice() != null && newGoods.getPrice() != null &&
+ oldGoods.getPrice().compareTo(newGoods.getPrice()) != 0) {
updateStr.append("将市场价" + oldGoods.getPrice() + "元修改为" + newGoods.getPrice() + "元。");
}
- if (oldGoods.getPriceSale().compareTo(newGoods.getPriceSale()) != 0) {
+ if (oldGoods.getPriceSale() != null && newGoods.getPriceSale() != null &&
+ oldGoods.getPriceSale().compareTo(newGoods.getPriceSale()) != 0) {
updateStr.append("将美天销售价" + oldGoods.getPriceSale() + "元修改为" + newGoods.getPriceSale() + "元。");
}
- if (oldGoods.getPriceMember().compareTo(newGoods.getPriceMember()) != 0) {
+ if (oldGoods.getPriceMember() != null && newGoods.getPriceMember() != null &&
+ oldGoods.getPriceMember().compareTo(newGoods.getPriceMember()) != 0) {
updateStr.append("将会员价" + oldGoods.getPriceMember() + "元修改为" + newGoods.getPriceMember() + "元。");
}
--
Gitblit v1.7.1