From b2100bd0dd320e1a6e63c20d0b4bd46a6a333504 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 20 May 2022 11:19:11 +0800
Subject: [PATCH] 20220518

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

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 bc4c6a5..f1b519b 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
@@ -114,6 +114,8 @@
                 orderItem.setStyleName(mallGoods.getGoodsName());
                 orderItem.setSkuName(mallGoods.getGoodsName());
                 orderItem.setSkuImage(mallGoods.getThumb());
+
+                total = total.add(amount);
             } else {
                 MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
                 if (sku == null) {
@@ -140,6 +142,8 @@
                 orderItem.setStyleName(sku.getStyleName());
                 orderItem.setSkuName(sku.getSkuName());
                 orderItem.setSkuImage(sku.getSkuImage());
+                orderItem.setIsNormal(mallGoods.getIsNormal());
+                orderItem.setCostPrice(sku.getCostPrice());
 
                 total = total.add(amount);
 
@@ -231,11 +235,13 @@
                     for (MallOrderItem orderItem : orderItems) {
                         MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
 
-                        MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
-                        BigDecimal score = sku.getOriginalPrice().multiply(mallGoods.getStaticMulti());
+                        if (mallGoods.getIsNormal() == 2) {
+                            MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
+                            BigDecimal score = sku.getOriginalPrice().multiply(mallGoods.getStaticMulti());
 
-                        memberWalletService.add(score, member.getId(), "score");
-                        mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+                            memberWalletService.add(score, member.getId(), "score");
+                            mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+                        }
                     }
                 }
 

--
Gitblit v1.9.1