From 2c1415e6c7bf6837cb24768770b10821853a6341 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 17:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderGoodsCalculateResponse.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderGoodsCalculateResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderGoodsCalculateResponse.java
index af5acfe..6e79df9 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderGoodsCalculateResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderGoodsCalculateResponse.java
@@ -49,11 +49,14 @@
@ApiModelProperty(value = "鍗曚釜鍟嗗搧閲嶉噺(kg)", example = "1")
private BigDecimal weight;
- @ApiModelProperty(value = "sku閲戦")
+ @ApiModelProperty(value = "sku鍗曚环")
private BigDecimal skuPrice;
@ApiModelProperty(value = "sku鎬婚噾棰�")
private BigDecimal skuAmount;
+
+ @ApiModelProperty(value = "sku瀹炰粯鎬婚噾棰�")
+ private BigDecimal skuPayAmount;
@ApiModelProperty(value = "skuId")
private Integer skuId;
@@ -67,18 +70,24 @@
@ApiModelProperty(value = "鏄惁鍙互浣跨敤浼樻儬鍒�", hidden = true)
private Boolean useCoupon;
+
+
+
@ApiModelProperty(value = "绉垎鏈�澶у彲鎶垫墸閲戦", hidden = true)
private BigDecimal integralMaxDeductCash;
@ApiModelProperty(value = "绉垎瀹為檯鎶垫墸閲戦", hidden = true)
private BigDecimal integralDeductCash;
+
@ApiModelProperty(value = "瀹為檯浣跨敤绉垎", hidden = true)
private BigDecimal integralDeduct;
@ApiModelProperty(value = "璁㈠崟涓Н鍒嗛噾棰濆疄闄呭崰姣�", hidden = true)
private BigDecimal orderIntegralRata;
+
+
@ApiModelProperty(value = "搴撳瓨閲�")
private BigDecimal stockNum;
--
Gitblit v1.9.3