活动 优惠券问题

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;
 
     /**
      * 用餐人数

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);