From 7a4fec4da46eeb4f00fc4d21aded329c93834e9f Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 26 十一月 2024 18:13:08 +0800
Subject: [PATCH] 1.完成技师预约接口开发
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 10 ++++++----
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/PhoneType.java | 10 +++-------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
index e6c1e7f..5cc846e 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -4,6 +4,7 @@
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.service.BalanceChangeRecordService;
import com.ruoyi.account.vo.WalletVO;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
@Api("钱包")
@RestController
@@ -27,11 +29,11 @@
*/
@GetMapping("detail")
@ApiOperation(value = "钱包详情", notes = "钱包详情", tags = {"小程序-个人中心-我的钱包-钱包详情"})
- public AjaxResult detail() {
+ public R<WalletVO> detail() {
Long userId = SecurityUtils.getUserId();
// TODO 查询钱包详情
WalletVO walletVO = new WalletVO();
- return AjaxResult.success(walletVO);
+ return R.ok(walletVO);
}
/**
@@ -39,9 +41,9 @@
*/
@ApiOperation(value = "变更明细", notes = "变更明细", tags = {"小程序-个人中心-我的钱包-变更记录"})
@GetMapping("change")
- public AjaxResult change() {
+ public R<List<BalanceChangeRecord>> change() {
Long userId = SecurityUtils.getUserId();
- return AjaxResult.success(balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
+ return R.ok(balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
.eq(BalanceChangeRecord::getAppUserId, userId)));
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/PhoneType.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/PhoneType.java
index a840880..7fe4fd8 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/PhoneType.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/enums/PhoneType.java
@@ -1,5 +1,8 @@
package com.ruoyi.other.enums;
+import lombok.Getter;
+
+@Getter
public enum PhoneType {
PLATFORM(1, "平台"),
SHOP(2, "门店");
@@ -12,11 +15,4 @@
this.desc = desc;
}
- public Integer getCode() {
- return code;
- }
-
- public String getDesc() {
- return desc;
- }
}
--
Gitblit v1.7.1