From c736ea2df1516ba9f0674aac019fb1ab51038d5c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 16:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 552417f..6274b40 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -373,8 +373,8 @@
* @return
*/
@Override
- public R confirmDelivery(Long orderId, String code) {
- Order order = this.getById(orderId);
+ public R confirmDelivery(ConfirmDelivery confirmDelivery) {
+ Order order = this.getById(confirmDelivery.getOrderId());
if(1 == order.getPayStatus()){
return R.fail("订单还未完成支付");
}
@@ -385,7 +385,13 @@
return R.fail("无效的操作");
}
//添加快递号和修改订单状态
- order.setExpressJson(code);
+ order.setExpressJson(confirmDelivery.getCode());
+ order.setDeliverProvince(confirmDelivery.getDeliverProvince());
+ order.setDeliverProvinceCode(confirmDelivery.getDeliverProvinceCode());
+ order.setDeliverCity(confirmDelivery.getDeliverCity());
+ order.setDeliverCityCode(confirmDelivery.getDeliverCityCode());
+ order.setDeliverDistrict(confirmDelivery.getDeliverDistrict());
+ order.setDeliverDistrictCode(confirmDelivery.getDeliverDistrictCode());
order.setOrderStatus(2);
//添加查询快递信息队列
//一小时后定时查询快递信息
@@ -394,7 +400,7 @@
Integer waitTime = jsonObject.getInteger("waitTime");
redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
- JSONObject jsonObject1 = JSON.parseObject(code);
+ JSONObject jsonObject1 = JSON.parseObject(confirmDelivery.getCode());
String com = jsonObject1.getString("com");
String num = jsonObject1.getString("num");
UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
--
Gitblit v1.7.1