12.18

luodangjia

2025-01-26 d9d9180f242bc1516803e606c34c89ecadf20ab4

12.18

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ExpressCompanyMap.java

@@ -32,4 +32,16 @@
    public static String getCompanyNameByCode(String code) {
        return EXPRESS_COMPANY_MAP.get(code);
    }

    /**
     * 根据快递公司名称获取编码
     */
    public static String getCodeByCompanyName(String companyName) {
        for (Map.Entry<String, String> entry : EXPRESS_COMPANY_MAP.entrySet()) {
            if (entry.getValue().equals(companyName)) {
                return entry.getKey();
            }
        }
        return null;
    }
}

 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) {