From 1c24c6f5abd8b1178d8810753c26c324ab3b09e6 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Sat, 22 Nov 2025 10:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9E=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/data/service/impl/AppBaseRequest.java | 17 ++++++++++++--- .../service/impl/vv/VvPackageServiceImpl.java | 21 ++++++++++++------- .../vv/VvTradeOrderConvertServiceImpl.java | 9 +++++--- .../vv/VvTradeOrderConvertService.java | 6 +++++- .../controller/mm/AdminOrderController.java | 21 ++++++++++++++----- .../controller/mm/AdminReverseController.java | 1 + .../api/controller/vv/AppOrderController.java | 19 ++++++++++------- .../controller/vv/AppReverseController.java | 6 ++++-- .../delay/handler/DeliveredHandler.java | 1 + 9 files changed, 72 insertions(+), 29 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/AppBaseRequest.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/AppBaseRequest.java index 282dd8b..e993d49 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/AppBaseRequest.java +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/AppBaseRequest.java @@ -10,19 +10,30 @@ public class AppBaseRequest { /*** * token */ - private Integer pageNum = 1 ; + private Integer pageNum = 1; /*** * token */ - private Integer pageSize = 10 ; + private Integer pageSize = 10; /*** * token */ private String token; + private String buyerName; + + + public String getBuyerName() { + return buyerName; + } + + public void setBuyerName(String buyerName) { + this.buyerName = buyerName; + } + public String getToken() { return token; } @@ -34,7 +45,7 @@ public class AppBaseRequest { /*** * 买家id，当前登录的买家id */ - private Long buyerId ; + private Long buyerId; public Long getBuyerId() { return buyerId; diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java index 36ff7ca..a62188c 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java @@ -116,7 +116,7 @@ public class VvPackageServiceImpl extends ServiceImpl vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvReverseOrderEntity.getId()); - List tradeOrderLineIdList = SanUtils.getFieldList(vvReverseOrderLineEntities, VvReverseOrderLineEntity::getTradeOrderLineId); if (CollectionUtils.isNotEmpty(tradeOrderLineIdList)) { @@ -203,10 +204,14 @@ public class VvPackageServiceImpl extends ServiceImpl tradeOrderLineIdList, Object status, String changeStatusUser, String... reason) { + public int addOrderLineStatusLogList(List tradeOrderLineIdList, + Object status, + Long changeStatusUserId,String changeStatusUser, String... reason) { for (Long tradeOrderLineId : tradeOrderLineIdList) { - addOrderLineStatusLog(tradeOrderLineId, status, changeStatusUser, reason); + addOrderLineStatusLog(tradeOrderLineId, status,changeStatusUserId, changeStatusUser, reason); } return tradeOrderLineIdList.size(); } @Override - public int addOrderLineStatusLog(Long tradeOrderLineId, Object status, String changeStatusUser, String ... reason) { + public int addOrderLineStatusLog(Long tradeOrderLineId, Object status + ,Long changeStatusUserId,String changeStatusUser, String ... reason) { VvTradeOrderLineStatusLogEntity entity = new VvTradeOrderLineStatusLogEntity(); entity.setTradeOrderLineId(tradeOrderLineId); if (status instanceof OrderStatusEnums) { diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderConvertService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderConvertService.java index 9807657..f4b2ce9 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderConvertService.java +++ b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderConvertService.java @@ -13,12 +13,16 @@ public interface VvTradeOrderConvertService { List list, boolean isApp); - public int addOrderLineStatusLogList(List tradeOrderLineId, Object status, String changeStatusUser, String... reason); + public int addOrderLineStatusLogList(List tradeOrderLineId, Object status, + Long changeUserId , + String changeStatusUser, String... reason); int addOrderLineStatusLog(Long tradeOrderLineId, Object status, + Long changeStatusUserId, String changeStatusUser, + String... reason ); 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 cd4635f..ee1aa84 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 @@ -250,12 +250,16 @@ public class AdminOrderController { vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity); - vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.admin.getRole(), false); + try { + vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.admin.getRole(), false); - VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber()); + VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber()); - // 创建订阅 - KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(), vvTradeOrderLineEntityList.get(0).getBuyerPhone()); + // 创建订阅 + KuaiDi100Utils.subscribe(vvPackageEntityNew.getCom(), vvPackageEntityNew.getTrackNumber(), vvTradeOrderLineEntityList.get(0).getBuyerPhone()); + } catch (Exception e) { + log.error("AdminOrderController subscribe KuaiDi100 Utils.subscribe error", e); + } for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { tradeOrderLineEntity.setTrackNumber(vvOrderRequest.getTrackNumber()); @@ -263,9 +267,12 @@ public class AdminOrderController { tradeOrderLineEntity.setGmtToShipping(new Date()); tradeOrderLineEntity.setSellerId(vvOrderRequest.getSellerId()); + vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); - vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), + vvTradeOrderConvertService.addOrderLineStatusLog( + tradeOrderLineEntity.getId(), OrderStatusEnums.shipping, + vvOrderRequest.getAdminId(), vvOrderRequest.getUserName()); } return R.ok(); @@ -295,6 +302,7 @@ public class AdminOrderController { vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), OrderStatusEnums.wait_shipping, + vvOrderRequest.getAdminId(), vvOrderRequest.getUserName(), vvOrderRequest.getReason() ); @@ -324,6 +332,7 @@ public class AdminOrderController { vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), OrderStatusEnums.shipped, + vvDeliveredDTO.getAdminId(), vvDeliveredDTO.getUserName() ); } @@ -375,6 +384,7 @@ public class AdminOrderController { vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), OrderStatusEnums.delivered, + vvDeliveredDTO.getAdminId(), vvDeliveredDTO.getUserName() ); } @@ -422,6 +432,7 @@ public class AdminOrderController { vvTradeOrderConvertService.addOrderLineStatusLog( vvTradeOrderLineEntity.getId(), OrderStatusEnums.cancel, + vvCancelDTO.getAdminId(), vvCancelDTO.getUserName(), vvCancelDTO.getReason() ); 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 d3bd360..4313b6c 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 @@ -196,6 +196,7 @@ public class AdminReverseController { vvTradeOrderConvertService.addOrderLineStatusLog( vvTradeOrderLineEntity.getId(), targetStatus, + vvApproveRequest.getAdminId(), vvApproveRequest.getUserName(), vvApproveRequest.getReason(), JSON.toJSONString(vvApproveRequest.getResources()) diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index 61f3adb..0ac5099 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -251,7 +251,7 @@ public class AppOrderController { VvShoppingCartEntity vvShoppingCart = vvShoppingCartDao.selectVvShoppingCartById(shoppingCartId); String shippingActivityInfo = vvShoppingCart.getActivityInfo(); VvActivityDTO vvActivityDTOShipping = JSONObject.parseObject(shippingActivityInfo, VvActivityDTO.class); - vvActivityDTO = ActivityUtils.bestActivityDTO(vvActivityDTO,vvActivityDTOShipping); + vvActivityDTO = ActivityUtils.bestActivityDTO(vvActivityDTO, vvActivityDTOShipping); } Map vvSkuPropertyValueItemMap = SanUtils.groupByFiled2Map(vvSkuPropertyValueEntities, VvSkuPropertyValueEntity::getProductPropertyName); // 对商品属性进行排序 @@ -350,7 +350,7 @@ public class AppOrderController { } vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity); } - + List vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId()); @@ -441,7 +441,8 @@ public class AppOrderController { vvTradeOrderConvertService.addOrderLineStatusLog( vvTradeOrderLineEntity.getId(), OrderStatusEnums.delete, - vvOrderRequest.getBuyerId() + "" + vvOrderRequest.getBuyerId(), + vvOrderRequest.getBuyerName() ); } } @@ -468,7 +469,8 @@ public class AppOrderController { for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { vvTradeOrderConvertService.addOrderLineStatusLog(vvTradeOrderLineEntity.getId(), ReverseStatusEnums.buyer_apply_cancel, - request.getBuyerId() + "" + request.getBuyerId(), + request.getBuyerName() , request.getReason() ); } @@ -494,7 +496,8 @@ public class AppOrderController { vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), OrderStatusEnums.shipped, - request.getBuyerId() + "" + request.getBuyerId(), + request.getBuyerName() + "" ); } return R.ok(); @@ -527,7 +530,8 @@ public class AppOrderController { vvTradeOrderConvertService.addOrderLineStatusLog( tradeOrderLineEntity.getId(), OrderStatusEnums.delivered, - vvDeliveredDTO.getBuyerId() + "" + vvDeliveredDTO.getBuyerId(), + vvDeliveredDTO.getBuyerName() ); } return R.ok(); @@ -555,7 +559,8 @@ public class AppOrderController { vvTradeOrderConvertService.addOrderLineStatusLog( tradeOrderLineEntity.getId(), OrderStatusEnums.close, - appCloseDTO.getBuyerId() + "", + appCloseDTO.getBuyerId(), + appCloseDTO.getBuyerName(), appCloseDTO.getReason() ); } 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 5432c57..f28a872 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 @@ -146,7 +146,8 @@ public class AppReverseController { vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), OrderStatusEnums.shipping, - appliyReverseRequest.getBuyerId() + "" + appliyReverseRequest.getBuyerId(), + appliyReverseRequest.getBuyerName() ); } return R.ok(); @@ -180,7 +181,8 @@ public class AppReverseController { vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), ReverseStatusEnums.close.getStatus(), - request.getBuyerId() + "" + request.getBuyerId() , + request.getBuyerName() ); } return R.ok("逆向订单关闭成功"); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java b/api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java index 8f5b467..a8ba50c 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java @@ -58,6 +58,7 @@ public class DeliveredHandler extends BaseDelayedHandler { vvTradeOrderConvertService.addOrderLineStatusLog(vvTradeOrderLineEntity.getId(), OrderStatusEnums.delivered, + -1L, RoleEnums.system.getRole() );