From af66f9797b42ae81f831d1fbf91a59463a569956 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 17 十一月 2022 19:29:36 +0800
Subject: [PATCH] 拼多多接口修改
---
fanli/src/main/java/com/yeshi/fanli/entity/dy/DYOrder.java | 93 +++++++++++++++++++++++++++++++++-------------
1 files changed, 67 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/goods/douyin/vo/DYOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/dy/DYOrder.java
similarity index 69%
rename from fanli/src/main/java/com/yeshi/fanli/util/goods/douyin/vo/DYOrder.java
rename to fanli/src/main/java/com/yeshi/fanli/entity/dy/DYOrder.java
index bd63960..7cadf7d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/goods/douyin/vo/DYOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/dy/DYOrder.java
@@ -1,4 +1,9 @@
-package com.yeshi.fanli.util.goods.douyin.vo;
+package com.yeshi.fanli.entity.dy;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.Date;
/**
* @author hxh
@@ -6,21 +11,22 @@
* @description: 鎶栭煶璁㈠崟
* @date 2022/9/30 16:00
*/
+@Document(collection = "dy_order")
public class DYOrder {
//鏀粯鎴愬姛
- public final static String FLOW_POINT_PAY_SUCCESS="PAY_SUCC";
+ public final static String FLOW_POINT_PAY_SUCCESS = "PAY_SUCC";
//閫�娆�
- public final static String FLOW_POINT_REFUND="REFUND";
+ public final static String FLOW_POINT_REFUND = "REFUND";
//缁撶畻銆傛鐘舵�佷唬琛ㄥ晢瀹剁‘瀹氫細缁撶畻浣ｂ睛
- public final static String FLOW_POINT_SETTLE="SETTLE";
+ public final static String FLOW_POINT_SETTLE = "SETTLE";
//纭鏀惰揣
- public final static String FLOW_POINT_CONFIRM="CONFIRM";
+ public final static String FLOW_POINT_CONFIRM = "CONFIRM";
- //姝ｅ父鐘舵��
- public final static int AFTER_SALE_STATUS_NORMAL=0;
+ //姝ｅ父鐘舵��
+ public final static int AFTER_SALE_STATUS_NORMAL = 0;
//閫�娆�
- public final static int AFTER_SALE_STATUS_REFUND=2;
+ public final static int AFTER_SALE_STATUS_REFUND = 2;
/**
@@ -45,6 +51,10 @@
/**
* 璁㈠崟id
**/
+ @Id
+ private String id;
+
+
private String order_id;
/**
* 搴斺饯id
@@ -65,7 +75,7 @@
/**
* 鎬讳粯娆锯睛棰濓紝鍗曚綅鍒�
**/
- private int total_pay_amount;
+ private Integer total_pay_amount;
/**
* 饨�浠樻垚鍔熸椂闂� yyyy-MM-dd HH:mm:ss
**/
@@ -78,19 +88,19 @@
* 棰勪及缁撶畻饩﹂锛屽崟浣嶅垎銆傚鏋滄湁饨�浠樹紭鎯狅紝
* pay_goods_amount浼氱暐饧や簬total_pay_amount
**/
- private int pay_goods_amount;
+ private Integer pay_goods_amount;
/**
* 棰勪及浣ｂ睛鏀垛紛锛屽崟浣嶅垎
**/
- private int estimated_commission;
+ private Integer estimated_commission;
/**
* 鎺ㄢ即璐圭巼锛�10浠ｈ〃鎺ㄢ即璐圭巼涓�0.10
**/
- private int split_rate;
+ private Integer split_rate;
/**
* 鍞悗鐘舵�侊紝1-绌猴紝2-浜р剑閫�娆�
**/
- private int after_sales_status;
+ private Integer after_sales_status;
/**
* PAY_SUCC:饨�浠樺畬鎴�
* REFUND:閫�娆�
@@ -114,7 +124,10 @@
* 棰勪及鎶�鏈湇鍔¤垂锛屼负pay_goods_amount*0.1銆傛瀛楁
* 褰撳墠涓嶅噯锛屼粎渚涘弬鑰冦��
**/
- private int estimated_tech_service_fee;
+ private Integer estimated_tech_service_fee;
+
+ private Date createTime;
+ private Date updateTime;
public String getOrder_id() {
return order_id;
@@ -156,11 +169,11 @@
this.product_img = product_img;
}
- public int getTotal_pay_amount() {
+ public Integer getTotal_pay_amount() {
return total_pay_amount;
}
- public void setTotal_pay_amount(int total_pay_amount) {
+ public void setTotal_pay_amount(Integer total_pay_amount) {
this.total_pay_amount = total_pay_amount;
}
@@ -180,35 +193,35 @@
this.refund_time = refund_time;
}
- public int getPay_goods_amount() {
+ public Integer getPay_goods_amount() {
return pay_goods_amount;
}
- public void setPay_goods_amount(int pay_goods_amount) {
+ public void setPay_goods_amount(Integer pay_goods_amount) {
this.pay_goods_amount = pay_goods_amount;
}
- public int getEstimated_commission() {
+ public Integer getEstimated_commission() {
return estimated_commission;
}
- public void setEstimated_commission(int estimated_commission) {
+ public void setEstimated_commission(Integer estimated_commission) {
this.estimated_commission = estimated_commission;
}
- public int getSplit_rate() {
+ public Integer getSplit_rate() {
return split_rate;
}
- public void setSplit_rate(int split_rate) {
+ public void setSplit_rate(Integer split_rate) {
this.split_rate = split_rate;
}
- public int getAfter_sales_status() {
+ public Integer getAfter_sales_status() {
return after_sales_status;
}
- public void setAfter_sales_status(int after_sales_status) {
+ public void setAfter_sales_status(Integer after_sales_status) {
this.after_sales_status = after_sales_status;
}
@@ -244,11 +257,39 @@
this.confirm_time = confirm_time;
}
- public int getEstimated_tech_service_fee() {
+ public Integer getEstimated_tech_service_fee() {
return estimated_tech_service_fee;
}
- public void setEstimated_tech_service_fee(int estimated_tech_service_fee) {
+ public void setEstimated_tech_service_fee(Integer estimated_tech_service_fee) {
this.estimated_tech_service_fee = estimated_tech_service_fee;
}
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String toId() {
+ return order_id + "-" + product_id;
+ }
}
--
Gitblit v1.8.0