12.18

luodangjia

2025-01-26 4b3b36140aacd09b8ebc489d11dd399168303316

 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);
    }



    /**
@@ -933,7 +940,7 @@
                String cityCode = row.getCell(12).getStringCellValue();
                Order order = this.getOne(new LambdaQueryWrapper<Order>()
                        .eq(Order::getOrderNumber, orderNum)
                        .eq(Order::getOrderType, 1)
                        .eq(Order::getOrderType, 2)
                        .eq(Order::getDistributionMode,2)
                        .eq(Order::getOrderStatus, 1)
                );