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-11 06:31:51 +08:00
parent ce47cc6c68
commit be8b045de7
5 changed files with 784 additions and 765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -10,10 +10,12 @@ public enum ReverseStatusEnums {
// agree_refunded 同意退款 , // agree_refunded 同意退款 ,
// refunded 退款完成 ， // refunded 退款完成 ，
// close 退款关闭 // close 退款关闭
// 订单取消:cancel,买家申请仅退款，等待卖家同意:buyer_apply_refund_wait_seller_agree，买家申请退货退款:buyer_apply_return_wait_seller_agree,卖家同意退货，买家邮寄:seller_agree_return_wait_buyer_post,运送中:shipping,已签收:shipped,拒绝签收:reject_shipped,质检完成:qa_check_finished,同意退款:agree_refund,拒绝退款:reject_refund,微信退款中:weixin_refunding,退款完成:refunded,退款关闭:close，拒绝退货：reject_return
cancel("cancel", "订单取消"), 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", "卖家同意退货，买家邮寄"), seller_agree_return_wait_buyer_post("seller_agree_return_wait_buyer_post", "卖家同意退货，买家邮寄"),

2
api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java
View File

@ -49,7 +49,7 @@ public class MysqlMain_update {
List<TablesBean> list = new ArrayList<TablesBean>(); List<TablesBean> list = new ArrayList<TablesBean>();
list.add(new TablesBean("vv_my_settlement")); list.add(new TablesBean("vv_reverse_order"));
//list.add(new TablesBean("vv_trade_order")); //list.add(new TablesBean("vv_trade_order"));

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

@ -138,14 +138,14 @@ public class AdminReverseController {
vvReverseOrderEntity.setStatus(vvApproveRequest.getStatus()); vvReverseOrderEntity.setStatus(vvApproveRequest.getStatus());
vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity); vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity);
if (ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvApproveRequest.getStatus())) { 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"); return R.error("逆向订单状态不是 seller_agree_return_wait_buyer_post");
} }
vvReverseOrderEntity.setGmtSellerAgreeReturn(new Date()); vvReverseOrderEntity.setGmtSellerAgreeReturn(new Date());
vvReverseOrderEntity.setSellerAgreeReturnUser(vvApproveRequest.getUserName()); vvReverseOrderEntity.setSellerAgreeReturnUser(vvApproveRequest.getUserName());
} }
if (ReverseStatusEnums.reject_return.getStatus().equals(vvApproveRequest.getStatus())) { 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"); return R.error("逆向订单状态不是 buyer_apply_reverse_wait_seller_agree");
} }
vvReverseOrderEntity.setGmtRejectReturn(new Date()); vvReverseOrderEntity.setGmtRejectReturn(new Date());
@ -174,20 +174,29 @@ public class AdminReverseController {
vvReverseOrderEntity.setQaCheckFinishedComment(vvApproveRequest.getQaCheckFinishedComment()); vvReverseOrderEntity.setQaCheckFinishedComment(vvApproveRequest.getQaCheckFinishedComment());
} else if (ReverseStatusEnums.agree_refund.getStatus().equals(vvApproveRequest.getStatus())) { } else if (ReverseStatusEnums.agree_refund.getStatus().equals(vvApproveRequest.getStatus())) {
if (!ReverseStatusEnums.qa_check_finished.getStatus().equals(vvReverseOrderEntity.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 "); return R.error("逆向订单状态不是 qa_check_finished 或 cancel ");
} }
vvReverseOrderEntity.setGmtAgreeRefund(new Date()); vvReverseOrderEntity.setGmtAgreeRefund(new Date());
vvReverseOrderEntity.setAgreeRefundUser(vvApproveRequest.getUserName()); 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())) { 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"); return R.error("逆向订单状态不是 buyer_apply_reverse_wait_seller_agree");
} }
vvReverseOrderEntity.setGmtRejectRefund(new Date()); vvReverseOrderEntity.setGmtRejectRefund(new Date());
vvReverseOrderEntity.setRejectRefundUser(vvApproveRequest.getUserName()); vvReverseOrderEntity.setRejectRefundUser(vvApproveRequest.getUserName());
vvReverseOrderEntity.setRejectRefundReason(vvApproveRequest.getRejectRefundReason()); 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())) { 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"); return R.error("逆向订单状态不是 buyer_apply_reverse_wait_seller_agree");
} }
vvReverseOrderEntity.setGmtClose(new Date()); vvReverseOrderEntity.setGmtClose(new Date());

16
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java
View File

@ -12,6 +12,7 @@ import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest;
import com.heyu.api.common.annotation.Describe; import com.heyu.api.common.annotation.Describe;
import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.dao.vv.*;
import com.heyu.api.data.entity.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.R;
import com.heyu.api.data.utils.SanUtils; import com.heyu.api.data.utils.SanUtils;
import com.heyu.api.data.utils.StringUtils; import com.heyu.api.data.utils.StringUtils;
@ -63,9 +64,14 @@ public class AppReverseController {
@Describe("逆向订单创建") @Describe("逆向订单创建")
@RequestMapping("/add") @RequestMapping("/add")
public R add(@RequestBody AppliyReverseRequest appliyReverseRequest) { public R add(@RequestBody AppliyReverseRequest appliyReverseRequest) {
appliyReverseRequest.setStatus(ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree.getStatus()); // 退款类型 1 仅退款， 2 退款退货
appliyReverseRequest.setRefundReason("买家申请退款：" + appliyReverseRequest.getRefundReason()); 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<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = null; List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = null;
if(StringUtils.isNotEmpty(appliyReverseRequest.getTrackNumber())){ if(StringUtils.isNotEmpty(appliyReverseRequest.getTrackNumber())){
vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(appliyReverseRequest.getTrackNumber()); vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(appliyReverseRequest.getTrackNumber());
@ -127,8 +133,10 @@ public class AppReverseController {
@RequestMapping("/close") @RequestMapping("/close")
public R close(@RequestBody AppliyReverseCloseRequest appliyReverseRequest) { public R close(@RequestBody AppliyReverseCloseRequest appliyReverseRequest) {
VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(appliyReverseRequest.getReverseOrderId()); VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(appliyReverseRequest.getReverseOrderId());
if(!ReverseStatusEnums.buyer_apply_reverse_wait_seller_agree .getStatus().equals(vvReverseOrderEntity.getStatus()) if (
&& !ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvReverseOrderEntity.getStatus())) { !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,订单不允许关闭 "); return R.error("逆向订单状态非buyer_apply_reverse_wait_seller_agree 和 seller_agree_return_wait_buyer_post,订单不允许关闭 ");
} }
vvReverseOrderEntity.setStatus(ReverseStatusEnums.close.getStatus()); vvReverseOrderEntity.setStatus(ReverseStatusEnums.close.getStatus());