irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

add more logging for 接单
Some checks failed
Build and Push Backend / docker (push) Failing after 6s
Details

Browse Source
This commit is contained in:
irving
2025-10-27 21:56:42 -04:00
parent e677ca3d33
commit 110e0d8e8c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
View File

@@ -864,14 +864,20 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
String previousStatus = orderInfo.getOrderStatus(); String previousStatus = orderInfo.getOrderStatus();
if (OrderStatus.COMPLETED.getCode().equals(previousStatus) if (OrderStatus.COMPLETED.getCode().equals(previousStatus)
|| OrderStatus.CANCELLED.getCode().equals(previousStatus)) { || OrderStatus.CANCELLED.getCode().equals(previousStatus)) {
log.warn("Order already finished, cannot accept. orderId={}, orderNo={}, operatorByType={}, acceptBy={}",
orderId, orderInfo.getOrderNo(), operatorByType, acceptBy);
throw new CustomException("订单已结束，无法接单"); throw new CustomException("订单已结束，无法接单");
} }
PlayClerkUserInfoEntity clerkUserInfoEntity = playClerkUserInfoService.selectById(acceptBy); PlayClerkUserInfoEntity clerkUserInfoEntity = playClerkUserInfoService.selectById(acceptBy);
if (isClerkOperator && StringUtils.isNotBlank(orderInfo.getAcceptBy()) if (isClerkOperator && StringUtils.isNotBlank(orderInfo.getAcceptBy())
&& !orderInfo.getAcceptBy().equals(acceptBy)) { && !orderInfo.getAcceptBy().equals(acceptBy)) {
log.warn("Order already accepted by another clerk. orderId={}, orderNo={}, currentAcceptBy={}, requestAcceptBy={}",
orderId, orderInfo.getOrderNo(), orderInfo.getAcceptBy(), acceptBy);
throw new CustomException("订单已被接单"); throw new CustomException("订单已被接单");
} }
if (isClerkOperator && !OrderStatus.PENDING.getCode().equals(previousStatus)) { if (isClerkOperator && !OrderStatus.PENDING.getCode().equals(previousStatus)) {
log.warn("Order status is not pending when clerk tries to accept. orderId={}, orderNo={}, status={}, acceptBy={}",
orderId, orderInfo.getOrderNo(), previousStatus, acceptBy);
throw new CustomException("订单已被接单"); throw new CustomException("订单已被接单");
} }
// 店员接单时，判断店员是否符合资格 // 店员接单时，判断店员是否符合资格
@@ -905,9 +911,12 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
int updated = this.baseMapper.update(entity, updateWrapper); int updated = this.baseMapper.update(entity, updateWrapper);
if (updated == 0) { if (updated == 0) {
if (isClerkOperator) { if (isClerkOperator) {
log.warn("Clerk failed to accept order due to concurrent update. orderId={}, orderNo={}, acceptBy={}",
orderId, orderInfo.getOrderNo(), acceptBy);
throw new CustomException("订单已被接单"); throw new CustomException("订单已被接单");
} }
log.warn("Failed to update order status to accepted for admin reassignment, orderId={}", orderId); log.warn("Failed to update order status to accepted for admin reassignment, orderId={}, orderNo={}",
orderId, orderInfo.getOrderNo());
return; return;
} }
@@ -917,6 +926,8 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
orderInfo.setOrderStatus(OrderStatus.ACCEPTED.getCode()); orderInfo.setOrderStatus(OrderStatus.ACCEPTED.getCode());
orderInfo.setEstimatedRevenue(revenueAmount); orderInfo.setEstimatedRevenue(revenueAmount);
orderInfo.setEstimatedRevenueRatio(estimatedRevenueVo.getRevenueRatio()); orderInfo.setEstimatedRevenueRatio(estimatedRevenueVo.getRevenueRatio());
log.info("Order accepted successfully. orderId={}, orderNo={}, acceptBy={}, operatorByType={}",
orderId, orderInfo.getOrderNo(), acceptBy, operatorByType);
wxCustomMpService.sendOrderMessageAsync(orderInfo); wxCustomMpService.sendOrderMessageAsync(orderInfo);
} }