12.18

luodangjia

2025-01-26 d9d9180f242bc1516803e606c34c89ecadf20ab4

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -958,17 +958,26 @@
                String cityCode = row.getCell(12).getStringCellValue();
                Order order = this.getOne(new LambdaQueryWrapper<Order>()
                        .eq(Order::getOrderNumber, orderNum)
                        .eq(Order::getOrderType, 2)
                        .eq(Order::getDistributionMode,2)
                        .eq(Order::getOrderStatus, 1)
                );
                if (order == null){
                    throw new ServiceException("订单不存在："+orderNum, 500);
                }

                String companyNameByCode = ExpressCompanyMap.getCompanyNameByCode(expressName);
                Integer orderType = order.getOrderType();
                if (orderType != 2){
                    throw new ServiceException("该订单："+orderNum+"类型不为单品订单", 500);
                }
                if (order.getDistributionMode() != 2){
                    throw new ServiceException("该订单："+orderNum+"配送方式不为快递", 500);
                }
                Integer orderStatus = order.getOrderStatus();
                if (orderStatus != 1){
                    throw new ServiceException("该订单："+orderNum+"状态不为待发货", 500);
                }

                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);
@@ -982,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) {