From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderGoodsCalculateResponse.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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..2305361 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,35 +49,41 @@
@ApiModelProperty(value = "鍗曚釜鍟嗗搧閲嶉噺(kg)", example = "1")
private BigDecimal weight;
- @ApiModelProperty(value = "sku閲戦")
+ @ApiModelProperty(value = "sku鍗曚环")
private BigDecimal skuPrice;
@ApiModelProperty(value = "sku鎬婚噾棰�")
- private BigDecimal skuAmount;
+ private BigDecimal skuAmount ;
+
+ @ApiModelProperty(value = "sku瀹炰粯鎬婚噾棰�")
+ private BigDecimal skuPayAmount = BigDecimal.ZERO;
@ApiModelProperty(value = "skuId")
private Integer skuId;
@ApiModelProperty(value = "璁㈠崟涓紭鎯犲埜閲戦鍗犳瘮", hidden = true)
- private BigDecimal orderCouponRata;
+ private BigDecimal orderCouponRata = BigDecimal.ZERO;
@ApiModelProperty(value = "浼樻儬鍒告姷鎵ｉ噾棰�", hidden = true)
- private BigDecimal couponDeductCash;
+ private BigDecimal couponDeductCash = BigDecimal.ZERO;
@ApiModelProperty(value = "鏄惁鍙互浣跨敤浼樻儬鍒�", hidden = true)
private Boolean useCoupon;
+ @ApiModelProperty(value = "sku鍥剧墖")
+ private String skuImg;
+
@ApiModelProperty(value = "绉垎鏈�澶у彲鎶垫墸閲戦", hidden = true)
- private BigDecimal integralMaxDeductCash;
+ private BigDecimal integralMaxDeductCash = BigDecimal.ZERO;
@ApiModelProperty(value = "绉垎瀹為檯鎶垫墸閲戦", hidden = true)
- private BigDecimal integralDeductCash;
+ private BigDecimal integralDeductCash = BigDecimal.ZERO;
@ApiModelProperty(value = "瀹為檯浣跨敤绉垎", hidden = true)
- private BigDecimal integralDeduct;
+ private BigDecimal integralDeduct = BigDecimal.ZERO;
@ApiModelProperty(value = "璁㈠崟涓Н鍒嗛噾棰濆疄闄呭崰姣�", hidden = true)
- private BigDecimal orderIntegralRata;
+ private BigDecimal orderIntegralRata = BigDecimal.ZERO;
@ApiModelProperty(value = "搴撳瓨閲�")
private BigDecimal stockNum;
--
Gitblit v1.9.3