From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 a076e15..930b012 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,8 +1,11 @@
package com.doumee.dao.web.response.goods;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.doumee.dao.business.model.GoodsorderDetail;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.business.model.Shop;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,8 +33,13 @@
@ApiModelProperty(value = "鍊掕鏃�", example = "1")
private Long countdown;
- @ApiModelProperty(value = "鍙栨秷鏃堕棿", example = "1")
+ @ApiModelProperty(value = "璁㈠崟鍙栨秷鏃堕棿", example = "1")
private Date cancelDate;
+
+
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿(鑷姩鍙栨秷浣跨敤)", example = "1")
+ private Date cancelOptDate;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿", example = "1")
private Date createDate;
@@ -48,6 +56,10 @@
@ApiModelProperty(value = "缁忛攢鍟嗗悕绉�", example = "1")
private String shopName;
+ @ApiModelProperty(value = "缁忛攢鍟嗙數璇�", example = "1")
+ private String shopPhone;
+
+
@ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1寰呭彂璐�/寰呰嚜鎻� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣", example = "1")
private Integer orderStatus;
@@ -56,6 +68,9 @@
@ApiModelProperty(value = "鏀粯鐘舵�� 0鏈敮浠� 1宸叉敮浠�", example = "1")
private Integer payStatus;
+
+ @ApiModelProperty(value = "鎬婚噾棰�", example = "1")
+ private BigDecimal totalPrice;
@ApiModelProperty(value = "瀹炰粯閲戦", example = "1")
private BigDecimal price;
@@ -73,7 +88,7 @@
private String linkAddress;
@ApiModelProperty(value = "璁㈠崟澶囨敞", example = "1")
- private String remark;
+ private String memberInfo;
@ApiModelProperty(value = "璁㈠崟鍙�", example = "1")
private String code;
@@ -90,18 +105,37 @@
@ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
private String exchangeCode;
- @ApiModelProperty(value = "鎶垫墸閲戦", example = "1")
+ @ApiModelProperty(value = "绉垎鎶垫墸閲戦", example = "1")
private BigDecimal integral;
+
+ @ApiModelProperty(value = "閭垂閲戦", example = "1")
+ private BigDecimal mailPrice;
+
+ @ApiModelProperty(value = "閫�娆鹃噾棰�", example = "1")
+ private BigDecimal refundMoney;
+
+ @ApiModelProperty(value = "閫�娆炬椂闂�", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date refundTime;
+
+ @ApiModelProperty(value = "閫�娆惧娉�", example = "1")
+ private Integer refundInfo;
@ApiModelProperty(value = "蹇�掑悕绉�", example = "1")
private String kdName;
+ @ApiModelProperty(value = "鏀粯鍗曞彿", example = "1")
+ private String payOrderId;
+
+ @ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊鏀粯 1绾夸笅鏀粯", example = "1")
+ private Integer payMethod;
@ApiModelProperty(value = "蹇�掑崟鍙�", example = "1")
private String kdCode;
- @ApiModelProperty(value = "璁㈠崟鏄庣粏淇℃伅", example = "1")
- private List<MemberOrderDetailResponse> memberOrderDetailResponseList;
+
+ @ApiModelProperty(value = "鍟嗗搧闆嗗悎")
+ private List<GoodsorderDetail> goodsorderDetailList;
@ApiModelProperty(value = "缁忛攢鍟嗕俊鎭�", example = "1")
--
Gitblit v1.9.3