修改

puzhibing

2025-01-24 d2a399050ec3cf5367ff7e929f5080b7b7de152f

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

@@ -348,15 +348,22 @@
            orderPageListVo.setGetCommission(reduce);

            String expressJson = orderPageListVo.getExpressJson();
            // {"com":"zhongtong","num":"78853319672621"}
            JSONObject jsonObject = JSONObject.parseObject(expressJson);
            if (StringUtils.isNotEmpty(expressJson) && !expressJson.equals("NULL")){
                JSONObject jsonObject = null;
                try {
                    jsonObject = JSONObject.parseObject(expressJson);
                    String companyName = ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com"));
                    orderPageListVo.setExpressCompany(companyName);
                    orderPageListVo.setExpressNum(jsonObject.getString("num"));
                } catch (Exception e) {
                }

            String companyName = ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com"));
            orderPageListVo.setExpressCompany(companyName);
            orderPageListVo.setExpressNum(jsonObject.getString("num"));
            }

        }
        return pageInfo.setRecords(list);
    }
    


    /**
@@ -931,7 +938,12 @@
                String provinceCode = row.getCell(10).getStringCellValue();
                // 市区划代码
                String cityCode = row.getCell(12).getStringCellValue();
                Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, orderNum));
                Order order = this.getOne(new LambdaQueryWrapper<Order>()
                        .eq(Order::getOrderNumber, orderNum)
                        .eq(Order::getOrderType, 1)
                        .eq(Order::getDistributionMode,2)
                        .eq(Order::getOrderStatus, 1)
                );
                if (order != null){
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("com", expressName);
@@ -939,6 +951,7 @@
                    order.setExpressJson(jsonObject.toJSONString());
                    order.setDeliverProvinceCode(provinceCode);
                    order.setDeliverCityCode(cityCode);
                    order.setOrderStatus(2);
                    this.updateById(order);
                }
            }