From d1632e46b772d691e55b4013585bfe61164b8bde Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 一月 2025 18:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/controller/TCouponController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
index c925cd1..e7715b0 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
@@ -93,6 +93,7 @@
}
tCouponReceive.setAmountCondition(dto.getAmountCondition());
tCouponReceive.setStatus(1);
+ tCouponReceive.setCouponName(dto.getName());
tCouponReceives.add(tCouponReceive);
}
couponReceiveService.saveBatch(tCouponReceives);
@@ -112,6 +113,7 @@
}
tCouponReceive.setAmountCondition(dto.getAmountCondition());
tCouponReceive.setStatus(1);
+ tCouponReceive.setCouponName(dto.getName());
tCouponReceives1.add(tCouponReceive);
}
couponReceiveService.saveBatch(tCouponReceives1);
@@ -123,7 +125,8 @@
String s = OssUploadUtil.ossUpload("eyes/", blueFile);
dto.setQrCode(s);
couponService.updateById(dto);
- break;
+ return ApiResult.success(s);
+
}
return ApiResult.success();
}
--
Gitblit v1.7.1