From 834c554dbb81d0ddcf2b9f32be01bd7d0c1745c0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 二月 2026 19:30:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java |   63 ++++++++++++++++---------------
 1 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
index 61b9f48..c683aad 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
@@ -59,19 +59,19 @@
 
     @PostMapping("/inner/appUserCoupon/getUserCoupon")
     public R<UserCouponVo> getUserCoupon(@RequestBody GetUserCouponDto dto) {
-        String phone ="18888888888";
-        if(dto.getUserId()>1){
-            UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(dto.getUserId().toString());
-            if(baseUserByUid!=null){
-                Object data = baseUserByUid.getData();
-                phone = JSONObject.parseObject(data.toString()).getString("mobile");
-            }
-        }
+//        String phone ="18888888888";
+//        if(dto.getUserId()>1){
+//            UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(dto.getUserId().toString());
+//            if(baseUserByUid!=null){
+//                Object data = baseUserByUid.getData();
+//                phone = JSONObject.parseObject(data.toString()).getString("mobile");
+//            }
+//        }
 
 
         UserCouponVo userCouponVo = new UserCouponVo();
         // 获取用户所有优惠券
-        List<XpAppUserCoupon> couponList = xpAppUserCouponService.list(new LambdaQueryWrapper<XpAppUserCoupon>().eq(XpAppUserCoupon::getStatus, 1).eq(XpAppUserCoupon::getPhone,phone).apply("FIND_IN_SET({0}, open_city_id)", dto.getOpenCityId()) );
+        List<XpAppUserCoupon> couponList = xpAppUserCouponService.list(new LambdaQueryWrapper<XpAppUserCoupon>().eq(XpAppUserCoupon::getStatus, 1).eq(XpAppUserCoupon::getAppUserId,dto.getUserId()).apply("FIND_IN_SET({0}, open_city_id)", dto.getOpenCityId()) );
         if(couponList.isEmpty()){
             return R.ok(userCouponVo);
         }
@@ -116,14 +116,14 @@
     public R<XpAppUserCouponVo> list(@RequestBody XpUserCouponListQuery query, HttpServletRequest request) {
         // uid已通过拦截器otp校验，可以直接使用
         String uid = request.getHeader("XP-Uid");
-        String phone ="18888888888";
-        UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(uid);
-        if(baseUserByUid!=null){
-            Object data = baseUserByUid.getData();
-            phone = JSONObject.parseObject(data.toString()).getString("mobile");
-        }
+//        String phone ="18888888888";
+//        UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(uid);
+//        if(baseUserByUid!=null){
+//            Object data = baseUserByUid.getData();
+//            phone = JSONObject.parseObject(data.toString()).getString("mobile");
+//        }
 
-        XpAppUserCouponVo vo = xpAppUserCouponService.userCouponList(query, phone);
+        XpAppUserCouponVo vo = xpAppUserCouponService.userCouponList(query, uid);
         return R.ok(vo);
     }
 
@@ -154,14 +154,14 @@
     public R<XpAppUserCouponListVo> detail(@PathVariable("couponId") Long couponId, HttpServletRequest request) {
         // uid已通过拦截器otp校验，可以直接使用
         String uid = request.getHeader("XP-Uid");
-        String phone ="18888888888";
-        UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(uid);
-        if(baseUserByUid!=null){
-            Object data = baseUserByUid.getData();
-            phone = JSONObject.parseObject(data.toString()).getString("mobile");
-        }
+//        String phone ="18888888888";
+//        UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(uid);
+//        if(baseUserByUid!=null){
+//            Object data = baseUserByUid.getData();
+//            phone = JSONObject.parseObject(data.toString()).getString("mobile");
+//        }
         XpAppUserCoupon coupon = xpAppUserCouponService.getById(couponId);
-        if(phone.equals(coupon.getPhone())){
+        if(uid.equals(coupon.getAppUserId().toString())){
             XpAppUserCouponListVo vo = new XpAppUserCouponListVo();
             vo.setCouponId(coupon.getId().toString());
             vo.setTitle(coupon.getCouponName());
@@ -189,13 +189,13 @@
     public R<XpAppUserCouponTotalVo> total(HttpServletRequest request) {
         // uid已通过拦截器otp校验，可以直接使用
         String uid = request.getHeader("XP-Uid");
-        String phone ="18888888888";
-        UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(uid);
-        if(baseUserByUid!=null){
-            Object data = baseUserByUid.getData();
-            phone = JSONObject.parseObject(data.toString()).getString("mobile");
-        }
-        XpAppUserCouponTotalVo vo = xpAppUserCouponService.userCouponTotal(phone);
+//        String phone ="18888888888";
+//        UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(uid);
+//        if(baseUserByUid!=null){
+//            Object data = baseUserByUid.getData();
+//            phone = JSONObject.parseObject(data.toString()).getString("mobile");
+//        }
+        XpAppUserCouponTotalVo vo = xpAppUserCouponService.userCouponTotal(uid);
         return R.ok(vo);
     }
 
@@ -206,7 +206,8 @@
     @PostMapping("/api/v1/appUserCoupon/send")
     @ApiOperation(value = "发放优惠券", tags = {"管理后台-发放优惠券"})
     public R<String> send(@RequestBody SendCouponDto dto) {
-        return xpAppUserCouponService.send(dto);
+        xpAppUserCouponService.send(dto);
+        return R.ok();
     }
 
 

--
Gitblit v1.7.1