From e2d5c94d2e313523edfdc0335862b03fff7be8bd Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 17:16:43 +0800
Subject: [PATCH] 商家优惠劵领取
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponClaimRecordServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponClaimRecordServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponClaimRecordServiceImpl.java
index f759752..88e4c51 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponClaimRecordServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponClaimRecordServiceImpl.java
@@ -266,7 +266,7 @@
Row header = sheet.createRow(0);
String[] headers = {
"浼氬憳鍚嶇О", "浼樻儬鍒稿悕绉�", "鍙戝竷搴楅摵", "闈㈤/鎶樻墸",
- "鑾峰彇鏂瑰紡", "浼氬憳浼樻儬鍒哥姸鎬�", "浼樻儬鍒哥被鍨�",
+ "鑾峰彇鏂瑰紡", "浼氬憳浼樻儬鍒哥姸鎬�", "浼樻儬鍒哥被鍨�","璁㈠崟鐘舵��",
"浣跨敤璧峰鏃堕棿", "鎴鏃堕棿","棰嗗彇鏃堕棿"
};
for (int i = 0; i < headers.length; i++) {
@@ -355,9 +355,33 @@
}
row.createCell(6).setCellValue(couponTypeDesc);
-
+ //7.璁㈠崟鐘舵��
+ String orderStatusType = dto.getOrderStatus();
+ System.out.println(orderStatusType);
+ String orderStatusDesc;
+ if ("UNPAID".equals(orderStatusType)) {
+ orderStatusDesc = "鏈粯娆�";
+ } else if ("PAID".equals(orderStatusType)) {
+ orderStatusDesc = "宸蹭粯娆�";
+ }else if ("UNDELIVERED".equals(orderStatusType)) {
+ orderStatusDesc = "寰呭彂璐�";
+ }else if ("DELIVERED".equals(orderStatusType)) {
+ orderStatusDesc = "宸插彂璐�";
+ }else if ("COMPLETED".equals(orderStatusType)) {
+ orderStatusDesc = "宸插畬鎴�";
+ }else if ("STAY_PICKED_UP".equals(orderStatusType)) {
+ orderStatusDesc = "寰呰嚜鎻�";
+ }else if ("TAKE".equals(orderStatusType)) {
+ orderStatusDesc = "寰呮牳楠�";
+ }else if ("CANCELLED".equals(orderStatusType)) {
+ orderStatusDesc = "宸插叧闂�";
+ }else {
+ orderStatusDesc ="鏈煡";
+ }
+ Cell orderStatus = row.createCell(7);
+ orderStatus.setCellValue(orderStatusDesc);
// 10. 浣跨敤璧峰鏃堕棿锛堝鐞唍ull锛屾牸寮忓寲鏃堕棿锛�
- Cell startTimeCell = row.createCell(7);
+ Cell startTimeCell = row.createCell(8);
if (Objects.nonNull(dto.getStartTime())) {
startTimeCell.setCellValue(DateUtil.formatDateTime(dto.getStartTime()));
} else {
@@ -365,13 +389,13 @@
}
// 11. 鎴鏃堕棿锛堝悓涓婏級
- Cell endTimeCell = row.createCell(8);
+ Cell endTimeCell = row.createCell(9);
if (Objects.nonNull(dto.getEndTime())) {
endTimeCell.setCellValue(DateUtil.formatDateTime(dto.getEndTime()));
} else {
endTimeCell.setCellValue("");
}
- Cell claimTimeCell = row.createCell(9);
+ Cell claimTimeCell = row.createCell(10);
if (Objects.nonNull(dto.getClaimTime())) {
endTimeCell.setCellValue(DateUtil.formatDateTime(dto.getClaimTime()));
} else {
--
Gitblit v1.8.0