From d9d9180f242bc1516803e606c34c89ecadf20ab4 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 15:26:04 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 da4e94d..3749999 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
@@ -975,9 +975,9 @@
throw new ServiceException("该订单："+orderNum+"状态不为待发货", 500);
}
- String companyNameByCode = ExpressCompanyMap.getCompanyNameByCode(expressName);
+ String companyNameByCode = ExpressCompanyMap.getCodeByCompanyName(expressName);
if(StringUtils.isEmpty(companyNameByCode)){
- throw new ServiceException("快递公司编码错误："+expressName, 500);
+ throw new ServiceException("快递公司名称错误："+expressName, 500);
}
R<Region> regionBiCode = regionClient.getRegionBiCode(provinceCode);
@@ -991,11 +991,14 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("com", expressName);
jsonObject.put("num", expressNum);
- order.setExpressJson(jsonObject.toJSONString());
- order.setDeliverProvinceCode(provinceCode);
- order.setDeliverCityCode(cityCode);
- order.setOrderStatus(2);
- this.updateById(order);
+ ConfirmDelivery confirmDelivery =new ConfirmDelivery();
+ confirmDelivery.setOrderId(order.getId());
+ confirmDelivery.setCode(jsonObject.toJSONString());
+ confirmDelivery.setDeliverProvince(regionBiCode.getData().getName());
+ confirmDelivery.setDeliverProvinceCode(regionBiCode.getData().getCode());
+ confirmDelivery.setDeliverCity(regionBiCode1.getData().getName());
+ confirmDelivery.setDeliverCityCode(regionBiCode1.getData().getCode());
+ confirmDelivery(confirmDelivery);
}
} catch (IOException e) {
--
Gitblit v1.7.1