From 882c7841a1a2e6dddfd2a4c65619e8d89ea7d194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 2 Jul 2024 22:22:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E4=BA=BA=E4=BB=A3=E9=87=91=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coupon/controller/app/AppCouponUserController.java    | 7 +++++++
 src/main/java/com/sqx/modules/coupon/dao/CouponDao.java   | 2 ++
 src/main/java/com/sqx/modules/coupon/entity/Coupon.java   | 4 ++++
 .../com/sqx/modules/coupon/service/CouponUserService.java | 2 ++
 .../coupon/service/impl/CouponUserServiceImpl.java        | 7 +++++++
 src/main/resources/mapper/coupon/TbCouponMapper.xml       | 8 +++++++-
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java b/src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java
index 33ae787..303cb08 100644
--- a/src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java
+++ b/src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java
@@ -49,6 +49,13 @@ public class AppCouponUserController extends AbstractController {
         couponUserService.updateExpiration();
     }
 
+    @Login
+    @GetMapping("/selectNewUserCoupon")
+    @ApiOperation("获取新人优惠券")
+    public Result selectNewUserCoupon(@LoginUser UserEntity userEntity,Integer page,Integer limit){
+        return couponUserService.selectNewUserCoupon(page,limit);
+    }
+
     @Login
     @GetMapping("/insertNewUserCoupon")
     @ApiOperation("领取新人优惠券")
diff --git a/src/main/java/com/sqx/modules/coupon/dao/CouponDao.java b/src/main/java/com/sqx/modules/coupon/dao/CouponDao.java
index 60b7e80..c24708e 100644
--- a/src/main/java/com/sqx/modules/coupon/dao/CouponDao.java
+++ b/src/main/java/com/sqx/modules/coupon/dao/CouponDao.java
@@ -15,4 +15,6 @@ public interface CouponDao extends BaseMapper<Coupon> {
 
     List<Coupon> selectCouponList();
 
+    IPage<Coupon> selectNewerCouponPage(Page<Coupon> pages);
+
 }
diff --git a/src/main/java/com/sqx/modules/coupon/entity/Coupon.java b/src/main/java/com/sqx/modules/coupon/entity/Coupon.java
index 609f167..a9aec84 100644
--- a/src/main/java/com/sqx/modules/coupon/entity/Coupon.java
+++ b/src/main/java/com/sqx/modules/coupon/entity/Coupon.java
@@ -1,6 +1,7 @@
 package com.sqx.modules.coupon.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -46,5 +47,8 @@ public class Coupon implements Serializable {
     @ApiModelProperty("分类ID，0为通用，非0为具体分类ID")
     private Long classifyId;
 
+    @TableField(exist = false)
+    private String classifyName;
+
     public Coupon() {}
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/coupon/service/CouponUserService.java b/src/main/java/com/sqx/modules/coupon/service/CouponUserService.java
index 8fa2c2b..f311bff 100644
--- a/src/main/java/com/sqx/modules/coupon/service/CouponUserService.java
+++ b/src/main/java/com/sqx/modules/coupon/service/CouponUserService.java
@@ -19,6 +19,8 @@ public interface CouponUserService extends IService<CouponUser> {
 
     Result selectCouponByUserId(Integer page, Integer limit, String id, Long userId, Integer status, String phone,String couponName);
 
+    Result selectNewUserCoupon(Integer page,Integer limit);
+
     Result insertNewUserCoupon(UserEntity userEntity);
 
     CouponUser selectCountByUserId(Long userId);
diff --git a/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java b/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java
index ce7c4d3..849adf1 100644
--- a/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java
+++ b/src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java
@@ -99,6 +99,13 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
         return Result.success().put("data", pageUtils);
     }
 
+    @Override
+    public Result selectNewUserCoupon(Integer page,Integer limit){
+        Page<Coupon> pages=new Page<>(page,limit);
+        PageUtils pageUtils = new PageUtils(CouponDao.selectNewerCouponPage(pages));
+        return Result.success().put("data", pageUtils);
+    }
+
     @Override
     public Result insertNewUserCoupon(UserEntity userEntity){
         if(userEntity.getIsCoupon()!=null && userEntity.getIsCoupon()==1){
diff --git a/src/main/resources/mapper/coupon/TbCouponMapper.xml b/src/main/resources/mapper/coupon/TbCouponMapper.xml
index bc32a49..03091cb 100644
--- a/src/main/resources/mapper/coupon/TbCouponMapper.xml
+++ b/src/main/resources/mapper/coupon/TbCouponMapper.xml
@@ -14,6 +14,12 @@
         order by coupon_id desc
     </select>
 
-
+    <select id="selectNewerCouponPage" resultType="com.sqx.modules.coupon.entity.Coupon">
+        select t.*,d.value as classifyName
+        from coupon t
+        left join sys_dict d on t.classify_id = d.id
+        where t.cou_type = 1
+        order by coupon_id desc
+    </select>
 
 </mapper>
\ No newline at end of file