From 6efff70a60cc5050d888f492fabb083d310ab88b Mon Sep 17 00:00:00 2001
From: seesaw <seesawgzz@gmail.com>
Date: Thu, 22 Aug 2024 09:27:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/controller/app/diningplates/vo/AppUserInfo.java    | 2 ++
 .../member/service/diningplates/DiningPlatesServiceImpl.java  | 2 +-
 .../member/service/orderdetail/OrderDetailServiceImpl.java    | 4 ++--
 .../yudao/module/system/service/devuce/DevuceServiceImpl.java | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/vo/AppUserInfo.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/vo/AppUserInfo.java
index 8d662e4f..ee294d79 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/vo/AppUserInfo.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/vo/AppUserInfo.java
@@ -21,4 +21,6 @@ public class AppUserInfo {
     private BigDecimal dishesBasePrice;
 
     private BigDecimal orderMoney;
+
+    private BigDecimal dishesSumPrice;
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java
index f63d6f58..b014f574 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java
@@ -415,7 +415,7 @@ public class DiningPlatesServiceImpl implements DiningPlatesService {
         AppUserInfo appUserInfo = new AppUserInfo();
         appUserInfo.setNickname(memberUserDO.getNickname())
                 .setDishesName(dish.getDishesName())
-                .setDishesBasePrice(dish.getDishesBasePrice())
+                .setDishesBasePrice(dish.getDishesBasePrice()).setDishesSumPrice(dish.getDishesSumPrice())
                 .setMoney(moneyByUserId).setOrderMoney(new BigDecimal(stringRedisTemplate.opsForValue().get(diningPlatesNum)));
         return appUserInfo;
     }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
index 3c923092..8aa06d30 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
@@ -104,7 +104,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         String old = stringRedisTemplate.opsForValue().get(createReqVO.getDiningPlatesNum());
         BigDecimal oldBigDecimal = new BigDecimal(old);
         //计算每个菜品的价格
-        BigDecimal bigDecimal1 = dish.getDishesBasePrice().multiply(createReqVO.getWeight()).setScale(2, RoundingMode.HALF_UP);
+        BigDecimal bigDecimal1 = dish.getDishesSumPrice().multiply(createReqVO.getWeight()).divide(dish.getDishesNumber(),2, RoundingMode.HALF_UP);
         //
         BigDecimal newPrice =bigDecimal1.add(oldBigDecimal).setScale(2, RoundingMode.HALF_UP);
         stringRedisTemplate.opsForValue().set(createReqVO.getDiningPlatesNum(),newPrice.toString());
@@ -114,7 +114,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
             BigDecimal dishesNumber = new BigDecimal(dishEnergy.getDishesNumber());
             BigDecimal nutritionNumber = new BigDecimal(dishEnergy.getNutritionNumber());
             if(BigDecimal.ZERO.compareTo(dishesNumber)!=0){
-                BigDecimal bigDecimal = createReqVO.getWeight().divide(dishesNumber).multiply(nutritionNumber).divide(new BigDecimal("4.184"),4,RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP);
+                BigDecimal bigDecimal = createReqVO.getWeight().multiply(nutritionNumber).divide(dishesNumber.multiply(new BigDecimal("4.184")),2,RoundingMode.HALF_UP);
                 orderDetail.setHeat(bigDecimal.doubleValue());
             }
         }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
index cd065760..05bfe097 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
@@ -213,6 +213,7 @@ public class DevuceServiceImpl implements DevuceService {
             f.put("dishesName",dishesDO.getDishesName());
             f.put("dishesImageUrl",dishesDO.getDishesImageUrl());
             f.put("userName",s);
+            f.put("dishesSumPrice",dishesDO.getDishesSumPrice());
         });
         return maps;
     }