From 3d237ccfcc5aa5534bda80131287e1562e2e0ad3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 30 八月 2024 15:51:32 +0800
Subject: [PATCH] 会员价展示

---
 src/main/java/com/mzl/flower/service/payment/OrderService.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 5866419..c9bab5f 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -24,6 +24,7 @@
 import com.mzl.flower.entity.customer.Address;
 import com.mzl.flower.entity.customer.Customer;
 import com.mzl.flower.entity.flower.FlowerSupplierSaleNum;
+import com.mzl.flower.entity.menber.Member;
 import com.mzl.flower.entity.partner.Partner;
 import com.mzl.flower.entity.payment.*;
 import com.mzl.flower.entity.supplier.Station;
@@ -211,13 +212,18 @@
         if (ls != null && ls.size() > 0) {
             Customer customer = getCurrentCustomer();
             Long partnerId = customer.getPartnerId();
+            Long levelId = customer.getLevelId();
+            Member member = getMember(levelId);
 
             Map<Long, FlowerCartListWrapDTO> map = new HashMap<>();
             for (FlowerCartListDTO c : ls) {
                 BigDecimal price = getFinalPrice(partnerId, c.getCategory()
                         , c.getId(), c.getPrice(), c.getLevel());
                 c.setPrice(price);
+                c.setPriceMember(calculateMemberPrice(price, member));
+
                 c.setTotal(price.multiply(new BigDecimal(c.getNum())));
+                c.setTotalMember(c.getPriceMember().multiply(new BigDecimal(c.getNum())));
 
                 if (c.getSales() != null && c.getRealSales() != null) {
                     c.setSales(c.getSales() + c.getRealSales());
@@ -265,6 +271,8 @@
         List<FlowerCartListDTO> ls = flowerMapper.selectFlowerOrderList(ids);
         Customer customer = getCurrentCustomer();
         Long partnerId = customer.getPartnerId();
+        Long levelId = customer.getLevelId();
+        Member member = getMember(levelId);
 
         double totalWeight = 0D;
         int num = 0;
@@ -288,7 +296,10 @@
                     , c.getId(), c.getPrice(), c.getLevel());
             BigDecimal price = priceDTO.getPrice();
             c.setPrice(price);
+            c.setPriceMember(calculateMemberPrice(price, member));
+
             c.setTotal(price.multiply(new BigDecimal(c.getNum())));
+            c.setTotalMember(c.getPriceMember().multiply(new BigDecimal(c.getNum())));//使用会员价计算总价
 
             if (priceMap != null) {
                 priceMap.put(c.getId(), priceDTO);
@@ -348,6 +359,8 @@
             deliveryName = d.getName();
         }
 
+        //TODO 优惠券和会员价相关修改
+
         String userId = SecurityUtils.getUserId();
         Order order = new Order();
         order.setId(UUIDGenerator.getUUID());

--
Gitblit v1.9.3