From f2c9e372fcea53d5717095b58917f092f64840f2 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 13 十二月 2024 13:54:15 +0800
Subject: [PATCH] 1.后台管理-评论 2.后台管理-门店特殊价
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java | 9 +++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 7 ++++++-
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
index 88c6de2..18a0e1d 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
@@ -69,5 +69,14 @@
private Integer status;
+ @ApiModelProperty(value = "领取用户姓名")
+ @TableField(exist = false)
+ private String userName;
+
+ @ApiModelProperty(value = "领取用户手机号")
+ @TableField(exist = false)
+ private String phone;
+
+
}
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 f3a4385..58f9b98 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
@@ -59,7 +59,7 @@
@GetMapping("/mine/list")
- @ApiOperation(value = "已领取列表", tags = {"小程序-个人中心-优惠劵"})
+ @ApiOperation(value = "已领取列表", tags = {"小程序-个人中心-优惠劵","后台管理-活动管理-优惠券管理"})
public R<Page<UserCoupon>> minelist(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status) {
Long userid = tokenService.getLoginUserApplet().getUserid();
Page<UserCoupon> page = userCouponService.lambdaQuery()
@@ -99,6 +99,11 @@
}else {
record.setStatus(2);
}
+
+
+ AppUser appUser = appUserService.getById(record.getAppUserId());
+ record.setUserName(appUser.getName());
+ record.setPhone(appUser.getPhone());
}
return R.ok(page);
}
--
Gitblit v1.7.1