From c6889419ea24a8df72b654f30b3851f1172e3499 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 23:49:44 +0800
Subject: [PATCH] bug修复

---
 meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java
index 876ac40..5c5bfef 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java
@@ -108,7 +108,13 @@
 
         List<VoMallOrderEquity> voList = BeanUtil.copyToList(list, VoMallOrderEquity.class);
         voList.stream().map(o -> toVoMallOrderEquity(o, vipEquityList)).collect(Collectors.toList());
-
+        for (VoMallOrderEquity voMallOrderEquity : voList) {
+            for (MallOrder mallOrder : list) {
+                if (voMallOrderEquity.getOrderNo().equals(mallOrder.getOrderNo())) {
+                    voMallOrderEquity.setPriceSale(mallOrder.getPayMoney());
+                }
+            }
+        }
         return ApiUtils.returnOK(voList);
     }
     private VoMallOrderEquity toVoMallOrderEquity(VoMallOrderEquity o,List<MallVipEquity> vipEquityList) {
@@ -129,7 +135,6 @@
         MallGoods goods = mallGoodsService.getById(o.getGoodsId());
         Optional.ofNullable(goods).ifPresent(item ->{
             o.setGoodsName(item.getGoodsName());
-            o.setPriceSale(item.getPriceSale());
             o.setGoodsImage(item.getGoodsImage());
         });
         return o;

--
Gitblit v1.7.1