提交修改
This commit is contained in:
parent
be8b045de7
commit
98879d4dcf
@ -22,6 +22,7 @@ private static final long serialVersionUID = 1L;
|
|||||||
|
|
||||||
public final static String all = CLASS_NAME + "*";
|
public final static String all = CLASS_NAME + "*";
|
||||||
public final static String agree_refund_user = CLASS_NAME + "agree_refund_user"; // 同意退款的卖家
|
public final static String agree_refund_user = CLASS_NAME + "agree_refund_user"; // 同意退款的卖家
|
||||||
|
public final static String agree_sign_receipt_user = CLASS_NAME + "agree_sign_receipt_user"; // 同意签收用户
|
||||||
public final static String buyer_apply_refund_user = CLASS_NAME + "buyer_apply_refund_user"; // 买家申请退款的买家
|
public final static String buyer_apply_refund_user = CLASS_NAME + "buyer_apply_refund_user"; // 买家申请退款的买家
|
||||||
public final static String buyer_post_user = CLASS_NAME + "buyer_post_user"; // 邮寄的买家
|
public final static String buyer_post_user = CLASS_NAME + "buyer_post_user"; // 邮寄的买家
|
||||||
public final static String cancel_user = CLASS_NAME + "cancel_user"; // 逆向订单取消的卖家
|
public final static String cancel_user = CLASS_NAME + "cancel_user"; // 逆向订单取消的卖家
|
||||||
@ -30,6 +31,7 @@ private static final long serialVersionUID = 1L;
|
|||||||
public final static String create_time = CLASS_NAME + "create_time"; // 创建时间
|
public final static String create_time = CLASS_NAME + "create_time"; // 创建时间
|
||||||
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间撮
|
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间撮
|
||||||
public final static String gmt_agree_refund = CLASS_NAME + "gmt_agree_refund"; // 同意退款时间
|
public final static String gmt_agree_refund = CLASS_NAME + "gmt_agree_refund"; // 同意退款时间
|
||||||
|
public final static String gmt_agree_sign_receipt = CLASS_NAME + "gmt_agree_sign_receipt"; // 同意签收时间
|
||||||
public final static String gmt_buyer_apply_refund = CLASS_NAME + "gmt_buyer_apply_refund"; // 买家申请退款时间
|
public final static String gmt_buyer_apply_refund = CLASS_NAME + "gmt_buyer_apply_refund"; // 买家申请退款时间
|
||||||
public final static String gmt_buyer_post = CLASS_NAME + "gmt_buyer_post"; // 买家邮寄时间
|
public final static String gmt_buyer_post = CLASS_NAME + "gmt_buyer_post"; // 买家邮寄时间
|
||||||
public final static String gmt_cancel = CLASS_NAME + "gmt_cancel"; // 订单取消时间
|
public final static String gmt_cancel = CLASS_NAME + "gmt_cancel"; // 订单取消时间
|
||||||
@ -40,7 +42,7 @@ private static final long serialVersionUID = 1L;
|
|||||||
public final static String gmt_refunded = CLASS_NAME + "gmt_refunded"; // 退款完成时间
|
public final static String gmt_refunded = CLASS_NAME + "gmt_refunded"; // 退款完成时间
|
||||||
public final static String gmt_reject_refund = CLASS_NAME + "gmt_reject_refund"; // 拒绝退款时间
|
public final static String gmt_reject_refund = CLASS_NAME + "gmt_reject_refund"; // 拒绝退款时间
|
||||||
public final static String gmt_reject_return = CLASS_NAME + "gmt_reject_return"; // 拒绝退回
|
public final static String gmt_reject_return = CLASS_NAME + "gmt_reject_return"; // 拒绝退回
|
||||||
public final static String gmt_reject_shipped = CLASS_NAME + "gmt_reject_shipped"; // 拒绝签收时间
|
public final static String gmt_reject_sign_receipt = CLASS_NAME + "gmt_reject_sign_receipt"; // 拒绝签收时间
|
||||||
public final static String gmt_seller_agree_return = CLASS_NAME + "gmt_seller_agree_return"; // 卖家同意退款
|
public final static String gmt_seller_agree_return = CLASS_NAME + "gmt_seller_agree_return"; // 卖家同意退款
|
||||||
public final static String gmt_shipped = CLASS_NAME + "gmt_shipped"; // 妥投时间
|
public final static String gmt_shipped = CLASS_NAME + "gmt_shipped"; // 妥投时间
|
||||||
public final static String id_ = CLASS_NAME + "id"; //
|
public final static String id_ = CLASS_NAME + "id"; //
|
||||||
@ -61,11 +63,11 @@ private static final long serialVersionUID = 1L;
|
|||||||
public final static String reject_refund_user = CLASS_NAME + "reject_refund_user"; // 拒绝退款用户
|
public final static String reject_refund_user = CLASS_NAME + "reject_refund_user"; // 拒绝退款用户
|
||||||
public final static String reject_return_reason = CLASS_NAME + "reject_return_reason"; // 拒绝退回原因
|
public final static String reject_return_reason = CLASS_NAME + "reject_return_reason"; // 拒绝退回原因
|
||||||
public final static String reject_return_user = CLASS_NAME + "reject_return_user"; // 拒绝退回用户
|
public final static String reject_return_user = CLASS_NAME + "reject_return_user"; // 拒绝退回用户
|
||||||
public final static String reject_shipped_reason = CLASS_NAME + "reject_shipped_reason"; // 拒绝签收原因
|
public final static String reject_sign_receipt_reason = CLASS_NAME + "reject_sign_receipt_reason"; // 拒绝签收原因
|
||||||
public final static String reject_shipped_user = CLASS_NAME + "reject_shipped_user"; // 拒绝签收用户
|
public final static String reject_sign_receipt_user = CLASS_NAME + "reject_sign_receipt_user"; // 拒绝签收用户
|
||||||
public final static String seller_agree_return_user = CLASS_NAME + "seller_agree_return_user"; // 同意退货退款的卖家
|
public final static String seller_agree_return_user = CLASS_NAME + "seller_agree_return_user"; // 同意退货退款的卖家
|
||||||
public final static String shipped_user = CLASS_NAME + "shipped_user"; // 同意妥投的买家
|
public final static String shipped_user = CLASS_NAME + "shipped_user"; // 同意妥投的买家
|
||||||
public final static String status_ = CLASS_NAME + "status"; // 订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已签收:shipped,拒绝签收:reject_shipped,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
public final static String status_ = CLASS_NAME + "status"; // 订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已投递:shipped,拒绝签收:reject_sign_receipt,同意签收: agree_sign_receipt,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
||||||
public final static String track_number = CLASS_NAME + "track_number"; // 物流追踪号
|
public final static String track_number = CLASS_NAME + "track_number"; // 物流追踪号
|
||||||
public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单号
|
public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单号
|
||||||
public final static String user_eceived_account = CLASS_NAME + "user_eceived_account"; // 退款接收事务id
|
public final static String user_eceived_account = CLASS_NAME + "user_eceived_account"; // 退款接收事务id
|
||||||
@ -76,6 +78,8 @@ private static final long serialVersionUID = 1L;
|
|||||||
//同意退款的卖家
|
//同意退款的卖家
|
||||||
@TableId(value = "agree_refund_user", type = IdType.AUTO)
|
@TableId(value = "agree_refund_user", type = IdType.AUTO)
|
||||||
private String agreeRefundUser;
|
private String agreeRefundUser;
|
||||||
|
//同意签收用户
|
||||||
|
private String agreeSignReceiptUser;
|
||||||
//买家申请退款的买家
|
//买家申请退款的买家
|
||||||
private String buyerApplyRefundUser;
|
private String buyerApplyRefundUser;
|
||||||
//邮寄的买家
|
//邮寄的买家
|
||||||
@ -92,6 +96,8 @@ private static final long serialVersionUID = 1L;
|
|||||||
private Long createTimestamp;
|
private Long createTimestamp;
|
||||||
//同意退款时间
|
//同意退款时间
|
||||||
private Date gmtAgreeRefund;
|
private Date gmtAgreeRefund;
|
||||||
|
//同意签收时间
|
||||||
|
private Date gmtAgreeSignReceipt;
|
||||||
//买家申请退款时间
|
//买家申请退款时间
|
||||||
private Date gmtBuyerApplyRefund;
|
private Date gmtBuyerApplyRefund;
|
||||||
//买家邮寄时间
|
//买家邮寄时间
|
||||||
@ -113,7 +119,7 @@ private static final long serialVersionUID = 1L;
|
|||||||
//拒绝退回
|
//拒绝退回
|
||||||
private Date gmtRejectReturn;
|
private Date gmtRejectReturn;
|
||||||
//拒绝签收时间
|
//拒绝签收时间
|
||||||
private Date gmtRejectShipped;
|
private Date gmtRejectSignReceipt;
|
||||||
//卖家同意退款
|
//卖家同意退款
|
||||||
private Date gmtSellerAgreeReturn;
|
private Date gmtSellerAgreeReturn;
|
||||||
//妥投时间
|
//妥投时间
|
||||||
@ -155,14 +161,14 @@ private static final long serialVersionUID = 1L;
|
|||||||
//拒绝退回用户
|
//拒绝退回用户
|
||||||
private String rejectReturnUser;
|
private String rejectReturnUser;
|
||||||
//拒绝签收原因
|
//拒绝签收原因
|
||||||
private String rejectShippedReason;
|
private String rejectSignReceiptReason;
|
||||||
//拒绝签收用户
|
//拒绝签收用户
|
||||||
private String rejectShippedUser;
|
private String rejectSignReceiptUser;
|
||||||
//同意退货退款的卖家
|
//同意退货退款的卖家
|
||||||
private String sellerAgreeReturnUser;
|
private String sellerAgreeReturnUser;
|
||||||
//同意妥投的买家
|
//同意妥投的买家
|
||||||
private String shippedUser;
|
private String shippedUser;
|
||||||
//订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已签收:shipped,拒绝签收:reject_shipped,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
//订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已投递:shipped,拒绝签收:reject_sign_receipt,同意签收: agree_sign_receipt,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
||||||
private String status;
|
private String status;
|
||||||
//物流追踪号
|
//物流追踪号
|
||||||
private String trackNumber;
|
private String trackNumber;
|
||||||
@ -193,6 +199,21 @@ private static final long serialVersionUID = 1L;
|
|||||||
this.agreeRefundUser = agreeRefundUser;
|
this.agreeRefundUser = agreeRefundUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 同意签收用户
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public String getAgreeSignReceiptUser() {
|
||||||
|
return agreeSignReceiptUser;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* 同意签收用户
|
||||||
|
* @param agreeSignReceiptUser
|
||||||
|
*/
|
||||||
|
public void setAgreeSignReceiptUser(String agreeSignReceiptUser) {
|
||||||
|
this.agreeSignReceiptUser = agreeSignReceiptUser;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 买家申请退款的买家
|
* 买家申请退款的买家
|
||||||
* @return
|
* @return
|
||||||
@ -313,6 +334,21 @@ private static final long serialVersionUID = 1L;
|
|||||||
this.gmtAgreeRefund = gmtAgreeRefund;
|
this.gmtAgreeRefund = gmtAgreeRefund;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 同意签收时间
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public Date getGmtAgreeSignReceipt() {
|
||||||
|
return gmtAgreeSignReceipt;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* 同意签收时间
|
||||||
|
* @param gmtAgreeSignReceipt
|
||||||
|
*/
|
||||||
|
public void setGmtAgreeSignReceipt(Date gmtAgreeSignReceipt) {
|
||||||
|
this.gmtAgreeSignReceipt = gmtAgreeSignReceipt;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 买家申请退款时间
|
* 买家申请退款时间
|
||||||
* @return
|
* @return
|
||||||
@ -467,15 +503,15 @@ private static final long serialVersionUID = 1L;
|
|||||||
* 拒绝签收时间
|
* 拒绝签收时间
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public Date getGmtRejectShipped() {
|
public Date getGmtRejectSignReceipt() {
|
||||||
return gmtRejectShipped;
|
return gmtRejectSignReceipt;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 拒绝签收时间
|
* 拒绝签收时间
|
||||||
* @param gmtRejectShipped
|
* @param gmtRejectSignReceipt
|
||||||
*/
|
*/
|
||||||
public void setGmtRejectShipped(Date gmtRejectShipped) {
|
public void setGmtRejectSignReceipt(Date gmtRejectSignReceipt) {
|
||||||
this.gmtRejectShipped = gmtRejectShipped;
|
this.gmtRejectSignReceipt = gmtRejectSignReceipt;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -782,30 +818,30 @@ private static final long serialVersionUID = 1L;
|
|||||||
* 拒绝签收原因
|
* 拒绝签收原因
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String getRejectShippedReason() {
|
public String getRejectSignReceiptReason() {
|
||||||
return rejectShippedReason;
|
return rejectSignReceiptReason;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 拒绝签收原因
|
* 拒绝签收原因
|
||||||
* @param rejectShippedReason
|
* @param rejectSignReceiptReason
|
||||||
*/
|
*/
|
||||||
public void setRejectShippedReason(String rejectShippedReason) {
|
public void setRejectSignReceiptReason(String rejectSignReceiptReason) {
|
||||||
this.rejectShippedReason = rejectShippedReason;
|
this.rejectSignReceiptReason = rejectSignReceiptReason;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拒绝签收用户
|
* 拒绝签收用户
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String getRejectShippedUser() {
|
public String getRejectSignReceiptUser() {
|
||||||
return rejectShippedUser;
|
return rejectSignReceiptUser;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 拒绝签收用户
|
* 拒绝签收用户
|
||||||
* @param rejectShippedUser
|
* @param rejectSignReceiptUser
|
||||||
*/
|
*/
|
||||||
public void setRejectShippedUser(String rejectShippedUser) {
|
public void setRejectSignReceiptUser(String rejectSignReceiptUser) {
|
||||||
this.rejectShippedUser = rejectShippedUser;
|
this.rejectSignReceiptUser = rejectSignReceiptUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -839,14 +875,14 @@ private static final long serialVersionUID = 1L;
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已签收:shipped,拒绝签收:reject_shipped,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
* 订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已投递:shipped,拒绝签收:reject_sign_receipt,同意签收: agree_sign_receipt,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String getStatus() {
|
public String getStatus() {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已签收:shipped,拒绝签收:reject_shipped,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
* 订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已投递:shipped,拒绝签收:reject_sign_receipt,同意签收: agree_sign_receipt,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
||||||
* @param status
|
* @param status
|
||||||
*/
|
*/
|
||||||
public void setStatus(String status) {
|
public void setStatus(String status) {
|
||||||
@ -962,6 +998,7 @@ private static final long serialVersionUID = 1L;
|
|||||||
public String toString() {
|
public String toString() {
|
||||||
return "VvReverseOrderEntity{" +
|
return "VvReverseOrderEntity{" +
|
||||||
",agreeRefundUser=" + agreeRefundUser +
|
",agreeRefundUser=" + agreeRefundUser +
|
||||||
|
",agreeSignReceiptUser=" + agreeSignReceiptUser +
|
||||||
",buyerApplyRefundUser=" + buyerApplyRefundUser +
|
",buyerApplyRefundUser=" + buyerApplyRefundUser +
|
||||||
",buyerPostUser=" + buyerPostUser +
|
",buyerPostUser=" + buyerPostUser +
|
||||||
",cancelUser=" + cancelUser +
|
",cancelUser=" + cancelUser +
|
||||||
@ -970,6 +1007,7 @@ private static final long serialVersionUID = 1L;
|
|||||||
",createTime=" + createTime +
|
",createTime=" + createTime +
|
||||||
",createTimestamp=" + createTimestamp +
|
",createTimestamp=" + createTimestamp +
|
||||||
",gmtAgreeRefund=" + gmtAgreeRefund +
|
",gmtAgreeRefund=" + gmtAgreeRefund +
|
||||||
|
",gmtAgreeSignReceipt=" + gmtAgreeSignReceipt +
|
||||||
",gmtBuyerApplyRefund=" + gmtBuyerApplyRefund +
|
",gmtBuyerApplyRefund=" + gmtBuyerApplyRefund +
|
||||||
",gmtBuyerPost=" + gmtBuyerPost +
|
",gmtBuyerPost=" + gmtBuyerPost +
|
||||||
",gmtCancel=" + gmtCancel +
|
",gmtCancel=" + gmtCancel +
|
||||||
@ -980,7 +1018,7 @@ private static final long serialVersionUID = 1L;
|
|||||||
",gmtRefunded=" + gmtRefunded +
|
",gmtRefunded=" + gmtRefunded +
|
||||||
",gmtRejectRefund=" + gmtRejectRefund +
|
",gmtRejectRefund=" + gmtRejectRefund +
|
||||||
",gmtRejectReturn=" + gmtRejectReturn +
|
",gmtRejectReturn=" + gmtRejectReturn +
|
||||||
",gmtRejectShipped=" + gmtRejectShipped +
|
",gmtRejectSignReceipt=" + gmtRejectSignReceipt +
|
||||||
",gmtSellerAgreeReturn=" + gmtSellerAgreeReturn +
|
",gmtSellerAgreeReturn=" + gmtSellerAgreeReturn +
|
||||||
",gmtShipped=" + gmtShipped +
|
",gmtShipped=" + gmtShipped +
|
||||||
",id=" + id +
|
",id=" + id +
|
||||||
@ -1001,8 +1039,8 @@ private static final long serialVersionUID = 1L;
|
|||||||
",rejectRefundUser=" + rejectRefundUser +
|
",rejectRefundUser=" + rejectRefundUser +
|
||||||
",rejectReturnReason=" + rejectReturnReason +
|
",rejectReturnReason=" + rejectReturnReason +
|
||||||
",rejectReturnUser=" + rejectReturnUser +
|
",rejectReturnUser=" + rejectReturnUser +
|
||||||
",rejectShippedReason=" + rejectShippedReason +
|
",rejectSignReceiptReason=" + rejectSignReceiptReason +
|
||||||
",rejectShippedUser=" + rejectShippedUser +
|
",rejectSignReceiptUser=" + rejectSignReceiptUser +
|
||||||
",sellerAgreeReturnUser=" + sellerAgreeReturnUser +
|
",sellerAgreeReturnUser=" + sellerAgreeReturnUser +
|
||||||
",shippedUser=" + shippedUser +
|
",shippedUser=" + shippedUser +
|
||||||
",status=" + status +
|
",status=" + status +
|
||||||
|
|||||||
@ -11,6 +11,9 @@ public enum ReverseStatusEnums {
|
|||||||
// refunded 退款完成 ,
|
// refunded 退款完成 ,
|
||||||
// close 退款关闭
|
// close 退款关闭
|
||||||
// 订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已签收:shipped,拒绝签收:reject_shipped,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
// 订单取消:cancel,买家申请仅退款,等待卖家同意:buyer_apply_refund_wait_seller_agree,买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货,买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已签收:shipped,拒绝签收:reject_shipped,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close,拒绝退货:reject_return
|
||||||
|
|
||||||
|
create("create", "订单创建"),
|
||||||
|
|
||||||
cancel("cancel", "订单取消"),
|
cancel("cancel", "订单取消"),
|
||||||
|
|
||||||
buyer_apply_refund_wait_seller_agree("buyer_apply_refund_wait_seller_agree", "买家申请仅退款,等待卖家同意,"),
|
buyer_apply_refund_wait_seller_agree("buyer_apply_refund_wait_seller_agree", "买家申请仅退款,等待卖家同意,"),
|
||||||
@ -19,13 +22,15 @@ public enum ReverseStatusEnums {
|
|||||||
|
|
||||||
seller_agree_return_wait_buyer_post("seller_agree_return_wait_buyer_post", "卖家同意退货,买家邮寄"),
|
seller_agree_return_wait_buyer_post("seller_agree_return_wait_buyer_post", "卖家同意退货,买家邮寄"),
|
||||||
|
|
||||||
reject_return("reject_return", "拒绝退货退款"),
|
reject_return("reject_return", "卖家拒绝退货退款"),
|
||||||
|
|
||||||
shipping("shipping", "运送中"),
|
shipping("shipping", "运送中"),
|
||||||
|
|
||||||
shipped("shipped", "已签收"),
|
shipped("shipped", "已投递,比如入到快递柜"),
|
||||||
|
|
||||||
reject_shipped("reject_shipped", "拒绝签收"),
|
agree_sign_receipt("agree_sign_receipt", "同意签收"),
|
||||||
|
|
||||||
|
reject_sign_receipt("reject_sign_receipt", "拒绝签收"),
|
||||||
|
|
||||||
qa_check_finished("qa_check_finished", "质检完成"),
|
qa_check_finished("qa_check_finished", "质检完成"),
|
||||||
|
|
||||||
|
|||||||
@ -157,14 +157,20 @@ public class AdminReverseController {
|
|||||||
}
|
}
|
||||||
vvReverseOrderEntity.setGmtShipped(new Date());
|
vvReverseOrderEntity.setGmtShipped(new Date());
|
||||||
vvReverseOrderEntity.setShippedUser(vvApproveRequest.getUserName());
|
vvReverseOrderEntity.setShippedUser(vvApproveRequest.getUserName());
|
||||||
} else if (ReverseStatusEnums.reject_shipped.getStatus().equals(vvApproveRequest.getStatus())) {
|
} else if (ReverseStatusEnums.reject_sign_receipt.getStatus().equals(vvApproveRequest.getStatus())) {
|
||||||
if (!ReverseStatusEnums.shipping.getStatus().equals(vvReverseOrderEntity.getStatus())
|
if (!ReverseStatusEnums.shipping.getStatus().equals(vvReverseOrderEntity.getStatus())
|
||||||
&& !ReverseStatusEnums.shipped.getStatus().equals(vvReverseOrderEntity.getStatus())) {
|
&& !ReverseStatusEnums.shipped.getStatus().equals(vvReverseOrderEntity.getStatus())) {
|
||||||
|
return R.error("逆向订单状态不是 shipping or shipped");
|
||||||
|
}
|
||||||
|
vvReverseOrderEntity.setGmtRejectSignReceipt(new Date());
|
||||||
|
vvReverseOrderEntity.setRejectSignReceiptUser(vvApproveRequest.getUserName());
|
||||||
|
vvReverseOrderEntity.setRejectSignReceiptReason(vvApproveRequest.getRejectRefundReason());
|
||||||
|
} else if (ReverseStatusEnums.agree_sign_receipt.getStatus().equals(vvApproveRequest.getStatus())) {
|
||||||
|
if (!ReverseStatusEnums.shipped.getStatus().equals(vvReverseOrderEntity.getStatus())) {
|
||||||
return R.error("逆向订单状态不是 shipping");
|
return R.error("逆向订单状态不是 shipping");
|
||||||
}
|
}
|
||||||
vvReverseOrderEntity.setGmtRejectShipped(new Date());
|
vvReverseOrderEntity.setGmtAgreeSignReceipt(new Date());
|
||||||
vvReverseOrderEntity.setRejectShippedUser(vvApproveRequest.getUserName());
|
vvReverseOrderEntity.setAgreeSignReceiptUser(vvApproveRequest.getUserName());
|
||||||
vvReverseOrderEntity.setRejectShippedReason(vvApproveRequest.getRejectRefundReason());
|
|
||||||
} else if (ReverseStatusEnums.qa_check_finished.getStatus().equals(vvApproveRequest.getStatus())) {
|
} else if (ReverseStatusEnums.qa_check_finished.getStatus().equals(vvApproveRequest.getStatus())) {
|
||||||
if (!ReverseStatusEnums.shipped.getStatus().equals(vvReverseOrderEntity.getStatus())) {
|
if (!ReverseStatusEnums.shipped.getStatus().equals(vvReverseOrderEntity.getStatus())) {
|
||||||
return R.error("逆向订单状态不是 shipped");
|
return R.error("逆向订单状态不是 shipped");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user