From 94e23fd6ad010b560fe4cc566db38082d7619696 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 16:24:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index ac62637..e58f89f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -69,6 +69,9 @@
@ExcelColumn(name="璁㈠崟瀹炰粯浠锋牸",index =9,width = 10)
private BigDecimal price;
+ @ApiModelProperty(value = "閭垂閲戦", example = "1")
+ private BigDecimal mailPrice;
+
@ApiModelProperty(value = "璁㈠崟鐘舵��")
@ExcelColumn(name="璁㈠崟鐘舵��",index =10,width = 10)
@TableField(exist = false)
@@ -98,8 +101,6 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "浣欓浣跨敤鏁伴噺", example = "1")
- private BigDecimal integral;
@ApiModelProperty(value = "鍞悗宸查��娆鹃噾棰�", example = "1")
private BigDecimal aftersaleMoney;
@@ -129,7 +130,7 @@
@ApiModelProperty(value = "鏀粯鍗曞彿")
private String payOrderId;
- @ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊鏀粯 1绾夸笅鏀粯", example = "1")
+ @ApiModelProperty(value = "鏀粯鏂瑰紡 0鐜伴噾鏀粯 1绉垎鏀粯", example = "1")
private Integer payMethod;
@ApiModelProperty(value = "蹇�掑崟鍙�")
@@ -140,7 +141,6 @@
@ApiModelProperty(value = "蹇�掔紪鐮侊紙鍏宠仈labels琛級", example = "1")
private Integer kdId;
-
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@@ -181,11 +181,10 @@
@ApiModelProperty(value = "绉垎鎶垫墸閲戦", example = "1")
- private BigDecimal integralPrice;
+ private BigDecimal integral;
@ApiModelProperty(value = "娑堣�楃Н鍒嗗��", example = "1")
private BigDecimal useIntegral;
-
@ApiModelProperty(value = "鍜栧暋璁″垝璁㈠崟褰㈠紡 0鏂板 1寤堕暱", example = "1")
private Integer planOrderType;
@@ -198,9 +197,11 @@
@ApiModelProperty(value = "鍒嗛攢鍟嗛摵涓婚敭 shop锛歩d", example = "1")
private Integer distributionShopId;
-
@ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
private String exchangeCode;
+
+ @ApiModelProperty(value = "缁忛攢鍟嗙粨绠楅噾棰�", example = "1")
+ private BigDecimal shopSettlement;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@TableField(exist = false)
@@ -214,13 +215,15 @@
@TableField(exist = false)
private PlanorderDetail planorderDetail;
-
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
private String nickName;
@ApiModelProperty(value = "鐢佃瘽")
@TableField(exist = false)
private String phone;
+ @ApiModelProperty(value = "澶村儚淇℃伅")
+ @TableField(exist = false)
+ private String imgurl;
@ApiModelProperty(value = "鏀惰揣鍦板潃")
@TableField(exist = false)
--
Gitblit v1.9.3