From be8b045de794e27db0e6c9ebf2017671143bd09d Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 11 Nov 2025 06:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/entity/vv/VvReverseOrderEntity.java | 1506 ++++++++--------- .../api/data/enums/ReverseStatusEnums.java | 6 +- .../java/com/test/xxx/MysqlMain_update.java | 2 +- .../controller/mm/AdminReverseController.java | 19 +- .../controller/vv/AppReverseController.java | 16 +- 5 files changed, 784 insertions(+), 765 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvReverseOrderEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvReverseOrderEntity.java index dbae530..28c77d1 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvReverseOrderEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvReverseOrderEntity.java @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *逆向表 * @author quyixiao -* @since 2025-11-09 +* @since 2025-11-11 */ @Data @@ -21,87 +21,155 @@ private static final long serialVersionUID = 1L; public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvReverseOrderEntity:"; public final static String all = CLASS_NAME + "*"; + public final static String agree_refund_user = CLASS_NAME + "agree_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 cancel_user = CLASS_NAME + "cancel_user"; // 逆向订单取消的卖家 + public final static String close_reason = CLASS_NAME + "close_reason"; // 订单关闭原因 + public final static String close_user = CLASS_NAME + "close_user"; // 逆向订单关闭的卖家 + public final static String create_time = CLASS_NAME + "create_time"; // 创建时间 + 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_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_cancel = CLASS_NAME + "gmt_cancel"; // 订单取消时间 + public final static String gmt_close = CLASS_NAME + "gmt_close"; // 退款关闭时间 + public final static String gmt_pre_refund = CLASS_NAME + "gmt_pre_refund"; // 日期 + public final static String gmt_qa_check_finished = CLASS_NAME + "gmt_qa_check_finished"; // 质检完成时间 + public final static String gmt_refund_notify = CLASS_NAME + "gmt_refund_notify"; // 回调的时间 + 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_return = CLASS_NAME + "gmt_reject_return"; // 拒绝退回 + public final static String gmt_reject_shipped = CLASS_NAME + "gmt_reject_shipped"; // 拒绝签收时间 + 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 id_ = CLASS_NAME + "id"; // public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除 - public final static String create_time = CLASS_NAME + "create_time"; // 创建时间 public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间 - public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单号 - public final static String status_ = CLASS_NAME + "status"; // 订单取消:cancel,买家申请退款，等待卖家同意:buyer_apply_reverse_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 refund_amount = CLASS_NAME + "refund_amount"; // 退款金额 - public final static String refund_trade_order_line_count = CLASS_NAME + "refund_trade_order_line_count"; // 退款子单笔数 - public final static String refund_type = CLASS_NAME + "refund_type"; // 退款类型，1 仅退款， 2 退款退货 - public final static String track_number = CLASS_NAME + "track_number"; // 物流追踪号 - public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间撮 public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 修改时间撮 + public final static String pre_refund_info = CLASS_NAME + "pre_refund_info"; // 提交退款返回的参数 + public final static String pre_refund_user = CLASS_NAME + "pre_refund_user"; // 提交给微信退款的卖家 + public final static String qa_check_finished_comment = CLASS_NAME + "qa_check_finished_comment"; // 质检完成评论 + public final static String qa_check_finished_user = CLASS_NAME + "qa_check_finished_user"; // 质检完成用户 + public final static String refund_amount = CLASS_NAME + "refund_amount"; // 退款金额 public final static String refund_count = CLASS_NAME + "refund_count"; // 退款子单数量 public final static String refund_reason = CLASS_NAME + "refund_reason"; // 退款原因 + public final static String refund_trade_order_line_count = CLASS_NAME + "refund_trade_order_line_count"; // 退款子单笔数 + public final static String refund_type = CLASS_NAME + "refund_type"; // 退款类型，1 仅退款， 2 退款退货 + public final static String refunded_user = CLASS_NAME + "refunded_user"; // 退款完成的操作卖家 + public final static String reject_refund_reason = CLASS_NAME + "reject_refund_reason"; // 拒绝退款原因 + 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_user = CLASS_NAME + "reject_return_user"; // 拒绝退回用户 + public final static String reject_shipped_reason = CLASS_NAME + "reject_shipped_reason"; // 拒绝签收原因 + public final static String reject_shipped_user = CLASS_NAME + "reject_shipped_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 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 track_number = CLASS_NAME + "track_number"; // 物流追踪号 + 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 weixin_funds_account = CLASS_NAME + "weixin_funds_account"; // 退款账户 public final static String weixin_refund_id = CLASS_NAME + "weixin_refund_id"; // 退款id public final static String weixin_status = CLASS_NAME + "weixin_status"; // 退款状态 public final static String weixin_transaction_id = CLASS_NAME + "weixin_transaction_id"; // 退款事务id - public final static String user_eceived_account = CLASS_NAME + "user_eceived_account"; // 退款接收事务id - public final static String pre_refund_info = CLASS_NAME + "pre_refund_info"; // 提交退款返回的参数 - public final static String gmt_pre_refund = CLASS_NAME + "gmt_pre_refund"; // 日期 - public final static String gmt_refund_notify = CLASS_NAME + "gmt_refund_notify"; // 回调的时间 - public final static String gmt_cancel = CLASS_NAME + "gmt_cancel"; // 订单取消时间 - public final static String gmt_close = CLASS_NAME + "gmt_close"; // 退款关闭时间 - public final static String gmt_refunded = CLASS_NAME + "gmt_refunded"; // 退款完成时间 - public final static String gmt_agree_refund = CLASS_NAME + "gmt_agree_refund"; // 同意退款时间 - public final static String gmt_shipped = CLASS_NAME + "gmt_shipped"; // 妥投时间 - public final static String gmt_buyer_post = CLASS_NAME + "gmt_buyer_post"; // 买家邮寄时间 - public final static String gmt_seller_agree_return = CLASS_NAME + "gmt_seller_agree_return"; // 卖家同意退款 - public final static String gmt_buyer_apply_refund = CLASS_NAME + "gmt_buyer_apply_refund"; // 买家申请退款时间 - public final static String pre_refund_user = CLASS_NAME + "pre_refund_user"; // 提交给微信退款的卖家 - public final static String cancel_user = CLASS_NAME + "cancel_user"; // 逆向订单取消的卖家 - public final static String close_user = CLASS_NAME + "close_user"; // 逆向订单关闭的卖家 - public final static String refunded_user = CLASS_NAME + "refunded_user"; // 退款完成的操作卖家 - public final static String agree_refund_user = CLASS_NAME + "agree_refund_user"; // 同意退款的卖家 - public final static String shipped_user = CLASS_NAME + "shipped_user"; // 同意妥投的买家 - public final static String buyer_post_user = CLASS_NAME + "buyer_post_user"; // 邮寄的买家 - public final static String seller_agree_return_user = CLASS_NAME + "seller_agree_return_user"; // 同意退货退款的卖家 - public final static String buyer_apply_refund_user = CLASS_NAME + "buyer_apply_refund_user"; // 买家申请退款的买家 - public final static String close_reason = CLASS_NAME + "close_reason"; // 订单关闭原因 - public final static String gmt_reject_shipped = CLASS_NAME + "gmt_reject_shipped"; // 拒绝签收时间 - public final static String reject_shipped_user = CLASS_NAME + "reject_shipped_user"; // 拒绝签收用户 - public final static String reject_shipped_reason = CLASS_NAME + "reject_shipped_reason"; // 拒绝签收原因 - public final static String gmt_qa_check_finished = CLASS_NAME + "gmt_qa_check_finished"; // 质检完成时间 - public final static String qa_check_finished_user = CLASS_NAME + "qa_check_finished_user"; // 质检完成用户 - public final static String qa_check_finished_comment = CLASS_NAME + "qa_check_finished_comment"; // 质检完成评论 - public final static String gmt_reject_refund = CLASS_NAME + "gmt_reject_refund"; // 拒绝退款时间 - public final static String reject_refund_user = CLASS_NAME + "reject_refund_user"; // 拒绝退款用户 - public final static String reject_refund_reason = CLASS_NAME + "reject_refund_reason"; // 拒绝退款原因 - public final static String gmt_reject_return = CLASS_NAME + "gmt_reject_return"; // 拒绝退回 - public final static String reject_return_user = CLASS_NAME + "reject_return_user"; // 拒绝退回用户 - public final static String reject_return_reason = CLASS_NAME + "reject_return_reason"; // 拒绝退回原因 + //同意退款的卖家 + @TableId(value = "agree_refund_user", type = IdType.AUTO) + private String agreeRefundUser; + //买家申请退款的买家 + private String buyerApplyRefundUser; + //邮寄的买家 + private String buyerPostUser; + //逆向订单取消的卖家 + private String cancelUser; + //订单关闭原因 + private String closeReason; + //逆向订单关闭的卖家 + private String closeUser; + //创建时间 + private Date createTime; + //创建时间撮 + private Long createTimestamp; + //同意退款时间 + private Date gmtAgreeRefund; + //买家申请退款时间 + private Date gmtBuyerApplyRefund; + //买家邮寄时间 + private Date gmtBuyerPost; + //订单取消时间 + private Date gmtCancel; + //退款关闭时间 + private Date gmtClose; + //日期 + private Date gmtPreRefund; + //质检完成时间 + private Date gmtQaCheckFinished; + //回调的时间 + private Date gmtRefundNotify; + //退款完成时间 + private Date gmtRefunded; + //拒绝退款时间 + private Date gmtRejectRefund; + //拒绝退回 + private Date gmtRejectReturn; + //拒绝签收时间 + private Date gmtRejectShipped; + //卖家同意退款 + private Date gmtSellerAgreeReturn; + //妥投时间 + private Date gmtShipped; // - @TableId(value = "id", type = IdType.AUTO) private Long id; //是否删除：0 否 1 删除 private Integer isDelete; - //创建时间 - private Date createTime; //修改时间 private Date modifyTime; - //订单号 - private Long tradeOrderId; - //订单取消:cancel,买家申请退款，等待卖家同意:buyer_apply_reverse_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 - private String status; - //退款金额 - private BigDecimal refundAmount; - //退款子单笔数 - private Integer refundTradeOrderLineCount; - //退款类型，1 仅退款， 2 退款退货 - private Integer refundType; - //物流追踪号 - private String trackNumber; - //创建时间撮 - private Long createTimestamp; //修改时间撮 private Long modifyTimestamp; + //提交退款返回的参数 + private String preRefundInfo; + //提交给微信退款的卖家 + private String preRefundUser; + //质检完成评论 + private String qaCheckFinishedComment; + //质检完成用户 + private String qaCheckFinishedUser; + //退款金额 + private BigDecimal refundAmount; //退款子单数量 private Integer refundCount; //退款原因 private String refundReason; + //退款子单笔数 + private Integer refundTradeOrderLineCount; + //退款类型，1 仅退款， 2 退款退货 + private Integer refundType; + //退款完成的操作卖家 + private String refundedUser; + //拒绝退款原因 + private String rejectRefundReason; + //拒绝退款用户 + private String rejectRefundUser; + //拒绝退回原因 + private String rejectReturnReason; + //拒绝退回用户 + private String rejectReturnUser; + //拒绝签收原因 + private String rejectShippedReason; + //拒绝签收用户 + private String rejectShippedUser; + //同意退货退款的卖家 + private String sellerAgreeReturnUser; + //同意妥投的买家 + 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 + private String status; + //物流追踪号 + private String trackNumber; + //订单号 + private Long tradeOrderId; + //退款接收事务id + private String userEceivedAccount; //退款账户 private String weixinFundsAccount; //退款id @@ -110,74 +178,336 @@ private static final long serialVersionUID = 1L; private String weixinStatus; //退款事务id private String weixinTransactionId; - //退款接收事务id - private String userEceivedAccount; - //提交退款返回的参数 - private String preRefundInfo; - //日期 - private Date gmtPreRefund; - //回调的时间 - private Date gmtRefundNotify; - //订单取消时间 - private Date gmtCancel; - //退款关闭时间 - private Date gmtClose; - //退款完成时间 - private Date gmtRefunded; - //同意退款时间 - private Date gmtAgreeRefund; - //妥投时间 - private Date gmtShipped; - //买家邮寄时间 - private Date gmtBuyerPost; - //卖家同意退款 - private Date gmtSellerAgreeReturn; - //买家申请退款时间 - private Date gmtBuyerApplyRefund; - //提交给微信退款的卖家 - private String preRefundUser; - //逆向订单取消的卖家 - private String cancelUser; - //逆向订单关闭的卖家 - private String closeUser; - //退款完成的操作卖家 - private String refundedUser; - //同意退款的卖家 - private String agreeRefundUser; - //同意妥投的买家 - private String shippedUser; - //邮寄的买家 - private String buyerPostUser; - //同意退货退款的卖家 - private String sellerAgreeReturnUser; - //买家申请退款的买家 - private String buyerApplyRefundUser; - //订单关闭原因 - private String closeReason; - //拒绝签收时间 - private Date gmtRejectShipped; - //拒绝签收用户 - private String rejectShippedUser; - //拒绝签收原因 - private String rejectShippedReason; - //质检完成时间 - private Date gmtQaCheckFinished; - //质检完成用户 - private String qaCheckFinishedUser; - //质检完成评论 - private String qaCheckFinishedComment; - //拒绝退款时间 - private Date gmtRejectRefund; - //拒绝退款用户 - private String rejectRefundUser; - //拒绝退款原因 - private String rejectRefundReason; - //拒绝退回 - private Date gmtRejectReturn; - //拒绝退回用户 - private String rejectReturnUser; - //拒绝退回原因 - private String rejectReturnReason; + /** + * 同意退款的卖家 + * @return + */ + public String getAgreeRefundUser() { + return agreeRefundUser; + } + /** + * 同意退款的卖家 + * @param agreeRefundUser + */ + public void setAgreeRefundUser(String agreeRefundUser) { + this.agreeRefundUser = agreeRefundUser; + } + + /** + * 买家申请退款的买家 + * @return + */ + public String getBuyerApplyRefundUser() { + return buyerApplyRefundUser; + } + /** + * 买家申请退款的买家 + * @param buyerApplyRefundUser + */ + public void setBuyerApplyRefundUser(String buyerApplyRefundUser) { + this.buyerApplyRefundUser = buyerApplyRefundUser; + } + + /** + * 邮寄的买家 + * @return + */ + public String getBuyerPostUser() { + return buyerPostUser; + } + /** + * 邮寄的买家 + * @param buyerPostUser + */ + public void setBuyerPostUser(String buyerPostUser) { + this.buyerPostUser = buyerPostUser; + } + + /** + * 逆向订单取消的卖家 + * @return + */ + public String getCancelUser() { + return cancelUser; + } + /** + * 逆向订单取消的卖家 + * @param cancelUser + */ + public void setCancelUser(String cancelUser) { + this.cancelUser = cancelUser; + } + + /** + * 订单关闭原因 + * @return + */ + public String getCloseReason() { + return closeReason; + } + /** + * 订单关闭原因 + * @param closeReason + */ + public void setCloseReason(String closeReason) { + this.closeReason = closeReason; + } + + /** + * 逆向订单关闭的卖家 + * @return + */ + public String getCloseUser() { + return closeUser; + } + /** + * 逆向订单关闭的卖家 + * @param closeUser + */ + public void setCloseUser(String closeUser) { + this.closeUser = closeUser; + } + + /** + * 创建时间 + * @return + */ + public Date getCreateTime() { + return createTime; + } + /** + * 创建时间 + * @param createTime + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 创建时间撮 + * @return + */ + public Long getCreateTimestamp() { + return createTimestamp; + } + /** + * 创建时间撮 + * @param createTimestamp + */ + public void setCreateTimestamp(Long createTimestamp) { + this.createTimestamp = createTimestamp; + } + + /** + * 同意退款时间 + * @return + */ + public Date getGmtAgreeRefund() { + return gmtAgreeRefund; + } + /** + * 同意退款时间 + * @param gmtAgreeRefund + */ + public void setGmtAgreeRefund(Date gmtAgreeRefund) { + this.gmtAgreeRefund = gmtAgreeRefund; + } + + /** + * 买家申请退款时间 + * @return + */ + public Date getGmtBuyerApplyRefund() { + return gmtBuyerApplyRefund; + } + /** + * 买家申请退款时间 + * @param gmtBuyerApplyRefund + */ + public void setGmtBuyerApplyRefund(Date gmtBuyerApplyRefund) { + this.gmtBuyerApplyRefund = gmtBuyerApplyRefund; + } + + /** + * 买家邮寄时间 + * @return + */ + public Date getGmtBuyerPost() { + return gmtBuyerPost; + } + /** + * 买家邮寄时间 + * @param gmtBuyerPost + */ + public void setGmtBuyerPost(Date gmtBuyerPost) { + this.gmtBuyerPost = gmtBuyerPost; + } + + /** + * 订单取消时间 + * @return + */ + public Date getGmtCancel() { + return gmtCancel; + } + /** + * 订单取消时间 + * @param gmtCancel + */ + public void setGmtCancel(Date gmtCancel) { + this.gmtCancel = gmtCancel; + } + + /** + * 退款关闭时间 + * @return + */ + public Date getGmtClose() { + return gmtClose; + } + /** + * 退款关闭时间 + * @param gmtClose + */ + public void setGmtClose(Date gmtClose) { + this.gmtClose = gmtClose; + } + + /** + * 日期 + * @return + */ + public Date getGmtPreRefund() { + return gmtPreRefund; + } + /** + * 日期 + * @param gmtPreRefund + */ + public void setGmtPreRefund(Date gmtPreRefund) { + this.gmtPreRefund = gmtPreRefund; + } + + /** + * 质检完成时间 + * @return + */ + public Date getGmtQaCheckFinished() { + return gmtQaCheckFinished; + } + /** + * 质检完成时间 + * @param gmtQaCheckFinished + */ + public void setGmtQaCheckFinished(Date gmtQaCheckFinished) { + this.gmtQaCheckFinished = gmtQaCheckFinished; + } + + /** + * 回调的时间 + * @return + */ + public Date getGmtRefundNotify() { + return gmtRefundNotify; + } + /** + * 回调的时间 + * @param gmtRefundNotify + */ + public void setGmtRefundNotify(Date gmtRefundNotify) { + this.gmtRefundNotify = gmtRefundNotify; + } + + /** + * 退款完成时间 + * @return + */ + public Date getGmtRefunded() { + return gmtRefunded; + } + /** + * 退款完成时间 + * @param gmtRefunded + */ + public void setGmtRefunded(Date gmtRefunded) { + this.gmtRefunded = gmtRefunded; + } + + /** + * 拒绝退款时间 + * @return + */ + public Date getGmtRejectRefund() { + return gmtRejectRefund; + } + /** + * 拒绝退款时间 + * @param gmtRejectRefund + */ + public void setGmtRejectRefund(Date gmtRejectRefund) { + this.gmtRejectRefund = gmtRejectRefund; + } + + /** + * 拒绝退回 + * @return + */ + public Date getGmtRejectReturn() { + return gmtRejectReturn; + } + /** + * 拒绝退回 + * @param gmtRejectReturn + */ + public void setGmtRejectReturn(Date gmtRejectReturn) { + this.gmtRejectReturn = gmtRejectReturn; + } + + /** + * 拒绝签收时间 + * @return + */ + public Date getGmtRejectShipped() { + return gmtRejectShipped; + } + /** + * 拒绝签收时间 + * @param gmtRejectShipped + */ + public void setGmtRejectShipped(Date gmtRejectShipped) { + this.gmtRejectShipped = gmtRejectShipped; + } + + /** + * 卖家同意退款 + * @return + */ + public Date getGmtSellerAgreeReturn() { + return gmtSellerAgreeReturn; + } + /** + * 卖家同意退款 + * @param gmtSellerAgreeReturn + */ + public void setGmtSellerAgreeReturn(Date gmtSellerAgreeReturn) { + this.gmtSellerAgreeReturn = gmtSellerAgreeReturn; + } + + /** + * 妥投时间 + * @return + */ + public Date getGmtShipped() { + return gmtShipped; + } + /** + * 妥投时间 + * @param gmtShipped + */ + public void setGmtShipped(Date gmtShipped) { + this.gmtShipped = gmtShipped; + } + /** * * @return @@ -208,21 +538,6 @@ private static final long serialVersionUID = 1L; this.isDelete = isDelete; } - /** - * 创建时间 - * @return - */ - public Date getCreateTime() { - return createTime; - } - /** - * 创建时间 - * @param createTime - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - /** * 修改时间 * @return @@ -239,33 +554,78 @@ private static final long serialVersionUID = 1L; } /** - * 订单号 + * 修改时间撮 * @return */ - public Long getTradeOrderId() { - return tradeOrderId; + public Long getModifyTimestamp() { + return modifyTimestamp; } /** - * 订单号 - * @param tradeOrderId + * 修改时间撮 + * @param modifyTimestamp */ - public void setTradeOrderId(Long tradeOrderId) { - this.tradeOrderId = tradeOrderId; + public void setModifyTimestamp(Long modifyTimestamp) { + this.modifyTimestamp = modifyTimestamp; } /** - * 订单取消:cancel,买家申请退款，等待卖家同意:buyer_apply_reverse_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 + * 提交退款返回的参数 * @return */ - public String getStatus() { - return status; + public String getPreRefundInfo() { + return preRefundInfo; } /** - * 订单取消:cancel,买家申请退款，等待卖家同意:buyer_apply_reverse_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 - * @param status + * 提交退款返回的参数 + * @param preRefundInfo */ - public void setStatus(String status) { - this.status = status; + public void setPreRefundInfo(String preRefundInfo) { + this.preRefundInfo = preRefundInfo; + } + + /** + * 提交给微信退款的卖家 + * @return + */ + public String getPreRefundUser() { + return preRefundUser; + } + /** + * 提交给微信退款的卖家 + * @param preRefundUser + */ + public void setPreRefundUser(String preRefundUser) { + this.preRefundUser = preRefundUser; + } + + /** + * 质检完成评论 + * @return + */ + public String getQaCheckFinishedComment() { + return qaCheckFinishedComment; + } + /** + * 质检完成评论 + * @param qaCheckFinishedComment + */ + public void setQaCheckFinishedComment(String qaCheckFinishedComment) { + this.qaCheckFinishedComment = qaCheckFinishedComment; + } + + /** + * 质检完成用户 + * @return + */ + public String getQaCheckFinishedUser() { + return qaCheckFinishedUser; + } + /** + * 质检完成用户 + * @param qaCheckFinishedUser + */ + public void setQaCheckFinishedUser(String qaCheckFinishedUser) { + this.qaCheckFinishedUser = qaCheckFinishedUser; } /** @@ -283,6 +643,36 @@ private static final long serialVersionUID = 1L; this.refundAmount = refundAmount; } + /** + * 退款子单数量 + * @return + */ + public Integer getRefundCount() { + return refundCount; + } + /** + * 退款子单数量 + * @param refundCount + */ + public void setRefundCount(Integer refundCount) { + this.refundCount = refundCount; + } + + /** + * 退款原因 + * @return + */ + public String getRefundReason() { + return refundReason; + } + /** + * 退款原因 + * @param refundReason + */ + public void setRefundReason(String refundReason) { + this.refundReason = refundReason; + } + /** * 退款子单笔数 * @return @@ -313,6 +703,156 @@ private static final long serialVersionUID = 1L; this.refundType = refundType; } + /** + * 退款完成的操作卖家 + * @return + */ + public String getRefundedUser() { + return refundedUser; + } + /** + * 退款完成的操作卖家 + * @param refundedUser + */ + public void setRefundedUser(String refundedUser) { + this.refundedUser = refundedUser; + } + + /** + * 拒绝退款原因 + * @return + */ + public String getRejectRefundReason() { + return rejectRefundReason; + } + /** + * 拒绝退款原因 + * @param rejectRefundReason + */ + public void setRejectRefundReason(String rejectRefundReason) { + this.rejectRefundReason = rejectRefundReason; + } + + /** + * 拒绝退款用户 + * @return + */ + public String getRejectRefundUser() { + return rejectRefundUser; + } + /** + * 拒绝退款用户 + * @param rejectRefundUser + */ + public void setRejectRefundUser(String rejectRefundUser) { + this.rejectRefundUser = rejectRefundUser; + } + + /** + * 拒绝退回原因 + * @return + */ + public String getRejectReturnReason() { + return rejectReturnReason; + } + /** + * 拒绝退回原因 + * @param rejectReturnReason + */ + public void setRejectReturnReason(String rejectReturnReason) { + this.rejectReturnReason = rejectReturnReason; + } + + /** + * 拒绝退回用户 + * @return + */ + public String getRejectReturnUser() { + return rejectReturnUser; + } + /** + * 拒绝退回用户 + * @param rejectReturnUser + */ + public void setRejectReturnUser(String rejectReturnUser) { + this.rejectReturnUser = rejectReturnUser; + } + + /** + * 拒绝签收原因 + * @return + */ + public String getRejectShippedReason() { + return rejectShippedReason; + } + /** + * 拒绝签收原因 + * @param rejectShippedReason + */ + public void setRejectShippedReason(String rejectShippedReason) { + this.rejectShippedReason = rejectShippedReason; + } + + /** + * 拒绝签收用户 + * @return + */ + public String getRejectShippedUser() { + return rejectShippedUser; + } + /** + * 拒绝签收用户 + * @param rejectShippedUser + */ + public void setRejectShippedUser(String rejectShippedUser) { + this.rejectShippedUser = rejectShippedUser; + } + + /** + * 同意退货退款的卖家 + * @return + */ + public String getSellerAgreeReturnUser() { + return sellerAgreeReturnUser; + } + /** + * 同意退货退款的卖家 + * @param sellerAgreeReturnUser + */ + public void setSellerAgreeReturnUser(String sellerAgreeReturnUser) { + this.sellerAgreeReturnUser = sellerAgreeReturnUser; + } + + /** + * 同意妥投的买家 + * @return + */ + public String getShippedUser() { + return shippedUser; + } + /** + * 同意妥投的买家 + * @param shippedUser + */ + public void setShippedUser(String shippedUser) { + this.shippedUser = 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 + * @return + */ + public String getStatus() { + 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 + * @param status + */ + public void setStatus(String status) { + this.status = status; + } + /** * 物流追踪号 * @return @@ -329,63 +869,33 @@ private static final long serialVersionUID = 1L; } /** - * 创建时间撮 + * 订单号 * @return */ - public Long getCreateTimestamp() { - return createTimestamp; + public Long getTradeOrderId() { + return tradeOrderId; } /** - * 创建时间撮 - * @param createTimestamp + * 订单号 + * @param tradeOrderId */ - public void setCreateTimestamp(Long createTimestamp) { - this.createTimestamp = createTimestamp; + public void setTradeOrderId(Long tradeOrderId) { + this.tradeOrderId = tradeOrderId; } /** - * 修改时间撮 + * 退款接收事务id * @return */ - public Long getModifyTimestamp() { - return modifyTimestamp; + public String getUserEceivedAccount() { + return userEceivedAccount; } /** - * 修改时间撮 - * @param modifyTimestamp + * 退款接收事务id + * @param userEceivedAccount */ - public void setModifyTimestamp(Long modifyTimestamp) { - this.modifyTimestamp = modifyTimestamp; - } - - /** - * 退款子单数量 - * @return - */ - public Integer getRefundCount() { - return refundCount; - } - /** - * 退款子单数量 - * @param refundCount - */ - public void setRefundCount(Integer refundCount) { - this.refundCount = refundCount; - } - - /** - * 退款原因 - * @return - */ - public String getRefundReason() { - return refundReason; - } - /** - * 退款原因 - * @param refundReason - */ - public void setRefundReason(String refundReason) { - this.refundReason = refundReason; + public void setUserEceivedAccount(String userEceivedAccount) { + this.userEceivedAccount = userEceivedAccount; } /** @@ -448,571 +958,61 @@ private static final long serialVersionUID = 1L; this.weixinTransactionId = weixinTransactionId; } - /** - * 退款接收事务id - * @return - */ - public String getUserEceivedAccount() { - return userEceivedAccount; - } - /** - * 退款接收事务id - * @param userEceivedAccount - */ - public void setUserEceivedAccount(String userEceivedAccount) { - this.userEceivedAccount = userEceivedAccount; - } - - /** - * 提交退款返回的参数 - * @return - */ - public String getPreRefundInfo() { - return preRefundInfo; - } - /** - * 提交退款返回的参数 - * @param preRefundInfo - */ - public void setPreRefundInfo(String preRefundInfo) { - this.preRefundInfo = preRefundInfo; - } - - /** - * 日期 - * @return - */ - public Date getGmtPreRefund() { - return gmtPreRefund; - } - /** - * 日期 - * @param gmtPreRefund - */ - public void setGmtPreRefund(Date gmtPreRefund) { - this.gmtPreRefund = gmtPreRefund; - } - - /** - * 回调的时间 - * @return - */ - public Date getGmtRefundNotify() { - return gmtRefundNotify; - } - /** - * 回调的时间 - * @param gmtRefundNotify - */ - public void setGmtRefundNotify(Date gmtRefundNotify) { - this.gmtRefundNotify = gmtRefundNotify; - } - - /** - * 订单取消时间 - * @return - */ - public Date getGmtCancel() { - return gmtCancel; - } - /** - * 订单取消时间 - * @param gmtCancel - */ - public void setGmtCancel(Date gmtCancel) { - this.gmtCancel = gmtCancel; - } - - /** - * 退款关闭时间 - * @return - */ - public Date getGmtClose() { - return gmtClose; - } - /** - * 退款关闭时间 - * @param gmtClose - */ - public void setGmtClose(Date gmtClose) { - this.gmtClose = gmtClose; - } - - /** - * 退款完成时间 - * @return - */ - public Date getGmtRefunded() { - return gmtRefunded; - } - /** - * 退款完成时间 - * @param gmtRefunded - */ - public void setGmtRefunded(Date gmtRefunded) { - this.gmtRefunded = gmtRefunded; - } - - /** - * 同意退款时间 - * @return - */ - public Date getGmtAgreeRefund() { - return gmtAgreeRefund; - } - /** - * 同意退款时间 - * @param gmtAgreeRefund - */ - public void setGmtAgreeRefund(Date gmtAgreeRefund) { - this.gmtAgreeRefund = gmtAgreeRefund; - } - - /** - * 妥投时间 - * @return - */ - public Date getGmtShipped() { - return gmtShipped; - } - /** - * 妥投时间 - * @param gmtShipped - */ - public void setGmtShipped(Date gmtShipped) { - this.gmtShipped = gmtShipped; - } - - /** - * 买家邮寄时间 - * @return - */ - public Date getGmtBuyerPost() { - return gmtBuyerPost; - } - /** - * 买家邮寄时间 - * @param gmtBuyerPost - */ - public void setGmtBuyerPost(Date gmtBuyerPost) { - this.gmtBuyerPost = gmtBuyerPost; - } - - /** - * 卖家同意退款 - * @return - */ - public Date getGmtSellerAgreeReturn() { - return gmtSellerAgreeReturn; - } - /** - * 卖家同意退款 - * @param gmtSellerAgreeReturn - */ - public void setGmtSellerAgreeReturn(Date gmtSellerAgreeReturn) { - this.gmtSellerAgreeReturn = gmtSellerAgreeReturn; - } - - /** - * 买家申请退款时间 - * @return - */ - public Date getGmtBuyerApplyRefund() { - return gmtBuyerApplyRefund; - } - /** - * 买家申请退款时间 - * @param gmtBuyerApplyRefund - */ - public void setGmtBuyerApplyRefund(Date gmtBuyerApplyRefund) { - this.gmtBuyerApplyRefund = gmtBuyerApplyRefund; - } - - /** - * 提交给微信退款的卖家 - * @return - */ - public String getPreRefundUser() { - return preRefundUser; - } - /** - * 提交给微信退款的卖家 - * @param preRefundUser - */ - public void setPreRefundUser(String preRefundUser) { - this.preRefundUser = preRefundUser; - } - - /** - * 逆向订单取消的卖家 - * @return - */ - public String getCancelUser() { - return cancelUser; - } - /** - * 逆向订单取消的卖家 - * @param cancelUser - */ - public void setCancelUser(String cancelUser) { - this.cancelUser = cancelUser; - } - - /** - * 逆向订单关闭的卖家 - * @return - */ - public String getCloseUser() { - return closeUser; - } - /** - * 逆向订单关闭的卖家 - * @param closeUser - */ - public void setCloseUser(String closeUser) { - this.closeUser = closeUser; - } - - /** - * 退款完成的操作卖家 - * @return - */ - public String getRefundedUser() { - return refundedUser; - } - /** - * 退款完成的操作卖家 - * @param refundedUser - */ - public void setRefundedUser(String refundedUser) { - this.refundedUser = refundedUser; - } - - /** - * 同意退款的卖家 - * @return - */ - public String getAgreeRefundUser() { - return agreeRefundUser; - } - /** - * 同意退款的卖家 - * @param agreeRefundUser - */ - public void setAgreeRefundUser(String agreeRefundUser) { - this.agreeRefundUser = agreeRefundUser; - } - - /** - * 同意妥投的买家 - * @return - */ - public String getShippedUser() { - return shippedUser; - } - /** - * 同意妥投的买家 - * @param shippedUser - */ - public void setShippedUser(String shippedUser) { - this.shippedUser = shippedUser; - } - - /** - * 邮寄的买家 - * @return - */ - public String getBuyerPostUser() { - return buyerPostUser; - } - /** - * 邮寄的买家 - * @param buyerPostUser - */ - public void setBuyerPostUser(String buyerPostUser) { - this.buyerPostUser = buyerPostUser; - } - - /** - * 同意退货退款的卖家 - * @return - */ - public String getSellerAgreeReturnUser() { - return sellerAgreeReturnUser; - } - /** - * 同意退货退款的卖家 - * @param sellerAgreeReturnUser - */ - public void setSellerAgreeReturnUser(String sellerAgreeReturnUser) { - this.sellerAgreeReturnUser = sellerAgreeReturnUser; - } - - /** - * 买家申请退款的买家 - * @return - */ - public String getBuyerApplyRefundUser() { - return buyerApplyRefundUser; - } - /** - * 买家申请退款的买家 - * @param buyerApplyRefundUser - */ - public void setBuyerApplyRefundUser(String buyerApplyRefundUser) { - this.buyerApplyRefundUser = buyerApplyRefundUser; - } - - /** - * 订单关闭原因 - * @return - */ - public String getCloseReason() { - return closeReason; - } - /** - * 订单关闭原因 - * @param closeReason - */ - public void setCloseReason(String closeReason) { - this.closeReason = closeReason; - } - - /** - * 拒绝签收时间 - * @return - */ - public Date getGmtRejectShipped() { - return gmtRejectShipped; - } - /** - * 拒绝签收时间 - * @param gmtRejectShipped - */ - public void setGmtRejectShipped(Date gmtRejectShipped) { - this.gmtRejectShipped = gmtRejectShipped; - } - - /** - * 拒绝签收用户 - * @return - */ - public String getRejectShippedUser() { - return rejectShippedUser; - } - /** - * 拒绝签收用户 - * @param rejectShippedUser - */ - public void setRejectShippedUser(String rejectShippedUser) { - this.rejectShippedUser = rejectShippedUser; - } - - /** - * 拒绝签收原因 - * @return - */ - public String getRejectShippedReason() { - return rejectShippedReason; - } - /** - * 拒绝签收原因 - * @param rejectShippedReason - */ - public void setRejectShippedReason(String rejectShippedReason) { - this.rejectShippedReason = rejectShippedReason; - } - - /** - * 质检完成时间 - * @return - */ - public Date getGmtQaCheckFinished() { - return gmtQaCheckFinished; - } - /** - * 质检完成时间 - * @param gmtQaCheckFinished - */ - public void setGmtQaCheckFinished(Date gmtQaCheckFinished) { - this.gmtQaCheckFinished = gmtQaCheckFinished; - } - - /** - * 质检完成用户 - * @return - */ - public String getQaCheckFinishedUser() { - return qaCheckFinishedUser; - } - /** - * 质检完成用户 - * @param qaCheckFinishedUser - */ - public void setQaCheckFinishedUser(String qaCheckFinishedUser) { - this.qaCheckFinishedUser = qaCheckFinishedUser; - } - - /** - * 质检完成评论 - * @return - */ - public String getQaCheckFinishedComment() { - return qaCheckFinishedComment; - } - /** - * 质检完成评论 - * @param qaCheckFinishedComment - */ - public void setQaCheckFinishedComment(String qaCheckFinishedComment) { - this.qaCheckFinishedComment = qaCheckFinishedComment; - } - - /** - * 拒绝退款时间 - * @return - */ - public Date getGmtRejectRefund() { - return gmtRejectRefund; - } - /** - * 拒绝退款时间 - * @param gmtRejectRefund - */ - public void setGmtRejectRefund(Date gmtRejectRefund) { - this.gmtRejectRefund = gmtRejectRefund; - } - - /** - * 拒绝退款用户 - * @return - */ - public String getRejectRefundUser() { - return rejectRefundUser; - } - /** - * 拒绝退款用户 - * @param rejectRefundUser - */ - public void setRejectRefundUser(String rejectRefundUser) { - this.rejectRefundUser = rejectRefundUser; - } - - /** - * 拒绝退款原因 - * @return - */ - public String getRejectRefundReason() { - return rejectRefundReason; - } - /** - * 拒绝退款原因 - * @param rejectRefundReason - */ - public void setRejectRefundReason(String rejectRefundReason) { - this.rejectRefundReason = rejectRefundReason; - } - - /** - * 拒绝退回 - * @return - */ - public Date getGmtRejectReturn() { - return gmtRejectReturn; - } - /** - * 拒绝退回 - * @param gmtRejectReturn - */ - public void setGmtRejectReturn(Date gmtRejectReturn) { - this.gmtRejectReturn = gmtRejectReturn; - } - - /** - * 拒绝退回用户 - * @return - */ - public String getRejectReturnUser() { - return rejectReturnUser; - } - /** - * 拒绝退回用户 - * @param rejectReturnUser - */ - public void setRejectReturnUser(String rejectReturnUser) { - this.rejectReturnUser = rejectReturnUser; - } - - /** - * 拒绝退回原因 - * @return - */ - public String getRejectReturnReason() { - return rejectReturnReason; - } - /** - * 拒绝退回原因 - * @param rejectReturnReason - */ - public void setRejectReturnReason(String rejectReturnReason) { - this.rejectReturnReason = rejectReturnReason; - } - @Override public String toString() { return "VvReverseOrderEntity{" + + ",agreeRefundUser=" + agreeRefundUser + + ",buyerApplyRefundUser=" + buyerApplyRefundUser + + ",buyerPostUser=" + buyerPostUser + + ",cancelUser=" + cancelUser + + ",closeReason=" + closeReason + + ",closeUser=" + closeUser + + ",createTime=" + createTime + + ",createTimestamp=" + createTimestamp + + ",gmtAgreeRefund=" + gmtAgreeRefund + + ",gmtBuyerApplyRefund=" + gmtBuyerApplyRefund + + ",gmtBuyerPost=" + gmtBuyerPost + + ",gmtCancel=" + gmtCancel + + ",gmtClose=" + gmtClose + + ",gmtPreRefund=" + gmtPreRefund + + ",gmtQaCheckFinished=" + gmtQaCheckFinished + + ",gmtRefundNotify=" + gmtRefundNotify + + ",gmtRefunded=" + gmtRefunded + + ",gmtRejectRefund=" + gmtRejectRefund + + ",gmtRejectReturn=" + gmtRejectReturn + + ",gmtRejectShipped=" + gmtRejectShipped + + ",gmtSellerAgreeReturn=" + gmtSellerAgreeReturn + + ",gmtShipped=" + gmtShipped + ",id=" + id + ",isDelete=" + isDelete + - ",createTime=" + createTime + ",modifyTime=" + modifyTime + - ",tradeOrderId=" + tradeOrderId + - ",status=" + status + - ",refundAmount=" + refundAmount + - ",refundTradeOrderLineCount=" + refundTradeOrderLineCount + - ",refundType=" + refundType + - ",trackNumber=" + trackNumber + - ",createTimestamp=" + createTimestamp + ",modifyTimestamp=" + modifyTimestamp + + ",preRefundInfo=" + preRefundInfo + + ",preRefundUser=" + preRefundUser + + ",qaCheckFinishedComment=" + qaCheckFinishedComment + + ",qaCheckFinishedUser=" + qaCheckFinishedUser + + ",refundAmount=" + refundAmount + ",refundCount=" + refundCount + ",refundReason=" + refundReason + + ",refundTradeOrderLineCount=" + refundTradeOrderLineCount + + ",refundType=" + refundType + + ",refundedUser=" + refundedUser + + ",rejectRefundReason=" + rejectRefundReason + + ",rejectRefundUser=" + rejectRefundUser + + ",rejectReturnReason=" + rejectReturnReason + + ",rejectReturnUser=" + rejectReturnUser + + ",rejectShippedReason=" + rejectShippedReason + + ",rejectShippedUser=" + rejectShippedUser + + ",sellerAgreeReturnUser=" + sellerAgreeReturnUser + + ",shippedUser=" + shippedUser + + ",status=" + status + + ",trackNumber=" + trackNumber + + ",tradeOrderId=" + tradeOrderId + + ",userEceivedAccount=" + userEceivedAccount + ",weixinFundsAccount=" + weixinFundsAccount + ",weixinRefundId=" + weixinRefundId + ",weixinStatus=" + weixinStatus + ",weixinTransactionId=" + weixinTransactionId + - ",userEceivedAccount=" + userEceivedAccount + - ",preRefundInfo=" + preRefundInfo + - ",gmtPreRefund=" + gmtPreRefund + - ",gmtRefundNotify=" + gmtRefundNotify + - ",gmtCancel=" + gmtCancel + - ",gmtClose=" + gmtClose + - ",gmtRefunded=" + gmtRefunded + - ",gmtAgreeRefund=" + gmtAgreeRefund + - ",gmtShipped=" + gmtShipped + - ",gmtBuyerPost=" + gmtBuyerPost + - ",gmtSellerAgreeReturn=" + gmtSellerAgreeReturn + - ",gmtBuyerApplyRefund=" + gmtBuyerApplyRefund + - ",preRefundUser=" + preRefundUser + - ",cancelUser=" + cancelUser + - ",closeUser=" + closeUser + - ",refundedUser=" + refundedUser + - ",agreeRefundUser=" + agreeRefundUser + - ",shippedUser=" + shippedUser + - ",buyerPostUser=" + buyerPostUser + - ",sellerAgreeReturnUser=" + sellerAgreeReturnUser + - ",buyerApplyRefundUser=" + buyerApplyRefundUser + - ",closeReason=" + closeReason + - ",gmtRejectShipped=" + gmtRejectShipped + - ",rejectShippedUser=" + rejectShippedUser + - ",rejectShippedReason=" + rejectShippedReason + - ",gmtQaCheckFinished=" + gmtQaCheckFinished + - ",qaCheckFinishedUser=" + qaCheckFinishedUser + - ",qaCheckFinishedComment=" + qaCheckFinishedComment + - ",gmtRejectRefund=" + gmtRejectRefund + - ",rejectRefundUser=" + rejectRefundUser + - ",rejectRefundReason=" + rejectRefundReason + - ",gmtRejectReturn=" + gmtRejectReturn + - ",rejectReturnUser=" + rejectReturnUser + - ",rejectReturnReason=" + rejectReturnReason + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java index 1fdec31..db51086 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java @@ -10,10 +10,12 @@ public enum ReverseStatusEnums { // agree_refunded 同意退款 , // refunded 退款完成 ， // 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("cancel", "订单取消"), - buyer_apply_reverse_wait_seller_agree("buyer_apply_reverse_wait_seller_agree", "买家申请退款，等待卖家同意,"), + buyer_apply_refund_wait_seller_agree("buyer_apply_refund_wait_seller_agree", "买家申请仅退款，等待卖家同意,"), + + buyer_apply_return_wait_seller_agree("buyer_apply_return_wait_seller_agree", "买家申请退货退款，等待卖家同意,"), seller_agree_return_wait_buyer_post("seller_agree_return_wait_buyer_post", "卖家同意退货，买家邮寄"), diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java index 3c4d450..1267050 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java @@ -49,7 +49,7 @@ public class MysqlMain_update { List list = new ArrayList(); - list.add(new TablesBean("vv_my_settlement")); + list.add(new TablesBean("vv_reverse_order")); //list.add(new TablesBean("vv_trade_order")); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java index 8ee5b5b..a30f58c 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java @@ -138,14 +138,14 @@ public class AdminReverseController { vvReverseOrderEntity.setStatus(vvApproveRequest.getStatus()); vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity); if (ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvApproveRequest.getStatus())) { - if (!ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus())) { + if (!ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus())) { return R.error("逆向订单状态不是 seller_agree_return_wait_buyer_post"); } vvReverseOrderEntity.setGmtSellerAgreeReturn(new Date()); vvReverseOrderEntity.setSellerAgreeReturnUser(vvApproveRequest.getUserName()); } if (ReverseStatusEnums.reject_return.getStatus().equals(vvApproveRequest.getStatus())) { - if (!ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus())) { + if (!ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus())) { return R.error("逆向订单状态不是 buyer_apply_reverse_wait_seller_agree"); } vvReverseOrderEntity.setGmtRejectReturn(new Date()); @@ -174,20 +174,29 @@ public class AdminReverseController { vvReverseOrderEntity.setQaCheckFinishedComment(vvApproveRequest.getQaCheckFinishedComment()); } else if (ReverseStatusEnums.agree_refund.getStatus().equals(vvApproveRequest.getStatus())) { if (!ReverseStatusEnums.qa_check_finished.getStatus().equals(vvReverseOrderEntity.getStatus()) - && !ReverseStatusEnums.cancel.getDesc().equals(vvApproveRequest.getStatus())) { + && !ReverseStatusEnums.cancel.getDesc().equals(vvApproveRequest.getStatus()) + && !ReverseStatusEnums.buyer_apply_refund_wait_seller_agree.getDesc().equals(vvApproveRequest.getStatus()) + + ) { return R.error("逆向订单状态不是 qa_check_finished 或 cancel "); } vvReverseOrderEntity.setGmtAgreeRefund(new Date()); vvReverseOrderEntity.setAgreeRefundUser(vvApproveRequest.getUserName()); } else if (ReverseStatusEnums.reject_refund.getStatus().equals(vvApproveRequest.getStatus())) { - if (!ReverseStatusEnums.qa_check_finished.getStatus().equals(vvReverseOrderEntity.getStatus())) { + if (!ReverseStatusEnums.qa_check_finished.getStatus().equals(vvReverseOrderEntity.getStatus()) + && !ReverseStatusEnums.buyer_apply_refund_wait_seller_agree.getDesc().equals(vvApproveRequest.getStatus()) + ) { return R.error("逆向订单状态不是 buyer_apply_reverse_wait_seller_agree"); } vvReverseOrderEntity.setGmtRejectRefund(new Date()); vvReverseOrderEntity.setRejectRefundUser(vvApproveRequest.getUserName()); vvReverseOrderEntity.setRejectRefundReason(vvApproveRequest.getRejectRefundReason()); } else if (ReverseStatusEnums.close.getStatus().equals(vvApproveRequest.getStatus())) { - if (!ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus())) { + if ( + !ReverseStatusEnums.buyer_apply_refund_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + && !ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + && !ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { return R.error("逆向订单状态不是 buyer_apply_reverse_wait_seller_agree"); } vvReverseOrderEntity.setGmtClose(new Date()); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java index 7aadb2a..48d2e20 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java @@ -12,6 +12,7 @@ import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest; import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.entity.vv.*; +import com.heyu.api.data.utils.NumberUtil; import com.heyu.api.data.utils.R; import com.heyu.api.data.utils.SanUtils; import com.heyu.api.data.utils.StringUtils; @@ -63,9 +64,14 @@ public class AppReverseController { @Describe("逆向订单创建") @RequestMapping("/add") public R add(@RequestBody AppliyReverseRequest appliyReverseRequest) { - appliyReverseRequest.setStatus(ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree.getStatus()); - appliyReverseRequest.setRefundReason("买家申请退款：" + appliyReverseRequest.getRefundReason()); + // 退款类型 1 仅退款， 2 退款退货 + if(NumberUtil.equals(appliyReverseRequest.getRefundType(), 1 )){ + appliyReverseRequest.setStatus(ReverseStatusEnums.buyer_apply_refund_wait_seller_agree.getStatus()); + }else{ + appliyReverseRequest.setStatus(ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus()); + } + appliyReverseRequest.setRefundReason("买家申请退款：" + appliyReverseRequest.getRefundReason()); List vvTradeOrderLineEntityList = null; if(StringUtils.isNotEmpty(appliyReverseRequest.getTrackNumber())){ vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(appliyReverseRequest.getTrackNumber()); @@ -127,8 +133,10 @@ public class AppReverseController { @RequestMapping("/close") public R close(@RequestBody AppliyReverseCloseRequest appliyReverseRequest) { VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(appliyReverseRequest.getReverseOrderId()); - if(!ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree .getStatus().equals(vvReverseOrderEntity.getStatus()) - && !ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvReverseOrderEntity.getStatus())) { + if ( + !ReverseStatusEnums.buyer_apply_refund_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + && !ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + && !ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvReverseOrderEntity.getStatus())) { return R.error("逆向订单状态非buyer_apply_reverse_wait_seller_agree 和 seller_agree_return_wait_buyer_post,订单不允许关闭 "); } vvReverseOrderEntity.setStatus(ReverseStatusEnums.close.getStatus());