From 4667d1e9ac2b01a6753eb8a87fb721051bf07ac4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 13:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/controller/TCouponController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 920f049..28ac072 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
@@ -15,6 +15,7 @@
import com.jilongda.manage.service.TAppUserService;
import com.jilongda.manage.service.TCouponReceiveService;
import com.jilongda.manage.service.TCouponService;
+import com.jilongda.manage.utils.OssUploadUtil;
import com.jilongda.manage.utils.QRCodeUtil;
import com.jilongda.manage.vo.TAppUserVO;
import com.jilongda.manage.vo.TCouponInfoVO;
@@ -72,6 +73,7 @@
@ApiOperation(value = "添加优惠券")
@PostMapping(value = "/add")
public ApiResult<String> add( @RequestBody TCoupon dto) throws Exception {
+ if (dto.getType()==1||dto.getType()==4)dto.setGrantStatus(1);
couponService.save(dto);
switch (dto.getType()){
case 2:
@@ -118,12 +120,21 @@
String code = "{\"id\": "+dto.getId()+ "}";
BufferedImage blueImage = QRCodeUtil.createImage(code);
MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
- // todo 没有云存储
-// String s = OssUploadUtil.ossUpload("img/", blueFile);
+ String s = OssUploadUtil.ossUpload("eyes/", blueFile);
+ dto.setQrCode(s);
+ couponService.updateById(dto);
break;
}
return ApiResult.success();
}
+ @ApiOperation(value = "暂停发放 只有type为1和4的时候")
+ @PostMapping(value = "/stop")
+ public ApiResult stop(Integer id) throws Exception {
+ TCoupon byId = couponService.getById(id);
+ byId.setGrantStatus(2);
+ couponService.updateById(byId);
+ return ApiResult.success();
+ }
@ApiOperation(value = "修改优惠券")
@PostMapping(value = "/update")
public ApiResult<String> update( @RequestBody TCoupon dto) throws Exception {
--
Gitblit v1.7.1