订单明细 最终单价

cash-common/cash-common-service/src/main/java/com/czg/account/dto/OrderDetailDTO.java

@@ -48,9 +48,21 @@ public class OrderDetailDTO implements Serializable {
     private String skuName;
 
     /**
-     * 单价：原价/会员价/临时改价
+     * 原价
      */
     private BigDecimal price;
+    /**
+     * 会员价
+     */
+    private BigDecimal memberPrice;
+    /**
+     * 临时改价/临时菜价
+     */
+    private BigDecimal discountSaleAmount;
+    /**
+     * 最终单价
+     */
+    private BigDecimal unitPrice;
 
     /**
      * 折扣金额

cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java

@@ -28,6 +28,8 @@ public class CheckOrderPay implements Serializable {
 
     private Long userId;
 
+    private Integer vipPrice;
+
     /**
      * 用餐人数
      */
@@ -115,4 +117,7 @@ public class CheckOrderPay implements Serializable {
     }
 
 
+    public boolean isVipPrice() {
+        return vipPrice != null && vipPrice == 1;
+    }
 }

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java

@@ -5,18 +5,16 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import java.io.Serial;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * 订单详情 实体类。
  *
@@ -56,9 +54,21 @@ public class OrderDetail implements Serializable {
     private String skuName;
 
     /**
-     * 单价：原价/会员价/临时改价
+     * 原价
      */
     private BigDecimal price;
+    /**
+     * 会员价
+     */
+    private BigDecimal memberPrice;
+    /**
+     * 临时改价/临时菜价
+     */
+    private BigDecimal discountSaleAmount;
+    /**
+     * 最终单价
+     */
+    private BigDecimal unitPrice;
 
     /**
      * 折扣金额(商品优惠券抵扣金额)

cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java

@@ -32,7 +32,7 @@ public class OrderDetailSmallVO implements Serializable {
     private BigDecimal packNum;
     private BigDecimal returnNum;
     private BigDecimal refundNum;
-    private BigDecimal price;
+    private BigDecimal unitPrice;
     private BigDecimal payAmount;
     private String remark;