quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-09 22:42:14 +08:00
parent e166af40ab
commit fb5069b16e
4 changed files with 85 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvReverseOrderEntity.java
View File

@ -26,7 +26,7 @@ private static final long serialVersionUID = 1L;
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
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 退款退货
@ -70,6 +70,9 @@ private static final long serialVersionUID = 1L;
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 = "id", type = IdType.AUTO)
private Long id;
@ -81,7 +84,7 @@ private static final long serialVersionUID = 1L;
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
//订单取消: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;
@ -169,6 +172,12 @@ private static final long serialVersionUID = 1L;
private String rejectRefundUser;
//拒绝退款原因
private String rejectRefundReason;
//拒绝退回
private Date gmtRejectReturn;
//拒绝退回用户
private String rejectReturnUser;
//拒绝退回原因
private String rejectReturnReason;
/**
*
* @return
@ -245,14 +254,14 @@ private static final long serialVersionUID = 1L;
}
/**
* 订单取消: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
* 订单取消: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;
}
/**
* 订单取消: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
* 订单取消: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
*/
public void setStatus(String status) {
@ -904,6 +913,51 @@ private static final long serialVersionUID = 1L;
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{" +
@ -956,6 +1010,9 @@ private static final long serialVersionUID = 1L;
",gmtRejectRefund=" + gmtRejectRefund +
",rejectRefundUser=" + rejectRefundUser +
",rejectRefundReason=" + rejectRefundReason +
",gmtRejectReturn=" + gmtRejectReturn +
",rejectReturnUser=" + rejectReturnUser +
",rejectReturnReason=" + rejectReturnReason +
"}";
}
}

2
api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java
View File

@ -17,6 +17,8 @@ public enum ReverseStatusEnums {
seller_agree_return_wait_buyer_post("seller_agree_return_wait_buyer_post", "卖家同意退货，买家邮寄"),
reject_return("reject_return", "拒绝退货退款"),
shipping("shipping", "运送中"),
shipped("shipped", "已签收"),

5
api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java
View File

@ -48,6 +48,11 @@ public class VvApproveRequest extends AdminBaseDTO {
* 质检完成评论
*/
private String qaCheckFinishedComment;
/***
* 拒绝退货原因
*/
private String rejectReturnReason;
}

24
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java
View File

@ -61,7 +61,7 @@ public class AdminReverseController {
private VvPackageDao vvPackageDao;
@Autowired
private VvPackageService vvPackageService ;
private VvPackageService vvPackageService;
/***
* 逆向列表 https://api.1024api.com/api-interface/mm/reverse/list
@ -93,7 +93,7 @@ public class AdminReverseController {
Map<Long, List<VvReverseOrderProveEntity>> vvProveMap = SanUtils.list2GroupBy(vvReverseOrderProveEntities, VvReverseOrderProveEntity::getReverseOrderId);
List<String> trackNumbers = new ArrayList<>();
for (VvReverseOrderEntity vvReverseOrderEntity : vvReverseOrderEntities) {
if(StringUtils.isNotEmpty(vvReverseOrderEntity.getTrackNumber())){
if (StringUtils.isNotEmpty(vvReverseOrderEntity.getTrackNumber())) {
trackNumbers.add(vvReverseOrderEntity.getTrackNumber());
vvPackageService.selectVvKuaidiAndUpdateData(vvReverseOrderEntity.getTrackNumber(), RoleEnums.admin.getRole());
}
@ -123,6 +123,7 @@ public class AdminReverseController {
/***
* 卖家同意退货，买家邮寄:seller_agree_return_wait_buyer_post
* 拒绝退货：reject_return
* 拒绝签收:reject_shipped,
* 质检完成:qa_check_finished,
* 同意退款:agree_refund,
@ -140,6 +141,14 @@ public class AdminReverseController {
}
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())) {
return R.error("逆向订单状态不是 buyer_apply_reverse_wait_seller_agree");
}
vvReverseOrderEntity.setGmtRejectReturn(new Date());
vvReverseOrderEntity.setRejectReturnUser(vvApproveRequest.getUserName());
vvReverseOrderEntity.setRejectReturnReason(vvApproveRequest.getRejectReturnReason());
} else if (ReverseStatusEnums.shipped.getStatus().equals(vvApproveRequest.getStatus())) {
if (!ReverseStatusEnums.shipping.getStatus().equals(vvReverseOrderEntity.getStatus())) {
return R.error("逆向订单状态不是 shipping");
@ -163,19 +172,19 @@ 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())) {
return R.error("逆向订单状态不是 qa_check_finished 或 cancel ");
}
vvReverseOrderEntity.setGmtAgreeRefund(new Date());
vvReverseOrderEntity.setAgreeRefundUser(vvApproveRequest.getUserName());
}else if (ReverseStatusEnums.reject_refund.getStatus().equals(vvApproveRequest.getStatus())) {
} else if (ReverseStatusEnums.reject_refund.getStatus().equals(vvApproveRequest.getStatus())) {
if (!ReverseStatusEnums.qa_check_finished.getStatus().equals(vvReverseOrderEntity.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())) {
} else if (ReverseStatusEnums.close.getStatus().equals(vvApproveRequest.getStatus())) {
if (!ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus())) {
return R.error("逆向订单状态不是 buyer_apply_reverse_wait_seller_agree");
}
@ -183,6 +192,7 @@ public class AdminReverseController {
vvReverseOrderEntity.setCloseUser(vvApproveRequest.getUserName());
vvReverseOrderEntity.setCloseReason(vvApproveRequest.getCloseReason());
}
List<VvReverseOrderLineEntity> vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvApproveRequest.getReverseOrderId());
List<Long> tradeOrderLineIds = SanUtils.list2list(vvReverseOrderLineEntities, VvReverseOrderLineEntity::getTradeOrderLineId);
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(tradeOrderLineIds);
@ -190,9 +200,9 @@ public class AdminReverseController {
vvTradeOrderLineEntity.setReverseStatus(vvReverseOrderEntity.getStatus());
vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
}
if(ReverseStatusEnums.agree_refund.getStatus().equals(vvApproveRequest.getStatus())){
if (ReverseStatusEnums.agree_refund.getStatus().equals(vvApproveRequest.getStatus())) {
Refund refund = jsapiPrepay.refund(vvReverseOrderEntity.getTradeOrderId(), vvReverseOrderEntity.getId());
log.info("AdminReverseController reverseOrderEntity id:{} refund:{}",vvReverseOrderEntity.getId(), JSON.toJSONString(refund));
log.info("AdminReverseController reverseOrderEntity id:{} refund:{}", vvReverseOrderEntity.getId(), JSON.toJSONString(refund));
vvReverseOrderEntity.setWeixinFundsAccount(JSON.toJSONString(refund.getFundsAccount()));
vvReverseOrderEntity.setWeixinStatus(JSON.toJSONString(refund.getStatus()));
vvReverseOrderEntity.setWeixinRefundId(refund.getRefundId());