From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index c88dd4f..6dfc084 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -98,7 +98,9 @@
List<Goods> data1 = goodsClient.getAllGoods().getData();
List<String> collect = data1.stream().map(Goods::getName).collect(Collectors.toList());
goodNames.addAll(collect);
- }else{
+ }else if(StringUtils.isEmpty(data.getForGoodIds())){
+ goodNames.addAll(JSON.parseArray(data.getGoodsNameJson(), String.class));
+ }else {
String[] split = vo.getForGoodIds().split(",");
R<List<Goods>> goodsById = goodsClient.getGoodsById(split);
if (goodsById.getData()!=null){
@@ -132,24 +134,34 @@
@ApiOperation(value = "已领取列表", tags = {"管理后台-优惠劵"})
public R<Page<UserCoupon>> list1(@RequestParam Integer pageNum,
@RequestParam Integer pageSize,
+ String userName,
@ApiParam("1未使用2已使用3已过期") Integer status,
String phone,
Integer id) {
- List<Long> appUserIds = null;
- if (!StringUtils.isEmpty(phone)){
- List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
- .like(AppUser::getPhone, phone));
- if (!CollectionUtils.isEmpty(appUserList)){
- appUserIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList());
- }
+ LambdaQueryWrapper<AppUser> queryWrapper = new LambdaQueryWrapper<>();
+
+ if (!StringUtils.isEmpty(phone)) {
+ queryWrapper.like(AppUser::getPhone, phone);
}
+ if (!StringUtils.isEmpty(userName)) {
+ queryWrapper.like(AppUser::getName, userName);
+ }
+
+ List<AppUser> appUserList = appUserService.list(queryWrapper);
+
+ if (CollectionUtils.isEmpty(appUserList)) {
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+
+ List<Long> appUserIds = appUserList.stream().map(AppUser::getId).distinct().collect(Collectors.toList());
+
Page<UserCoupon> page = userCouponService.lambdaQuery()
.isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
.isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
.eq(UserCoupon::getCouponId, id)
- .in(appUserIds != null,UserCoupon::getAppUserId, appUserIds)
+ .in(!CollectionUtils.isEmpty(appUserIds),UserCoupon::getAppUserId, appUserIds)
.lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
record.setIdStr(record.getId().toString());
@@ -231,15 +243,17 @@
byId.setLavePoint(byId.getLavePoint() - point);
appUserService.updateById(byId);
- UserPoint userPoint = new UserPoint();
- userPoint.setType(11);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(point);
- userPoint.setBalance(byId.getLavePoint());
- userPoint.setAppUserId(userid);
- userPoint.setObjectId(Long.valueOf(data.getId()));
- userPoint.setCreateTime(LocalDateTime.now());
- userPointService.save(userPoint);
+ if(point > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(15);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(point);
+ userPoint.setBalance(byId.getLavePoint());
+ userPoint.setAppUserId(userid);
+ userPoint.setObjectId(Long.valueOf(data.getId()));
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPointService.save(userPoint);
+ }
}
//增加优惠券记录,根据时间类型设置开始结束时间
UserCoupon userCoupon = new UserCoupon();
--
Gitblit v1.7.1