From 788a5990d19f3e3e6fd955fdadcf1c9304822213 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 22 十月 2024 15:23:19 +0800
Subject: [PATCH] 1.

---
 src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java            |   16 +++++
 /dev/null                                                                             |   16 -----
 src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java                   |   15 +++++
 src/main/java/com/mzl/flower/service/wallet/WalletWithdrawRecordService.java          |   16 +++++
 src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java |   20 ++++++
 src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java                      |   29 ++++-----
 src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java                |    7 +-
 src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml                       |    6 +-
 src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java        |    9 +-
 9 files changed, 90 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java b/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java
new file mode 100644
index 0000000..b6ec5b2
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java
@@ -0,0 +1,15 @@
+package com.mzl.flower.dto.request.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QueryWalletDTO {
+
+    @ApiModelProperty(value = "供应商Id")
+    private String supplierId;
+
+    @ApiModelProperty(value = "用户Id")
+    private String userId;
+
+}
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
similarity index 90%
rename from src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java
rename to src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
index e8d8948..e301199 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
@@ -5,7 +5,6 @@
 import java.time.LocalDateTime;
 
 import com.mzl.flower.base.BaseAutoEntity;
-import com.mzl.flower.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,8 +17,8 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("t_withdraw_record")
-public class WithdrawRecordDO extends BaseAutoEntity {
+@TableName("t_wallet_withdraw_record")
+public class WalletWithdrawRecordDO extends BaseAutoEntity {
 
 
     /**
@@ -68,7 +67,7 @@
      * 审核状态
      */
     @ApiModelProperty(value = "审核状态（待审核、审核通过、审核不通过）")
-    private Integer approverState;
+    private Integer approveState;
 
     /**
      * 不通过原因
diff --git a/src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java b/src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java
new file mode 100644
index 0000000..286b4d9
--- /dev/null
+++ b/src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java
@@ -0,0 +1,16 @@
+package com.mzl.flower.mapper.wallet;
+
+import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-10-22
+ */
+public interface WalletWithdrawRecordMapper extends BaseMapper<WalletWithdrawRecordDO> {
+
+}
diff --git a/src/main/java/com/mzl/flower/mapper/wallet/WithdrawRecordMapper.java b/src/main/java/com/mzl/flower/mapper/wallet/WithdrawRecordMapper.java
deleted file mode 100644
index 723ef5b..0000000
--- a/src/main/java/com/mzl/flower/mapper/wallet/WithdrawRecordMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mzl.flower.mapper.wallet;
-
-import com.mzl.flower.entity.wallet.WithdrawRecordDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author @TaoJie
- * @since 2024-10-22
- */
-public interface WithdrawRecordMapper extends BaseMapper<WithdrawRecordDO> {
-
-}
diff --git a/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
new file mode 100644
index 0000000..1115c0a
--- /dev/null
+++ b/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.mzl.flower.service.impl.wallet;
+
+import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO;
+import com.mzl.flower.mapper.wallet.WalletWithdrawRecordMapper;
+import com.mzl.flower.service.wallet.WalletWithdrawRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-10-22
+ */
+@Service
+public class WalletWithdrawRecordServiceImpl extends ServiceImpl<WalletWithdrawRecordMapper, WalletWithdrawRecordDO> implements WalletWithdrawRecordService {
+
+}
diff --git a/src/main/java/com/mzl/flower/service/impl/wallet/WithdrawRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/wallet/WithdrawRecordServiceImpl.java
deleted file mode 100644
index 721d3e2..0000000
--- a/src/main/java/com/mzl/flower/service/impl/wallet/WithdrawRecordServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mzl.flower.service.impl.wallet;
-
-import com.mzl.flower.entity.wallet.WithdrawRecordDO;
-import com.mzl.flower.mapper.wallet.WithdrawRecordMapper;
-import com.mzl.flower.service.wallet.WithdrawRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author @TaoJie
- * @since 2024-10-22
- */
-@Service
-public class WithdrawRecordServiceImpl extends ServiceImpl<WithdrawRecordMapper, WithdrawRecordDO> implements WithdrawRecordService {
-
-}
diff --git a/src/main/java/com/mzl/flower/service/wallet/WalletWithdrawRecordService.java b/src/main/java/com/mzl/flower/service/wallet/WalletWithdrawRecordService.java
new file mode 100644
index 0000000..419422d
--- /dev/null
+++ b/src/main/java/com/mzl/flower/service/wallet/WalletWithdrawRecordService.java
@@ -0,0 +1,16 @@
+package com.mzl.flower.service.wallet;
+
+import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-10-22
+ */
+public interface WalletWithdrawRecordService extends IService<WalletWithdrawRecordDO> {
+
+}
diff --git a/src/main/java/com/mzl/flower/service/wallet/WithdrawRecordService.java b/src/main/java/com/mzl/flower/service/wallet/WithdrawRecordService.java
deleted file mode 100644
index e605921..0000000
--- a/src/main/java/com/mzl/flower/service/wallet/WithdrawRecordService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mzl.flower.service.wallet;
-
-import com.mzl.flower.entity.wallet.WithdrawRecordDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author @TaoJie
- * @since 2024-10-22
- */
-public interface WithdrawRecordService extends IService<WithdrawRecordDO> {
-
-}
diff --git a/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java b/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
index 5039819..5a545c3 100644
--- a/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
+++ b/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
@@ -5,22 +5,17 @@
 import com.mzl.flower.base.BaseController;
 import com.mzl.flower.base.R;
 import com.mzl.flower.base.ReturnDataDTO;
+import com.mzl.flower.dto.request.wallet.QueryWalletDTO;
 import com.mzl.flower.entity.wallet.WalletBillRecordDO;
+import com.mzl.flower.service.wallet.WalletService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.mzl.flower.entity.wallet.WalletDO;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Positive;
-
-import org.springframework.web.bind.annotation.RestController;
 
 /**
 * @author @TaoJie
@@ -29,6 +24,9 @@
 @RestController
 @RequestMapping("/v2/wallet")
 public class WalletController extends BaseController {
+
+    @Autowired
+    private WalletService walletService;
 
     @PostMapping("")
     public ResponseEntity<ReturnDataDTO> create() {
@@ -41,8 +39,10 @@
     }
 
     @DeleteMapping("/{id}")
-    public ResponseEntity<ReturnDataDTO> delete(@PathVariable @Positive(message = "{id.positive}") Integer id) {
+    public ResponseEntity<ReturnDataDTO> delete(@PathVariable  Integer id) {
+
         return returnData(R.SUCCESS.getCode(), null);
+
     }
 
     @GetMapping("/{id}")
@@ -51,13 +51,10 @@
     }
 
     @GetMapping("/page")
-    public ResponseEntity<ReturnDataDTO<Page<WalletDO>>> page(
-            @RequestParam(name = "page", required = false, defaultValue = "0")
-            @Min(value = 0, message = "{page.number.min}") Integer page,
-            @RequestParam(name = "count", required = false, defaultValue = "10")
-            @Min(value = 1, message = "{page.count.min}")
-            @Max(value = 30, message = "{page.count.max}") Integer count
+    public ResponseEntity<ReturnDataDTO<Page<WalletDO>>> page(@RequestBody QueryWalletDTO dto
     ) {
+        // 帮我写分页查询
+
         return null;
     }
 
diff --git a/src/main/java/com/mzl/flower/web/v2/wallet/WithdrawRecordController.java b/src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java
similarity index 85%
rename from src/main/java/com/mzl/flower/web/v2/wallet/WithdrawRecordController.java
rename to src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java
index 302b835..74e0ce4 100644
--- a/src/main/java/com/mzl/flower/web/v2/wallet/WithdrawRecordController.java
+++ b/src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java
@@ -5,7 +5,6 @@
 import com.mzl.flower.base.BaseController;
 import com.mzl.flower.base.R;
 import com.mzl.flower.base.ReturnDataDTO;
-import com.mzl.flower.entity.wallet.WalletDO;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -14,7 +13,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.mzl.flower.entity.wallet.WithdrawRecordDO;
+import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Positive;
@@ -27,7 +26,7 @@
 */
 @RestController
 @RequestMapping("/v2/withdraw-record")
-public class WithdrawRecordController extends BaseController {
+public class WalletWithdrawRecordController extends BaseController {
 
     @PostMapping("")
     public ResponseEntity<ReturnDataDTO> create() {
@@ -45,12 +44,12 @@
     }
 
     @GetMapping("/{id}")
-    public WithdrawRecordDO get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) {
+    public WalletWithdrawRecordDO get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) {
         return null;
     }
 
     @GetMapping("/page")
-    public ResponseEntity<ReturnDataDTO<Page<WithdrawRecordDO>>> page(
+    public ResponseEntity<ReturnDataDTO<Page<WalletWithdrawRecordDO>>> page(
             @RequestParam(name = "page", required = false, defaultValue = "0")
             @Min(value = 0, message = "{page.number.min}") Integer page,
             @RequestParam(name = "count", required = false, defaultValue = "10")
diff --git a/src/main/resources/mapper/wallet/WithdrawRecordMapper.xml b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
similarity index 86%
rename from src/main/resources/mapper/wallet/WithdrawRecordMapper.xml
rename to src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
index b2acb2b..324735e 100644
--- a/src/main/resources/mapper/wallet/WithdrawRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mzl.flower.mapper.wallet.WithdrawRecordMapper">
+<mapper namespace="com.mzl.flower.mapper.wallet.WalletWithdrawRecordMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.mzl.flower.entity.wallet.WithdrawRecordDO">
+    <resultMap id="BaseResultMap" type="com.mzl.flower.entity.wallet.WalletWithdrawRecordDO">
         <id column="id" property="id" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
@@ -17,7 +17,7 @@
         <result column="method" property="method" />
         <result column="approve_by" property="approveBy" />
         <result column="approve_time" property="approveTime" />
-        <result column="approver_state" property="approverState" />
+        <result column="approve_state" property="approveState" />
         <result column="reject_reason" property="rejectReason" />
     </resultMap>
 

--
Gitblit v1.9.3