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-17 23:56:17 +08:00
parent 3d1dded608
commit 2765fce9f1
3 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api-third/src/main/java/com/heyu/api/service/impl/order/CloseAction.java
View File

@ -13,8 +13,9 @@ public class CloseAction extends AbstractOrderAction {
OrderStatusEnums.wait_pay.getStatus().equals(vvTradeOrderLineEntity.getStatus()) OrderStatusEnums.wait_pay.getStatus().equals(vvTradeOrderLineEntity.getStatus())
|| OrderStatusEnums.create.getStatus().equals(vvTradeOrderLineEntity.getStatus()) || OrderStatusEnums.create.getStatus().equals(vvTradeOrderLineEntity.getStatus())
) { ) {
if (isApp) {
return OrderActionEnums.App_Close; return OrderActionEnums.App_Close;
}
} }
return null; return null;

3
api-third/src/main/java/com/heyu/api/service/impl/order/DeliveredAction.java
View File

@ -12,8 +12,7 @@ public class DeliveredAction extends AbstractOrderAction {
if ( if (
OrderStatusEnums.shipped.getStatus().equals(vvTradeOrderLineEntity.getStatus()) OrderStatusEnums.shipped.getStatus().equals(vvTradeOrderLineEntity.getStatus())
) { ) {
if (isApp) {
if(isApp){
return OrderActionEnums.App_Delivered; return OrderActionEnums.App_Delivered;
} }
return OrderActionEnums.Admin_Delivered; return OrderActionEnums.Admin_Delivered;

30
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
View File

@ -19,6 +19,7 @@ import com.heyu.api.jsapi.dto.pay.DirectAPIv3JsapiPrepayResponse;
import com.heyu.api.jsapi.dto.pay.WxPayVO; import com.heyu.api.jsapi.dto.pay.WxPayVO;
import com.heyu.api.service.ReverseOrderService; import com.heyu.api.service.ReverseOrderService;
import com.heyu.api.service.VvTradeOrderConvertService; import com.heyu.api.service.VvTradeOrderConvertService;
import com.heyu.api.service.impl.AbstractOrderAction;
import com.heyu.api.utils.ISelect; import com.heyu.api.utils.ISelect;
import com.heyu.api.utils.PPageUtils; import com.heyu.api.utils.PPageUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -366,18 +367,7 @@ public class AppOrderController {
} }
if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) { if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) {
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
if ( if (AbstractOrderAction.checkFailed(vvTradeOrderLineEntity, true, OrderActionEnums.App_Delete)) {
!OrderStatusEnums.create.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.wait_pay.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.close.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.cancel.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.shipped.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.reject_sign_receipt.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.package_return.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.package_seller_sign_receipt.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.delivered.getStatus().equals(vvTradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.refund.getStatus().equals(vvTradeOrderLineEntity.getStatus())
) {
return R.error("包裹状态 ：" + vvTradeOrderLineEntity.getStatus() + "，不符合状态。"); return R.error("包裹状态 ：" + vvTradeOrderLineEntity.getStatus() + "，不符合状态。");
} }
} }
@ -400,7 +390,7 @@ public class AppOrderController {
public R applyCancel(@RequestBody VvTradeOrderCancelDTO request) { public R applyCancel(@RequestBody VvTradeOrderCancelDTO request) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId()); List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId());
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (!OrderStatusEnums.wait_shipping.getStatus().equals(vvTradeOrderLineEntity.getStatus())) { if (AbstractOrderAction.checkFailed(vvTradeOrderLineEntity, true, OrderActionEnums.App_Apply_Cancel)) {
return R.error("订单状态不是wait_shipping，不能取消订单"); return R.error("订单状态不是wait_shipping，不能取消订单");
} }
} }
@ -427,11 +417,10 @@ public class AppOrderController {
public R shipped(@RequestBody VvTradeOrderShippedDTO request) { public R shipped(@RequestBody VvTradeOrderShippedDTO request) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(request.getTrackNumber()); List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(request.getTrackNumber());
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (!OrderStatusEnums.shipped.getStatus().equals(tradeOrderLineEntity.getStatus())) { if (AbstractOrderAction.checkFailed(tradeOrderLineEntity, true, OrderActionEnums.App_Shipped)) {
return R.error("订单状态不对"); return R.error("订单状态不对");
} }
} }
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setStatus(OrderStatusEnums.shipped.getStatus()); tradeOrderLineEntity.setStatus(OrderStatusEnums.shipped.getStatus());
tradeOrderLineEntity.setGmtDelivered(new Date()); tradeOrderLineEntity.setGmtDelivered(new Date());
@ -457,11 +446,9 @@ public class AppOrderController {
vvDeliveredDTO.getTrackNumber(), vvDeliveredDTO.getTrackNumber(),
vvDeliveredDTO.getBuyerId() vvDeliveredDTO.getBuyerId()
); );
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if ( if (AbstractOrderAction.checkFailed(tradeOrderLineEntity, true, OrderActionEnums.App_Delivered)) {
!OrderStatusEnums.shipped.getStatus().equals(tradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.shipping.getStatus().equals(tradeOrderLineEntity.getStatus())
) {
return R.error("订单状态不对,status:" + tradeOrderLineEntity.getStatus()); return R.error("订单状态不对,status:" + tradeOrderLineEntity.getStatus());
} }
} }
@ -489,10 +476,7 @@ public class AppOrderController {
public R close(@RequestBody AppCloseDTO appCloseDTO) { public R close(@RequestBody AppCloseDTO appCloseDTO) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(appCloseDTO.getTradeOrderId()); List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(appCloseDTO.getTradeOrderId());
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if ( if (AbstractOrderAction.checkFailed(tradeOrderLineEntity, true, OrderActionEnums.App_Close)) {
!OrderStatusEnums.create.getStatus().equals(tradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.wait_pay.getStatus().equals(tradeOrderLineEntity.getStatus())
) {
return R.error("订单状态不对,当前状态：" + tradeOrderLineEntity.getStatus()); return R.error("订单状态不对,当前状态：" + tradeOrderLineEntity.getStatus());
} }
} }