From dd5bb9e27d2ac0a879ccb62df985d51ac9562198 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 19:43:53 +0800
Subject: [PATCH] 骑手到店上报、已取商品
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
index 78e2ea8..4065fe9 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
@@ -7,6 +7,7 @@
import com.oying.modules.pc.store.service.StoreService;
import com.oying.modules.rider.domain.RiderInfo;
import com.oying.modules.rider.domain.RiderOrderRecord;
+import com.oying.modules.rider.domain.vo.OrderRiderOperationVo;
import com.oying.modules.rider.service.RiderInfoService;
import com.oying.modules.rider.utils.Constants;
import com.oying.modules.sh.domain.vo.OrderResponse;
@@ -171,8 +172,8 @@
riderOrderRecord.setMerchantName(orderResponse.getOrder().getStoreName());
riderOrderRecord.setMerchantAddress(store.getAddress());
riderOrderRecord.setReceiverAddress(orderResponse.getAddress().getDetail());
- // 当前为接单 设置为待取货状态 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消
- riderOrderRecord.setOrderStatus(Constants.ORDER_STATUS_WAIT);
+ // 当前为接单 设置为待取货状态 0-已接单 1-已到店 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消
+ riderOrderRecord.setOrderStatus(Constants.ORDER_STATUS_OK);
riderOrderRecord.setAcceptTime(new Timestamp(System.currentTimeMillis()));
// 取单编号
riderOrderRecord.setAcceptNum(orderResponse.getOrder().getOrderStoreNum());
@@ -206,5 +207,14 @@
return null;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R riderOperationOrder(OrderRiderOperationVo orderRiderOperationVo){
+ // 判断骑手操作类型
+ // 添加订单操作记录
+ // 修改骑手端的订单状态
+ updateRiderOrderStatus(orderRiderOperationVo.getOrderNum(), Constants.ORDER_STATUS_StORE);
+ return R.success();
+ }
}
--
Gitblit v1.9.3