From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
index 964a733..a076e15 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
@@ -1,5 +1,8 @@
package com.doumee.dao.web.response.goods;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberCoupon;
+import com.doumee.dao.business.model.Shop;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,6 +24,9 @@
@ApiModelProperty(value = "璁㈠崟涓婚敭", example = "1")
private Integer orderId;
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭", example = "1")
+ private Integer memberId;
+
@ApiModelProperty(value = "鍊掕鏃�", example = "1")
private Long countdown;
@@ -33,7 +39,16 @@
@ApiModelProperty(value = "璁㈠崟绫诲瀷 0骞冲彴鍟嗗煄 1鍜栬眴鍟嗗煄 2鍜栧暋璁″垝缂栫爜", example = "1")
private Integer orderType;
- @ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣", example = "1")
+ @ApiModelProperty(value = "鏀惰揣绫诲瀷锛�0=蹇�掗厤閫侊紱1=闂ㄥ簵鑷彁锛�", example = "1")
+ private Integer receiveType;
+
+ @ApiModelProperty(value = "鑷彁缁忛攢鍟嗕富閿�", example = "1")
+ private Integer shopId;
+
+ @ApiModelProperty(value = "缁忛攢鍟嗗悕绉�", example = "1")
+ private String shopName;
+
+ @ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1寰呭彂璐�/寰呰嚜鎻� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣", example = "1")
private Integer orderStatus;
@ApiModelProperty(value = "鏄惁宸茶瘎浠� 0鏈瘎浠� 1宸茶瘎浠�", example = "1")
@@ -58,7 +73,7 @@
private String linkAddress;
@ApiModelProperty(value = "璁㈠崟澶囨敞", example = "1")
- private String memberInfo;
+ private String remark;
@ApiModelProperty(value = "璁㈠崟鍙�", example = "1")
private String code;
@@ -72,6 +87,8 @@
@ApiModelProperty(value = "瀹屾垚鏃堕棿", example = "1")
private Date doneDate;
+ @ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
+ private String exchangeCode;
@ApiModelProperty(value = "鎶垫墸閲戦", example = "1")
private BigDecimal integral;
@@ -86,4 +103,16 @@
@ApiModelProperty(value = "璁㈠崟鏄庣粏淇℃伅", example = "1")
private List<MemberOrderDetailResponse> memberOrderDetailResponseList;
+
+ @ApiModelProperty(value = "缁忛攢鍟嗕俊鎭�", example = "1")
+ private Shop shopInfo;
+
+ @ApiModelProperty(value = "鐢ㄦ埛淇℃伅", example = "1")
+ private Member member;
+
+ @ApiModelProperty(value = "浼樻儬鍒镐俊鎭�", example = "1")
+ private MemberCoupon memberCoupon;
+
+
+
}
--
Gitblit v1.9.3