From 38618c8906f623393e4b8633a4fccc20131de2ae Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 11 Mar 2025 15:24:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=20=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/order/dto/CheckOrderPay.java    |  4 ++++
 .../com/czg/order/service/OrderInfoService.java  |  3 ++-
 .../order/service/impl/OrderInfoServiceImpl.java | 16 +++++++++++-----
 .../order/service/impl/PayServiceImpl.java       |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
index 55a22ed4b..6dc7d6d1a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
@@ -33,6 +33,10 @@ public class CheckOrderPay implements Serializable {
      * 是否整单打包
      */
     private Integer allPack;
+    /**
+     * 用户端 使用 全打包 或者 全不打包
+     */
+    private Integer userAllPack;
 
     /**
      * 用餐人数
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
index de5ac211e..f561fff67 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
@@ -30,6 +30,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
     Page<OrderInfoVo> getOrderByPage(OrderInfoQueryDTO param);
 
     CzgResult<HistoryOrderVo> getOrderDetails(Long orderId);
+
     CzgResult<HistoryOrderPrintVo> getOrderByIdPrint(Long orderId);
 
     HistoryOrderVo historyOrder(Long orderId, String tableCode);
@@ -50,7 +51,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
 
     void processOrderDetails2(List<OrderDetail> orderDetails, Map<Long, Integer> prodCouponMap,
                               BigDecimalDTO prodCouponAmount, BigDecimalDTO totalAmount, BigDecimalDTO packAmount,
-                              boolean isAllPack, boolean isVipPrice);
+                              boolean isAllPack, Integer userAllPack, boolean isVipPrice);
 
 
     Boolean printOrder(Long shopId, OrderInfoPrintDTO orderInfoPrintDTO);
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index d2285523e..23af9534e 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -291,7 +291,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         BigDecimalDTO totalAmount = new BigDecimalDTO(BigDecimal.ZERO);
         //最终打包费
         BigDecimalDTO packAmount = new BigDecimalDTO(BigDecimal.ZERO);
-        processOrderDetails2(orderDetails, prodCouponMap, prodCouponAmount, totalAmount, packAmount, param.isAllPack(), param.isVipPrice());
+        processOrderDetails2(orderDetails, prodCouponMap, prodCouponAmount, totalAmount, packAmount, param.isAllPack(), param.getUserAllPack(), param.isVipPrice());
         //总商品支付金额 不包含打包费 用来计算后续
         log.info("支付前置，商品金额{} 商品优惠券金额{} 总金额{}", totalAmount, prodCouponAmount, totalAmount.getPrice().add(orderInfo.getPackFee()));
         if (prodCouponAmount.getPrice().compareTo(param.getProductCouponDiscountAmount()) != 0) {
@@ -382,7 +382,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Override
     public void processOrderDetails2(List<OrderDetail> orderDetails, Map<Long, Integer> prodCouponMap,
                                      BigDecimalDTO prodCouponAmount, BigDecimalDTO totalAmount, BigDecimalDTO packAmount,
-                                     boolean isAllPack, boolean isVipPrice) {
+                                     boolean isAllPack, Integer userAllPack, boolean isVipPrice) {
         Map<Long, List<OrderDetail>> detailMap = new HashMap<>();
         for (OrderDetail detail : orderDetails) {
             detailMap.computeIfAbsent(detail.getProductId(), k -> new ArrayList<>()).add(detail);
@@ -408,11 +408,17 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         orderDetail.setUnitPrice(orderDetail.getPrice());
                     }
                 }
-                if (isAllPack) {
+                if (userAllPack != null) {
+                    if (userAllPack.equals(1)) {
+                        orderDetail.setPackNumber(orderDetail.getNum().subtract(orderDetail.getReturnNum()));
+                    } else {
+                        orderDetail.setPackNumber(BigDecimal.ZERO);
+                    }
+                } else if (isAllPack) {
                     if ("weigh".equals(orderDetail.getProductType())) {
                         orderDetail.setPackNumber(BigDecimal.ONE);
                     } else {
-                        orderDetail.setPackNumber(orderDetail.getNum());
+                        orderDetail.setPackNumber(orderDetail.getNum().subtract(orderDetail.getReturnNum()));
                     }
                 }
                 packAmount.setPrice(packAmount.getPrice().add(orderDetail.getPackAmount().multiply(orderDetail.getPackNumber()).setScale(2, RoundingMode.DOWN)));
@@ -426,7 +432,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         orderDetail.setPayAmount((orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(couponNum)).multiply(orderDetail.getUnitPrice()));
                         couponNum = BigDecimal.ZERO;
                     }
-                    prodCouponAmount.setPrice(prodCouponAmount.getPrice().add(orderDetail.getUnitPrice().multiply(orderDetail.getCouponNum())));
+                    prodCouponAmount.setPrice((prodCouponAmount.getPrice().add(orderDetail.getUnitPrice())).multiply(orderDetail.getCouponNum()));
                 } else {
                     orderDetail.setCouponNum(BigDecimal.ZERO);
                     orderDetail.setPayAmount(orderDetail.getNum().subtract(orderDetail.getReturnNum()).multiply(orderDetail.getUnitPrice()));
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index d0269006b..510402071 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -125,7 +125,7 @@ public class PayServiceImpl implements PayService {
             BigDecimalDTO totalAmount = new BigDecimalDTO(BigDecimal.ZERO);
             //最终打包费
             BigDecimalDTO packAmount = new BigDecimalDTO(BigDecimal.ZERO);
-            orderInfoService.processOrderDetails2(orderDetails, null, null, totalAmount, packAmount, payParam.isAllPack(), true);
+            orderInfoService.processOrderDetails2(orderDetails, null, null, totalAmount, packAmount, payParam.isAllPack(), null,true);
             BigDecimal payAmount = (totalAmount.getPrice().add(packAmount.getPrice())).multiply(BigDecimal.TWO);
             if (payAmount.compareTo(payParam.getAmount()) != 0) {
                 throw new ValidateException("霸王餐支付金额不正确");