From 7ced4fdb47299ca630042075bf58156853912fd9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 17:51:21 +0800
Subject: [PATCH] 20221221

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 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 4465519..824441e 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
@@ -119,12 +119,12 @@
         //根据商品原价获取商品补贴金额
         DataDictionaryCustom subsidyPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SUBSIDY_PERCENT.getType()
                 , DataDictionaryEnum.SUBSIDY_PERCENT.getCode());
-        BigDecimal subsidyPercent = new BigDecimal(subsidyPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(BigDecimal.ROUND_DOWN,2);
-        BigDecimal subsidyAmount = subsidyPercent.multiply(new BigDecimal(originalPrice)).setScale(BigDecimal.ROUND_DOWN, 2);
+        BigDecimal subsidyPercent = new BigDecimal(subsidyPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
+        BigDecimal subsidyAmount = subsidyPercent.multiply(new BigDecimal(originalPrice)).setScale(2, BigDecimal.ROUND_DOWN);
         mallGoods.setSubsidyAmount(subsidyAmount);
-        if (mallGoods.getHasCarriage() == 2) {
-            mallGoods.setCarriage(BigDecimal.ZERO);
-        }
+//        if (mallGoods.getHasCarriage() == 2) {
+//            mallGoods.setCarriage(BigDecimal.ZERO);
+//        }
         mallGoodsMapper.insert(mallGoods);
 
         String thumbs = addMallGoodsDto.getThumbs();
@@ -353,9 +353,9 @@
         }
 
         BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
-        if (mallGoods.getHasCarriage() == 2) {
-            mallGoods.setCarriage(BigDecimal.ZERO);
-        }
+//        if (mallGoods.getHasCarriage() == 2) {
+//            mallGoods.setCarriage(BigDecimal.ZERO);
+//        }
         //根据商品原价获取商品星级
         String originalPrice = mallGoods.getOriginalPrice();
         String starRating = StarRatingEnum.NORMAL.belongStarRating(originalPrice);
@@ -363,8 +363,8 @@
         //根据商品原价获取商品补贴金额
         DataDictionaryCustom subsidyPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SUBSIDY_PERCENT.getType()
                 , DataDictionaryEnum.SUBSIDY_PERCENT.getCode());
-        BigDecimal subsidyPercent = new BigDecimal(subsidyPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(BigDecimal.ROUND_DOWN,2);
-        BigDecimal subsidyAmount = subsidyPercent.multiply(new BigDecimal(originalPrice)).setScale(BigDecimal.ROUND_DOWN, 2);
+        BigDecimal subsidyPercent = new BigDecimal(subsidyPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
+        BigDecimal subsidyAmount = subsidyPercent.multiply(new BigDecimal(originalPrice)).setScale(2, BigDecimal.ROUND_DOWN);
         mallGoods.setSubsidyAmount(subsidyAmount);
 
         mallGoodsMapper.updateById(mallGoods);
@@ -517,5 +517,13 @@
         return new FebsResponse().success();
     }
 
+    public static void main(String[] args) {
+
+        //根据商品原价获取商品补贴金额
+        BigDecimal subsidyPercent = new BigDecimal("5").multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
+        BigDecimal subsidyAmount = subsidyPercent.multiply(new BigDecimal("1")).setScale(2,BigDecimal.ROUND_DOWN);
+        System.out.println(subsidyAmount);
+    }
+
 
 }

--
Gitblit v1.9.1