From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
index 606861f..296a8dd 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
@@ -26,10 +26,12 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.stream.Collectors;
/**
* <p>
@@ -80,7 +82,8 @@
}
String personIds = byId.getPersonIds();
if (StringUtils.isNotEmpty(personIds)){
- List<AppUser> appUserList = appUserClient.listByIds(Arrays.asList(personIds.split(",")));
+ List<Long> ids = Arrays.stream(personIds.split(",")).map(Long::valueOf).collect(Collectors.toList());
+ List<AppUser> appUserList = appUserClient.listByIds(ids);
byId.setAppUserList(appUserList);
}
@@ -124,6 +127,7 @@
couponInfo.setShelfStatus(0);
List<String> goodsNameList = couponInfo.getGoodsNameList();
couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
+ couponInfo.setShelfStatus(1);
couponInfoService.save(couponInfo);
return R.ok();
}
@@ -184,6 +188,7 @@
@GetMapping("/getReceiveRecord")
public R<IPage<UserCoupon>> getReceiveRecord(@ApiParam("页码") @RequestParam Integer pageNum, @ApiParam("大小") Integer pageSize,UserCoupon userCoupon) {
+ // TODO 待完善
return null;
}
--
Gitblit v1.7.1