From 8d41b14c0c71f3d68a5c35ded5081e96bb148056 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 07 May 2022 12:02:45 +0800
Subject: [PATCH] fix goods-form have not complete
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 14 +++-----------
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 1 -
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/mall/conversion/MallGoodsConversion.java | 3 +++
src/main/java/cc/mrbird/febs/mall/entity/MallGoodsSku.java | 2 ++
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/conversion/MallGoodsConversion.java b/src/main/java/cc/mrbird/febs/mall/conversion/MallGoodsConversion.java
index 407f677..5866acc 100644
--- a/src/main/java/cc/mrbird/febs/mall/conversion/MallGoodsConversion.java
+++ b/src/main/java/cc/mrbird/febs/mall/conversion/MallGoodsConversion.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.conversion;
+import cc.mrbird.febs.mall.dto.AddMallGoodsDto;
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.vo.MallGoodsDetailsVo;
import org.mapstruct.Mapper;
@@ -18,4 +19,6 @@
public abstract MallGoodsDetailsVo entityToDetailsVo(MallGoods mallGoods);
public abstract List<MallGoodsDetailsVo> entityListToDetailsVoList(List<MallGoods> mallGoods);
+
+ public abstract MallGoods dtoToEntity(AddMallGoodsDto dto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsSku.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsSku.java
index 4c2317b..dd2ab88 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsSku.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsSku.java
@@ -27,6 +27,8 @@
private BigDecimal presentPrice;
+ private BigDecimal costPrice;
+
private Long styleId;
private Long goodsId;
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 391a690..bdb76f5 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.mall.conversion.MallGoodsConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -99,17 +100,7 @@
}
//新增商品
- MallGoods mallGoods = new MallGoods();
- mallGoods.setGoodsNo(addMallGoodsDto.getGoodsNo());
- mallGoods.setGoodsName(addMallGoodsDto.getGoodsName());
- mallGoods.setGoodsIntrodution(addMallGoodsDto.getGoodsIntrodution());
- mallGoods.setUnit(addMallGoodsDto.getUnit());
- mallGoods.setThumb(addMallGoodsDto.getThumb());
- mallGoods.setGoodsDetails(addMallGoodsDto.getGoodsDetails());
- mallGoods.setOriginalPrice(addMallGoodsDto.getOriginalPrice());
- mallGoods.setCategoryId(addMallGoodsDto.getCategoryId());
- mallGoods.setPresentPrice(addMallGoodsDto.getPresentPrice());
- mallGoods.setIsHot(addMallGoodsDto.getIsHot());
+ MallGoods mallGoods = MallGoodsConversion.INSTANCE.dtoToEntity(addMallGoodsDto);
mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
mallGoodsMapper.insert(mallGoods);
@@ -161,6 +152,7 @@
mallGoodsSku.setOriginalPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice()));
mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
+ mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
mallGoodsSkuMapper.insert(mallGoodsSku);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 8cabb42..972451a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -208,7 +208,7 @@
MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
- BigDecimal score = sku.getOriginalPrice().multiply(mallGoods.getStaticMultiple());
+ BigDecimal score = sku.getOriginalPrice().multiply(mallGoods.getStaticMulti());
memberWalletService.add(score, member.getId(), "score");
memberService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), null, null, null, null, FlowTypeEnum.SCORE.getValue());
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 4fd7fc1..61e0930 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -365,7 +365,6 @@
var data = {};
data.styleName = attrNameVal;
var index = addTableDate(data);
- bindUpload(index);
});
function bindUpload(index) {
--
Gitblit v1.9.1