From a448d1716d59fbce1c2b4b82a95d339d5b37d8ae Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 10:18:25 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 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 123e8b0..4bcd4c1 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
@@ -105,8 +105,8 @@
                             goodNames.add(datum.getName());
                         }
                     }
-                    vo.setGoodNames(goodNames);
                 }
+                vo.setGoodNames(goodNames);
             }
 
             record.setCouponInfoVo(vo);
@@ -138,9 +138,10 @@
         Long appUserId = null;
         if (!StringUtils.isEmpty(phone)){
             AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
-                    .eq(AppUser::getPhone, phone));
-            appUserId = appUser1.getId();
-
+                    .like(AppUser::getPhone, phone));
+            if (appUser1 != null){
+                appUserId = appUser1.getId();
+            }
         }
 
         Page<UserCoupon> page = userCouponService.lambdaQuery()
@@ -373,5 +374,18 @@
         userCouponService.updateById(userCoupon);
         return R.ok();
     }
+
+
+    /**
+     * 编辑用户优惠券使用时间
+     * @param userCoupon
+     * @return
+     */
+    @PostMapping("/editReturnUse")
+    public R editReturnUse(@RequestBody UserCoupon userCoupon){
+        userCouponService.update(new LambdaUpdateWrapper<UserCoupon>().eq(UserCoupon::getId, userCoupon.getId())
+                .set(UserCoupon::getUseTime, userCoupon.getUseTime()));
+        return R.ok();
+    }
 }
 

--
Gitblit v1.7.1