From ba9ef05cd70283e7e45c3098e6adebf148075cb3 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期四, 25 九月 2025 18:17:54 +0800 Subject: [PATCH] 订单 --- framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index aab361d..d4b4f06 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -1685,8 +1685,19 @@ orderExportDetailDTO.setPaymentMethod(CharSequenceUtil.isNotBlank(orderExportDTO.getPaymentMethod()) ? PaymentMethodEnum.valueOf(orderExportDTO.getPaymentMethod()).paymentName() : ""); orderExportDetailDTO.setClientType(ClientTypeEnum.valueOf(orderExportDTO.getClientType()).value()); orderExportDetailDTO.setOrderType(orderExportDTO.getOrderType().equals(OrderTypeEnum.NORMAL.name()) ? "鏅�氳鍗�" : "铏氭嫙璁㈠崟"); - orderExportDetailDTO.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.valueOf(orderExportDTO.getAfterSaleStatus()).description()); + String afterSaleStatus = orderExportDTO.getAfterSaleStatus(); + if (StringUtils.isNotBlank(afterSaleStatus)) { + try { + orderExportDetailDTO.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.valueOf(afterSaleStatus).description()); + } catch (IllegalArgumentException e) { + // 澶勭悊鏋氫妇鍊间笉瀛樺湪鐨勬儏鍐� + orderExportDetailDTO.setAfterSaleStatus("鏈煡鐘舵��"); + } + } else { + // 璁剧疆榛樿鍊兼垨绌哄瓧绗︿覆 + orderExportDetailDTO.setAfterSaleStatus("鏃犲敭鍚庣姸鎬�"); + } //鏃堕棿 orderExportDetailDTO.setCreateTime(DateUtil.formatDateTime(orderExportDTO.getCreateTime())); orderExportDetailDTO.setPaymentTime(DateUtil.formatDateTime(orderExportDTO.getPaymentTime())); -- Gitblit v1.8.0