From 3c03c23992bf29605e04aad1610bed3e937fe682 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 19 Nov 2025 13:07:34 +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 --- .../heyu/api/data/dao/vv/VvPackageDao.java | 3 + .../api/data/entity/vv/VvPackageEntity.java | 59 +- .../data/entity/vv/VvReverseOrderEntity.java | 1612 +++++++++-------- .../entity/vv/VvSellerWarehouseEntity.java | 21 +- .../order/BuyerCloseReverseOrderAction.java | 9 +- .../java/com/test/xxx/MysqlMain_update.java | 2 + .../request/mm/order/VvToShippingDTO.java | 6 +- .../mm/reverse/AppliyReverseCloseRequest.java | 2 +- .../request/mm/reverse/VvApproveRequest.java | 7 + .../controller/mm/AdminOrderController.java | 9 +- .../controller/mm/AdminReverseController.java | 17 + .../controller/vv/AppReverseController.java | 38 +- .../api/schedule/impl/PackageUpdateJob.java | 5 +- 13 files changed, 974 insertions(+), 816 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java index 0fff22a..ed8473b 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java @@ -51,4 +51,7 @@ public interface VvPackageDao extends BaseMapper { List selectVvPackageBySignReceiptStatus(String signReceiptStatus); + + @LIMIT + VvPackageEntity selectVvPackageByReverseOrderId(Long reverseOrderId); } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPackageEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPackageEntity.java index 6846fa2..c369eae 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPackageEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPackageEntity.java @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *包裹表 * @author quyixiao -* @since 2025-11-18 +* @since 2025-11-19 */ @Data @@ -44,6 +44,9 @@ private static final long serialVersionUID = 1L; public final static String shipping_type = CLASS_NAME + "shipping_type"; // order 正向 ， reverse 逆向 public final static String kuaidi_query_expire_time = CLASS_NAME + "kuaidi_query_expire_time"; // 过期时间，注意：请控制每一单查询频率至少在半小时以上，否则会造成锁单。 public final static String sign_receipt_status = CLASS_NAME + "sign_receipt_status"; // not_sign_receipt, sign_receipt + public final static String seller_id = CLASS_NAME + "seller_id"; // 卖家id + public final static String seller_warehouse_id = CLASS_NAME + "seller_warehouse_id"; // 卖家仓库地址id + public final static String reverse_order_id = CLASS_NAME + "reverse_order_id"; // 逆向订单id // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -91,6 +94,12 @@ private static final long serialVersionUID = 1L; private Long kuaidiQueryExpireTime; //not_sign_receipt, sign_receipt private String signReceiptStatus; + //卖家id + private Long sellerId; + //卖家仓库地址id + private Long sellerWarehouseId; + //逆向订单id + private Long reverseOrderId; /** * * @return @@ -436,6 +445,51 @@ private static final long serialVersionUID = 1L; this.signReceiptStatus = signReceiptStatus; } + /** + * 卖家id + * @return + */ + public Long getSellerId() { + return sellerId; + } + /** + * 卖家id + * @param sellerId + */ + public void setSellerId(Long sellerId) { + this.sellerId = sellerId; + } + + /** + * 卖家仓库地址id + * @return + */ + public Long getSellerWarehouseId() { + return sellerWarehouseId; + } + /** + * 卖家仓库地址id + * @param sellerWarehouseId + */ + public void setSellerWarehouseId(Long sellerWarehouseId) { + this.sellerWarehouseId = sellerWarehouseId; + } + + /** + * 逆向订单id + * @return + */ + public Long getReverseOrderId() { + return reverseOrderId; + } + /** + * 逆向订单id + * @param reverseOrderId + */ + public void setReverseOrderId(Long reverseOrderId) { + this.reverseOrderId = reverseOrderId; + } + @Override public String toString() { return "VvPackageEntity{" + @@ -462,6 +516,9 @@ private static final long serialVersionUID = 1L; ",shippingType=" + shippingType + ",kuaidiQueryExpireTime=" + kuaidiQueryExpireTime + ",signReceiptStatus=" + signReceiptStatus + + ",sellerId=" + sellerId + + ",sellerWarehouseId=" + sellerWarehouseId + + ",reverseOrderId=" + reverseOrderId + "}"; } } \ No newline at end of file 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 40f45d3..029ba62 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-11 +* @since 2025-11-19 */ @Data @@ -21,161 +21,91 @@ 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 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_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_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_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_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_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 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 trade_order_id = CLASS_NAME + "trade_order_id"; // 订单号 + 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 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_sign_receipt_reason = CLASS_NAME + "reject_sign_receipt_reason"; // 拒绝签收原因 - 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 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_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 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 create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间撮 + public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 修改时间撮 + public final static String refund_count = CLASS_NAME + "refund_count"; // 退款子单数量 + public final static String refund_reason = CLASS_NAME + "refund_reason"; // 退款原因 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 - //同意退款的卖家 - @TableId(value = "agree_refund_user", type = IdType.AUTO) - private String agreeRefundUser; - //同意签收用户 - private String agreeSignReceiptUser; - //买家申请退款的买家 - 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 gmtAgreeSignReceipt; - //买家申请退款时间 - 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 gmtRejectSignReceipt; - //卖家同意退款 - private Date gmtSellerAgreeReturn; - //妥投时间 - private Date gmtShipped; + 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_sign_receipt = CLASS_NAME + "gmt_reject_sign_receipt"; // 拒绝签收时间 + public final static String reject_sign_receipt_user = CLASS_NAME + "reject_sign_receipt_user"; // 拒绝签收用户 + public final static String reject_sign_receipt_reason = CLASS_NAME + "reject_sign_receipt_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"; // 拒绝退回原因 + public final static String gmt_agree_sign_receipt = CLASS_NAME + "gmt_agree_sign_receipt"; // 同意签收时间 + public final static String agree_sign_receipt_user = CLASS_NAME + "agree_sign_receipt_user"; // 同意签收用户 + public final static String return_seller_id = CLASS_NAME + "return_seller_id"; // 退回到哪个卖家id + public final static String return_seller_warehouse_id = CLASS_NAME + "return_seller_warehouse_id"; // 退回到卖家仓库id // + @TableId(value = "id", type = IdType.AUTO) private Long id; //是否删除：0 否 1 删除 private Integer isDelete; + //创建时间 + private Date createTime; //修改时间 private Date modifyTime; - //修改时间撮 - private Long modifyTimestamp; - //提交退款返回的参数 - private String preRefundInfo; - //提交给微信退款的卖家 - private String preRefundUser; - //质检完成评论 - private String qaCheckFinishedComment; - //质检完成用户 - private String qaCheckFinishedUser; + //订单号 + private Long tradeOrderId; + //订单取消: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 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 rejectSignReceiptReason; - //拒绝签收用户 - private String rejectSignReceiptUser; - //同意退货退款的卖家 - 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_sign_receipt,同意签收： agree_sign_receipt,质检完成: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 Long createTimestamp; + //修改时间撮 + private Long modifyTimestamp; + //退款子单数量 + private Integer refundCount; + //退款原因 + private String refundReason; //退款账户 private String weixinFundsAccount; //退款id @@ -184,366 +114,82 @@ private static final long serialVersionUID = 1L; private String weixinStatus; //退款事务id private String weixinTransactionId; - /** - * 同意退款的卖家 - * @return - */ - public String getAgreeRefundUser() { - return agreeRefundUser; - } - /** - * 同意退款的卖家 - * @param agreeRefundUser - */ - public void setAgreeRefundUser(String agreeRefundUser) { - this.agreeRefundUser = agreeRefundUser; - } - - /** - * 同意签收用户 - * @return - */ - public String getAgreeSignReceiptUser() { - return agreeSignReceiptUser; - } - /** - * 同意签收用户 - * @param agreeSignReceiptUser - */ - public void setAgreeSignReceiptUser(String agreeSignReceiptUser) { - this.agreeSignReceiptUser = agreeSignReceiptUser; - } - - /** - * 买家申请退款的买家 - * @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 getGmtAgreeSignReceipt() { - return gmtAgreeSignReceipt; - } - /** - * 同意签收时间 - * @param gmtAgreeSignReceipt - */ - public void setGmtAgreeSignReceipt(Date gmtAgreeSignReceipt) { - this.gmtAgreeSignReceipt = gmtAgreeSignReceipt; - } - - /** - * 买家申请退款时间 - * @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 getGmtRejectSignReceipt() { - return gmtRejectSignReceipt; - } - /** - * 拒绝签收时间 - * @param gmtRejectSignReceipt - */ - public void setGmtRejectSignReceipt(Date gmtRejectSignReceipt) { - this.gmtRejectSignReceipt = gmtRejectSignReceipt; - } - - /** - * 卖家同意退款 - * @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; - } - + //退款接收事务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 gmtRejectSignReceipt; + //拒绝签收用户 + private String rejectSignReceiptUser; + //拒绝签收原因 + private String rejectSignReceiptReason; + //质检完成时间 + 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; + //同意签收时间 + private Date gmtAgreeSignReceipt; + //同意签收用户 + private String agreeSignReceiptUser; + //退回到哪个卖家id + private Long returnSellerId; + //退回到卖家仓库id + private Long returnSellerWarehouseId; /** * * @return @@ -574,6 +220,21 @@ 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 @@ -590,78 +251,33 @@ private static final long serialVersionUID = 1L; } /** - * 修改时间撮 + * 订单号 * @return */ - public Long getModifyTimestamp() { - return modifyTimestamp; + public Long getTradeOrderId() { + return tradeOrderId; } /** - * 修改时间撮 - * @param modifyTimestamp + * 订单号 + * @param tradeOrderId */ - public void setModifyTimestamp(Long modifyTimestamp) { - this.modifyTimestamp = modifyTimestamp; + public void setTradeOrderId(Long tradeOrderId) { + this.tradeOrderId = tradeOrderId; } /** - * 提交退款返回的参数 + * 订单取消: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 */ - public String getPreRefundInfo() { - return preRefundInfo; + public String getStatus() { + return status; } /** - * 提交退款返回的参数 - * @param preRefundInfo + * 订单取消: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 */ - 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; + public void setStatus(String status) { + this.status = status; } /** @@ -679,36 +295,6 @@ 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 @@ -739,156 +325,6 @@ 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 getRejectSignReceiptReason() { - return rejectSignReceiptReason; - } - /** - * 拒绝签收原因 - * @param rejectSignReceiptReason - */ - public void setRejectSignReceiptReason(String rejectSignReceiptReason) { - this.rejectSignReceiptReason = rejectSignReceiptReason; - } - - /** - * 拒绝签收用户 - * @return - */ - public String getRejectSignReceiptUser() { - return rejectSignReceiptUser; - } - /** - * 拒绝签收用户 - * @param rejectSignReceiptUser - */ - public void setRejectSignReceiptUser(String rejectSignReceiptUser) { - this.rejectSignReceiptUser = rejectSignReceiptUser; - } - - /** - * 同意退货退款的卖家 - * @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_sign_receipt,同意签收： agree_sign_receipt,质检完成: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_sign_receipt,同意签收： agree_sign_receipt,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close，拒绝退货：reject_return - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - /** * 物流追踪号 * @return @@ -905,33 +341,63 @@ private static final long serialVersionUID = 1L; } /** - * 订单号 + * 创建时间撮 * @return */ - public Long getTradeOrderId() { - return tradeOrderId; + public Long getCreateTimestamp() { + return createTimestamp; } /** - * 订单号 - * @param tradeOrderId + * 创建时间撮 + * @param createTimestamp */ - public void setTradeOrderId(Long tradeOrderId) { - this.tradeOrderId = tradeOrderId; + public void setCreateTimestamp(Long createTimestamp) { + this.createTimestamp = createTimestamp; } /** - * 退款接收事务id + * 修改时间撮 * @return */ - public String getUserEceivedAccount() { - return userEceivedAccount; + public Long getModifyTimestamp() { + return modifyTimestamp; } /** - * 退款接收事务id - * @param userEceivedAccount + * 修改时间撮 + * @param modifyTimestamp */ - public void setUserEceivedAccount(String userEceivedAccount) { - this.userEceivedAccount = 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; } /** @@ -994,63 +460,635 @@ 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 getGmtRejectSignReceipt() { + return gmtRejectSignReceipt; + } + /** + * 拒绝签收时间 + * @param gmtRejectSignReceipt + */ + public void setGmtRejectSignReceipt(Date gmtRejectSignReceipt) { + this.gmtRejectSignReceipt = gmtRejectSignReceipt; + } + + /** + * 拒绝签收用户 + * @return + */ + public String getRejectSignReceiptUser() { + return rejectSignReceiptUser; + } + /** + * 拒绝签收用户 + * @param rejectSignReceiptUser + */ + public void setRejectSignReceiptUser(String rejectSignReceiptUser) { + this.rejectSignReceiptUser = rejectSignReceiptUser; + } + + /** + * 拒绝签收原因 + * @return + */ + public String getRejectSignReceiptReason() { + return rejectSignReceiptReason; + } + /** + * 拒绝签收原因 + * @param rejectSignReceiptReason + */ + public void setRejectSignReceiptReason(String rejectSignReceiptReason) { + this.rejectSignReceiptReason = rejectSignReceiptReason; + } + + /** + * 质检完成时间 + * @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; + } + + /** + * 同意签收时间 + * @return + */ + public Date getGmtAgreeSignReceipt() { + return gmtAgreeSignReceipt; + } + /** + * 同意签收时间 + * @param gmtAgreeSignReceipt + */ + public void setGmtAgreeSignReceipt(Date gmtAgreeSignReceipt) { + this.gmtAgreeSignReceipt = gmtAgreeSignReceipt; + } + + /** + * 同意签收用户 + * @return + */ + public String getAgreeSignReceiptUser() { + return agreeSignReceiptUser; + } + /** + * 同意签收用户 + * @param agreeSignReceiptUser + */ + public void setAgreeSignReceiptUser(String agreeSignReceiptUser) { + this.agreeSignReceiptUser = agreeSignReceiptUser; + } + + /** + * 退回到哪个卖家id + * @return + */ + public Long getReturnSellerId() { + return returnSellerId; + } + /** + * 退回到哪个卖家id + * @param returnSellerId + */ + public void setReturnSellerId(Long returnSellerId) { + this.returnSellerId = returnSellerId; + } + + /** + * 退回到卖家仓库id + * @return + */ + public Long getReturnSellerWarehouseId() { + return returnSellerWarehouseId; + } + /** + * 退回到卖家仓库id + * @param returnSellerWarehouseId + */ + public void setReturnSellerWarehouseId(Long returnSellerWarehouseId) { + this.returnSellerWarehouseId = returnSellerWarehouseId; + } + @Override public String toString() { return "VvReverseOrderEntity{" + - ",agreeRefundUser=" + agreeRefundUser + - ",agreeSignReceiptUser=" + agreeSignReceiptUser + - ",buyerApplyRefundUser=" + buyerApplyRefundUser + - ",buyerPostUser=" + buyerPostUser + - ",cancelUser=" + cancelUser + - ",closeReason=" + closeReason + - ",closeUser=" + closeUser + - ",createTime=" + createTime + - ",createTimestamp=" + createTimestamp + - ",gmtAgreeRefund=" + gmtAgreeRefund + - ",gmtAgreeSignReceipt=" + gmtAgreeSignReceipt + - ",gmtBuyerApplyRefund=" + gmtBuyerApplyRefund + - ",gmtBuyerPost=" + gmtBuyerPost + - ",gmtCancel=" + gmtCancel + - ",gmtClose=" + gmtClose + - ",gmtPreRefund=" + gmtPreRefund + - ",gmtQaCheckFinished=" + gmtQaCheckFinished + - ",gmtRefundNotify=" + gmtRefundNotify + - ",gmtRefunded=" + gmtRefunded + - ",gmtRejectRefund=" + gmtRejectRefund + - ",gmtRejectReturn=" + gmtRejectReturn + - ",gmtRejectSignReceipt=" + gmtRejectSignReceipt + - ",gmtSellerAgreeReturn=" + gmtSellerAgreeReturn + - ",gmtShipped=" + gmtShipped + ",id=" + id + ",isDelete=" + isDelete + + ",createTime=" + createTime + ",modifyTime=" + modifyTime + - ",modifyTimestamp=" + modifyTimestamp + - ",preRefundInfo=" + preRefundInfo + - ",preRefundUser=" + preRefundUser + - ",qaCheckFinishedComment=" + qaCheckFinishedComment + - ",qaCheckFinishedUser=" + qaCheckFinishedUser + + ",tradeOrderId=" + tradeOrderId + + ",status=" + status + ",refundAmount=" + refundAmount + - ",refundCount=" + refundCount + - ",refundReason=" + refundReason + ",refundTradeOrderLineCount=" + refundTradeOrderLineCount + ",refundType=" + refundType + - ",refundedUser=" + refundedUser + - ",rejectRefundReason=" + rejectRefundReason + - ",rejectRefundUser=" + rejectRefundUser + - ",rejectReturnReason=" + rejectReturnReason + - ",rejectReturnUser=" + rejectReturnUser + - ",rejectSignReceiptReason=" + rejectSignReceiptReason + - ",rejectSignReceiptUser=" + rejectSignReceiptUser + - ",sellerAgreeReturnUser=" + sellerAgreeReturnUser + - ",shippedUser=" + shippedUser + - ",status=" + status + ",trackNumber=" + trackNumber + - ",tradeOrderId=" + tradeOrderId + - ",userEceivedAccount=" + userEceivedAccount + + ",createTimestamp=" + createTimestamp + + ",modifyTimestamp=" + modifyTimestamp + + ",refundCount=" + refundCount + + ",refundReason=" + refundReason + ",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 + + ",gmtRejectSignReceipt=" + gmtRejectSignReceipt + + ",rejectSignReceiptUser=" + rejectSignReceiptUser + + ",rejectSignReceiptReason=" + rejectSignReceiptReason + + ",gmtQaCheckFinished=" + gmtQaCheckFinished + + ",qaCheckFinishedUser=" + qaCheckFinishedUser + + ",qaCheckFinishedComment=" + qaCheckFinishedComment + + ",gmtRejectRefund=" + gmtRejectRefund + + ",rejectRefundUser=" + rejectRefundUser + + ",rejectRefundReason=" + rejectRefundReason + + ",gmtRejectReturn=" + gmtRejectReturn + + ",rejectReturnUser=" + rejectReturnUser + + ",rejectReturnReason=" + rejectReturnReason + + ",gmtAgreeSignReceipt=" + gmtAgreeSignReceipt + + ",agreeSignReceiptUser=" + agreeSignReceiptUser + + ",returnSellerId=" + returnSellerId + + ",returnSellerWarehouseId=" + returnSellerWarehouseId + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java index 7190e9d..1cfaaf4 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerWarehouseEntity.java @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *卖家仓库表 * @author quyixiao -* @since 2025-08-26 +* @since 2025-11-19 */ @Data @@ -31,6 +31,7 @@ private static final long serialVersionUID = 1L; public final static String district_ = CLASS_NAME + "district"; // 区 public final static String warehouse_detail_address = CLASS_NAME + "warehouse_detail_address"; // 仓库详情地址 public final static String seller_id = CLASS_NAME + "seller_id"; // 卖家id + public final static String warehouse_phone = CLASS_NAME + "warehouse_phone"; // 卖家手机号 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -52,6 +53,8 @@ private static final long serialVersionUID = 1L; private String warehouseDetailAddress; //卖家id private Long sellerId; + //卖家手机号 + private String warehousePhone; /** * * @return @@ -202,6 +205,21 @@ private static final long serialVersionUID = 1L; this.sellerId = sellerId; } + /** + * 卖家手机号 + * @return + */ + public String getWarehousePhone() { + return warehousePhone; + } + /** + * 卖家手机号 + * @param warehousePhone + */ + public void setWarehousePhone(String warehousePhone) { + this.warehousePhone = warehousePhone; + } + @Override public String toString() { return "VvSellerWarehouseEntity{" + @@ -215,6 +233,7 @@ private static final long serialVersionUID = 1L; ",district=" + district + ",warehouseDetailAddress=" + warehouseDetailAddress + ",sellerId=" + sellerId + + ",warehousePhone=" + warehousePhone + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerCloseReverseOrderAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerCloseReverseOrderAction.java index 7f2f3e7..5f055a4 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerCloseReverseOrderAction.java +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerCloseReverseOrderAction.java @@ -7,16 +7,21 @@ import com.heyu.api.data.enums.ReverseStatusEnums; import com.heyu.api.data.service.impl.AbstractOrderAction; public class BuyerCloseReverseOrderAction extends AbstractOrderAction { + + @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvReverseOrderEntity, boolean isApp) { if ( - ReverseStatusEnums.buyer_apply_cancel.getStatus().equals(vvReverseOrderEntity.getReverseStatus()) - ) { + || 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())) { if (isApp) { return OrderActionEnums.App_Buyer_Reverse_Order_Close; } } return null; } + + } 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 418e709..d627f47 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 @@ -48,9 +48,11 @@ public class MysqlMain_update { } List list = new ArrayList(); + list.add(new TablesBean("vv_package")); + Map map = MysqlUtil2ShowCreateTable.getComments(); for (int i = 0; i < list.size(); i++) { TablesBean obj = list.get(i); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java index 7fdd0cf..182000c 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java @@ -17,7 +17,7 @@ public class VvToShippingDTO extends AdminBaseDTO { */ private List tradeOrderLineIds; - //包裹图片url ， 是否必填写 ： 否 + //包裹图片url ， 是否必填写 ： 否X private List packageImageUrls; //订单追踪号 ， 是否必填写 ： 是 @@ -32,6 +32,10 @@ public class VvToShippingDTO extends AdminBaseDTO { //运费 是否必填写 ： 否 private BigDecimal shippingAmount = BigDecimal.ZERO; + //卖家id + private Long sellerId; + //卖家仓库地址id + private Long sellerWarehouseId; public static void main(String[] args) { diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java index 34ff770..c8d655a 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java @@ -14,6 +14,6 @@ public class AppliyReverseCloseRequest extends AppBaseRequest { //订单关闭原因 - private String closeReason; + private String reason; } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java index 62dd629..f7ddc9b 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java @@ -32,6 +32,13 @@ public class VvApproveRequest extends AdminBaseDTO { */ private List resources; + //卖家id + private Long sellerId; + + //卖家仓库地址id + private Long sellerWarehouseId; + + } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index 9de7d32..b6c4efb 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java @@ -225,6 +225,7 @@ public class AdminOrderController { return R.error("订单状态不对"); } } + VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(vvTradeOrderLineEntityList.get(0).getTradeOrderId()); VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByTrackNumber(vvOrderRequest.getTrackNumber()); if (vvPackageEntity == null) { @@ -245,6 +246,8 @@ public class AdminOrderController { vvPackageEntity.setTrackNumber(vvOrderRequest.getTrackNumber()); vvPackageEntity.setShippingType(ShippingTypeEnums.order.getType()); vvPackageEntity.setSignReceiptStatus(ApiConstants.NOT_SIGN_RECEIPT); + vvPackageEntity.setSellerId(vvOrderRequest.getSellerId()); + vvPackageEntity.setSellerWarehouseId(vvOrderRequest.getSellerWarehouseId()); vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity); vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.admin.getRole(), false); @@ -258,8 +261,9 @@ public class AdminOrderController { tradeOrderLineEntity.setTrackNumber(vvOrderRequest.getTrackNumber()); tradeOrderLineEntity.setStatus(OrderStatusEnums.shipping.getStatus()); // 已经发货 tradeOrderLineEntity.setGmtToShipping(new Date()); - vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); + tradeOrderLineEntity.setSellerId(vvOrderRequest.getSellerId()); + vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), OrderStatusEnums.shipping, vvOrderRequest.getUserName()); @@ -280,6 +284,7 @@ public class AdminOrderController { return R.error("没有Admin_Un_Shipping按钮"); } } + for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { tradeOrderLineEntity.setStatus(OrderStatusEnums.wait_shipping.getStatus()); tradeOrderLineEntity.setTrackNumber(null); @@ -362,7 +367,6 @@ public class AdminOrderController { return R.error("订单状态不对"); } } - for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { tradeOrderLineEntity.setStatus(OrderStatusEnums.delivered.getStatus()); tradeOrderLineEntity.setGmtDelivered(new Date()); @@ -377,7 +381,6 @@ public class AdminOrderController { return R.ok(); } - /*** * 订单取消 * http://localhost:8888/mm/order/cancel 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 2c92691..8e87f5a 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 @@ -3,6 +3,8 @@ package com.heyu.api.controller.mm; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.heyu.api.data.constants.ApiConstants; +import com.heyu.api.data.enums.ShippingTypeEnums; import com.heyu.api.data.kuaidi100.OrderActionDTO; import com.heyu.api.alibaba.request.mm.reverse.VvApproveRequest; import com.heyu.api.alibaba.request.mm.reverse.VvReverseListRequest; @@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; import java.util.*; @Slf4j @@ -140,9 +143,21 @@ public class AdminReverseController { String targetStatus = orderActionDTO.getTargetStatus(); vvReverseOrderEntity.setStatus(targetStatus); vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity); + if (ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(targetStatus)) { vvReverseOrderEntity.setGmtSellerAgreeReturn(new Date()); vvReverseOrderEntity.setSellerAgreeReturnUser(vvApproveRequest.getUserName()); + + + + VvPackageEntity vvPackageEntity = new VvPackageEntity(); + vvPackageEntity.setShippingAmount(BigDecimal.ZERO); + vvPackageEntity.setShippingType(ShippingTypeEnums.reverse.getType()); + vvPackageEntity.setSellerId(vvApproveRequest.getSellerId()); + vvPackageEntity.setSellerWarehouseId(vvApproveRequest.getSellerWarehouseId()); + vvPackageEntity.setSignReceiptStatus(ApiConstants.NOT_SIGN_RECEIPT); + vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity); + } else if (ReverseStatusEnums.reject_return.getStatus().equals(targetStatus)) { vvReverseOrderEntity.setGmtRejectReturn(new Date()); vvReverseOrderEntity.setRejectReturnUser(vvApproveRequest.getUserName()); @@ -176,6 +191,7 @@ public class AdminReverseController { List vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvApproveRequest.getReverseOrderId()); List tradeOrderLineIds = SanUtils.list2FieldList(vvReverseOrderLineEntities, VvReverseOrderLineEntity::getTradeOrderLineId); List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(tradeOrderLineIds); + for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { vvTradeOrderLineEntity.setReverseStatus(vvReverseOrderEntity.getStatus()); vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity); @@ -188,6 +204,7 @@ public class AdminReverseController { JSON.toJSONString(vvApproveRequest.getResources()) ); } + if (ReverseStatusEnums.agree_refund.getStatus().equals(targetStatus)) { Refund refund = jsapiPrepay.refund(vvReverseOrderEntity.getTradeOrderId(), vvReverseOrderEntity.getId()); log.info("AdminReverseController reverseOrderEntity id:{} refund:{}", vvReverseOrderEntity.getId(), JSON.toJSONString(refund)); 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 09a7ad5..d0ed34f 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 @@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -60,6 +59,12 @@ public class AppReverseController { @Autowired private VvPackageService vvPackageService; + + @Autowired + private VvSellerWarehouseDao vvSellerWarehouseDao; + + + /*** * * https://api.1024api.com/api-interface/app/reverse/add @@ -94,13 +99,11 @@ public class AppReverseController { @Describe("逆向订单更新订单号") @RequestMapping("/upload/tracknumber") public R uploadTracknumber(@RequestBody AppliyReverseProveRequest appliyReverseRequest) { - VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(appliyReverseRequest.getReverseOrderId()); if ( AbstractReverseAction.checkFailed(vvReverseOrderEntity, false, OrderActionEnums.App_Buyer_Upload_Reverse_TrackNumber.getButtonName())) { return R.error("逆向订单状态非seller_agree_return_wait_buyer_post，不对"); } - vvReverseOrderEntity.setStatus(ReverseStatusEnums.shipping.getStatus()); vvReverseOrderEntity.setTrackNumber(appliyReverseRequest.getTrackNumber()); vvReverseOrderEntity.setGmtBuyerPost(new Date()); @@ -119,23 +122,25 @@ public class AppReverseController { } } - VvPackageEntity vvPackageEntity = new VvPackageEntity(); + // 更新包裹信息 + VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByReverseOrderId(vvReverseOrderEntity.getId()); vvPackageEntity.setPackageImageUrl(JSON.toJSONString(packageImageUrls)); - vvPackageEntity.setShippingAmount(BigDecimal.ZERO); - vvPackageEntity.setShippingType(ShippingTypeEnums.reverse.getType()); vvPackageEntity.setTrackNumber(vvPackageEntity.getTrackNumber()); vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity); vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.user.getRole(), false); + List vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvReverseOrderEntity.getId()); + List tradeOrderLineIds = SanUtils.getFieldList(vvReverseOrderLineEntities, VvReverseOrderLineEntity::getTradeOrderLineId); VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber()); List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderByTradeOrderIds(tradeOrderLineIds); - // 创建订阅 - KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(), - vvTradeOrderLineEntityList.get(0).getBuyerPhone()); + Long sellerWarehouseId = NumberUtil.objToLongDefault(vvPackageEntity.getSellerWarehouseId(), 1); + VvSellerWarehouseEntity vvSellerWarehouseEntity = vvSellerWarehouseDao.selectVvSellerWarehouseById(sellerWarehouseId); + // 创建订阅 + KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(), vvSellerWarehouseEntity.getWarehousePhone()); for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { tradeOrderLineEntity.setStatus(ReverseStatusEnums.shipping.getStatus()); // 已经发货 vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); @@ -144,12 +149,10 @@ public class AppReverseController { appliyReverseRequest.getBuyerId() + "" ); } - - - return R.ok(); } + /** * 逆向订单关闭 ： /app/reverse/close * @@ -158,17 +161,14 @@ public class AppReverseController { @RequestMapping("/close") public R close(@RequestBody AppliyReverseCloseRequest request) { VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(request.getReverseOrderId()); - 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,订单不允许关闭 "); + if ( AbstractReverseAction.checkFailed(vvReverseOrderEntity, false, + OrderActionEnums.App_Buyer_Reverse_Order_Close.getButtonName())) { + return R.error("逆向订单状态不允许关闭 "); } vvReverseOrderEntity.setStatus(ReverseStatusEnums.close.getStatus()); vvReverseOrderEntity.setGmtClose(new Date()); - vvReverseOrderEntity.setCloseReason(request.getCloseReason()); + vvReverseOrderEntity.setCloseReason(request.getReason()); vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity); List vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(request.getReverseOrderId()); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/PackageUpdateJob.java b/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/PackageUpdateJob.java index cf9b1ef..af9be45 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/PackageUpdateJob.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/PackageUpdateJob.java @@ -6,6 +6,7 @@ import com.heyu.api.data.dao.vv.VvPackageDao; import com.heyu.api.data.entity.vv.VvPackageEntity; import com.heyu.api.data.enums.RoleEnums; import com.heyu.api.data.service.vv.VvPackageService; +import com.heyu.api.data.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -29,7 +30,9 @@ public class PackageUpdateJob { log.info("PackageUpdateJob start select " + new Date()); List vvPackageEntityList = vvPackageDao.selectVvPackageBySignReceiptStatus(ApiConstants.NOT_SIGN_RECEIPT); for (VvPackageEntity vvPackageEntity : vvPackageEntityList) { - vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.job.getRole(), false); + if(StringUtils.isNotEmpty(vvPackageEntity.getTrackNumber())) { + vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.job.getRole(), false); + } } } }