ios

ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientOrderInfoController.java

@@ -59,6 +59,18 @@ public class ClientOrderInfoController extends BaseController
         }
     }
 
+    /**
+     * ios 恢复购买
+     */
+    @PostMapping("/rePay")
+    public AjaxResult rePayOrder(@RequestBody PaymentRequest request) {
+        try {
+            return orderInfoService.rePayOrder(request);
+        } catch (Exception e) {
+            return AjaxResult.error("支付失败: " + e.getMessage());
+        }
+    }
+
     /**
      * 支付回调
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientShopUserController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.ShopUser;
 import com.ruoyi.common.core.domain.entity.ShopUserResq;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.system.config.AliConfig;
@@ -17,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @RequestMapping("/client")
 @RestController
@@ -30,7 +32,8 @@ public class ClientShopUserController {
     private ShopUserService shopUserService;
     @Autowired
     private IShopUserService iShopUserService;
-
+    @Autowired
+    private RedisCache redisCache;
     /**
      * 获取验证码
      */
@@ -43,6 +46,25 @@ public class ClientShopUserController {
         return AjaxResult.error("发送验证码失败");
     }
 
+    // 注销账号接口
+    @PostMapping("/cancelUser")
+    public AjaxResult cancelUser(@RequestBody ShopUserResq param) {
+        Long userId = SecurityUtils.getUserId();
+        ShopUser shopUser = new ShopUser();
+        shopUser.setUserId(userId);
+        shopUser.setStatus(2L);
+        String code = redisCache.getCacheObject("sms_code:"+shopUser.getPhone());
+        if (param.getCode() != null) {
+            if (Objects.equals(code, param.getCode())) {
+                shopUserService.updateShopUserId(shopUser);
+                return AjaxResult.success();
+            }
+        }else {
+            return AjaxResult.error("验证码错误");
+        }
+        return AjaxResult.error("注销账号失败");
+    }
+
     /**
      * 登录方法
      *

ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java

@@ -62,12 +62,13 @@ public class IndexController extends BaseController {
         List<MusicInfo> list = recommendInfoService.findRecommendMusic();
 
         Long userId = SecurityUtils.getUserId();
-        for (MusicInfo musicInfo : list) {
-            Long musicId = musicInfo.getMusicId();
-            MusicInfo selectUserLikeMusic = musicService.selectUserLikeMusic(String.valueOf(musicId), userId);
-            musicInfo.setLike(selectUserLikeMusic.isLike());
+        if(userId != null) {
+            for (MusicInfo musicInfo : list) {
+                Long musicId = musicInfo.getMusicId();
+                MusicInfo selectUserLikeMusic = musicService.selectUserLikeMusic(String.valueOf(musicId), userId);
+                musicInfo.setLike(selectUserLikeMusic.isLike());
+            }
         }
-
         return getDataTableData(list);
     }
 

ruoyi-admin/src/main/resources/application.yml

@@ -67,21 +67,21 @@ spring:
       enabled: true
   # redis 配置
   redis:
-    host: 116.204.124.80
-    # 端口，默认为6379
-    port: 16379
-    # 数据库索引
-    database: 0
-    # 密码
-    password: Lwz19520416443@
-#    # 地址
-#    host: 127.0.0.1
+#    host: 116.204.124.80
 #    # 端口，默认为6379
-#    port: 6379
+#    port: 16379
 #    # 数据库索引
 #    database: 0
 #    # 密码
-#    password:
+#    password: Lwz19520416443@
+    # 地址
+    host: 127.0.0.1
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # 密码
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce: