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 21:36:17 +08:00
parent 9f170063ec
commit b1091f24c5
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,7 @@ private static final long serialVersionUID = 1L;
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"; // 订单关闭原因
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -145,6 +146,8 @@ private static final long serialVersionUID = 1L;
private String sellerAgreeReturnUser;
//买家申请退款的买家
private String buyerApplyRefundUser;
//订单关闭原因
private String closeReason;
/**
*
* @return
@ -760,6 +763,21 @@ private static final long serialVersionUID = 1L;
this.buyerApplyRefundUser = buyerApplyRefundUser;
}
/**
* 订单关闭原因
* @return
*/
public String getCloseReason() {
return closeReason;
}
/**
* 订单关闭原因
* @param closeReason
*/
public void setCloseReason(String closeReason) {
this.closeReason = closeReason;
}
@Override
public String toString() {
return "VvReverseOrderEntity{" +
@ -804,6 +822,7 @@ private static final long serialVersionUID = 1L;
",buyerPostUser=" + buyerPostUser +
",sellerAgreeReturnUser=" + sellerAgreeReturnUser +
",buyerApplyRefundUser=" + buyerApplyRefundUser +
",closeReason=" + closeReason +
"}";
}
}

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

@ -7,15 +7,13 @@ import lombok.Data;
@Data
public class AppliyReverseCloseRequest extends AppBaseRequest {
/***
* 逆向物流单号
* 逆向订单id
*/
private Long reverseOrderId;
//订单关闭原因
private String closeReason;
}

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

@ -76,12 +76,11 @@ public class AppReverseController {
R r = reverseOrderService.createReverseOrder(vvTradeOrderLineEntityList, appliyReverseRequest);
if (r.ifSuccessful()) {
VvReverseOrderEntity vvReverseOrderEntity = (VvReverseOrderEntity) r.getData();
vvReverseOrderEntity.setGmtBuyerPost(new Date());
vvReverseOrderEntity.setGmtBuyerApplyRefund(new Date());
vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity);
}
return R.ok();
}
/**
* 退货退款 ： /app/reverse/tracknumber
*
@ -91,8 +90,9 @@ public class AppReverseController {
public R uploadTracknumber(@RequestBody AppliyReverseProveRequest appliyReverseRequest) {
VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(appliyReverseRequest.getReverseOrderId());
if (!ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvReverseOrderEntity.getStatus())) {
return R.error("逆向订单状态不对");
return R.error("逆向订单状态非seller_agree_return_wait_buyer_post，不对");
}
vvReverseOrderEntity.setStatus(ReverseStatusEnums.shipping.getStatus());
vvReverseOrderEntity.setTrackNumber(appliyReverseRequest.getTrackNumber());
vvReverseOrderEntity.setGmtBuyerPost(new Date());
@ -110,7 +110,6 @@ public class AppReverseController {
vvReverseOrderProveDao.insertOrUpdateVvReverseOrderProve(vvReverseOrderProveEntity);
}
}
VvPackageEntity vvPackageEntity = new VvPackageEntity();
vvPackageEntity.setPackageImageUrl(JSON.toJSONString(packageImageUrls));
vvPackageEntity.setShippingAmount(BigDecimal.ZERO);
@ -120,24 +119,29 @@ public class AppReverseController {
return R.ok();
}
/**
* 逆向订单关闭 ： /app/reverse/close
*
*/
@Describe("逆向订单关闭")
@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())) {
return R.error("逆向订单状态非buyer_apply_reverse_wait_seller_agree 和 seller_agree_return_wait_buyer_post,订单不允许关闭 ");
}
vvReverseOrderEntity.setStatus(ReverseStatusEnums.close.getStatus());
vvReverseOrderEntity.setGmtClose(new Date());
vvReverseOrderEntity.setCloseReason(appliyReverseRequest.getCloseReason());
vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity);
List<VvReverseOrderLineEntity> vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(appliyReverseRequest.getReverseOrderId());
List<Long> tradeOrderLineIds = SanUtils.list2list(vvReverseOrderLineEntities, VvReverseOrderLineEntity::getTradeOrderLineId);
List<VvTradeOrderLineEntity> tradeOrderLineEntities = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(tradeOrderLineIds);
for (VvTradeOrderLineEntity tradeOrderLineEntity : tradeOrderLineEntities) {
tradeOrderLineEntity.setReverseStatus(ReverseStatusEnums.close.getStatus());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
}
return R.ok();
return R.ok("逆向订单关闭成功");
}
}