From d9bd686140dc3437115272192bbbc6aa0e8ca87d Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Fri, 29 Nov 2024 11:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/commons/domain/vo/RechargePage.java  | 15 +++++++++++++++
 .../com/example/recharge/controller/AuditController.java  |  2 +-
 .../example/recharge/controller/RechargeController.java   | 11 ++++++-----
 .../java/com/example/recharge/mapper/ActivityMapper.java  |  9 +--------
 .../main/java/com/example/recharge/mapper/RateMapper.java |  2 +-
 5 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 demo/commons/src/main/java/com/example/commons/domain/vo/RechargePage.java

diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/RechargePage.java b/demo/commons/src/main/java/com/example/commons/domain/vo/RechargePage.java
new file mode 100644
index 0000000..723c315
--- /dev/null
+++ b/demo/commons/src/main/java/com/example/commons/domain/vo/RechargePage.java
@@ -0,0 +1,15 @@
+package com.example.commons.domain.vo;
+
+import com.example.commons.domain.entity.Activity;
+import com.example.commons.domain.entity.Recharge;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class RechargePage {
+    private Integer pageNum;
+    private Integer pageSize;
+
+    private RechargeVo rechargeVo;
+}
diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java b/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java
index eb28e8e..29c7695 100644
--- a/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java
+++ b/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java
@@ -29,7 +29,7 @@ public class AuditController {
         }
     }
     @PostMapping
-    public Result search(Integer pageNum,Integer pageSize,@RequestBody Audit audit){
+    public Result search(@RequestBody Integer pageNum,@RequestBody Integer pageSize,@RequestBody Audit audit){
         if(ObjectUtils.isEmpty(pageNum)){
             return Result.success(auditService.search(audit));
         }
diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java b/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java
index f6e70a5..2e12f40 100644
--- a/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java
+++ b/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java
@@ -2,6 +2,7 @@ package com.example.recharge.controller;
 
 
 import com.example.commons.domain.entity.Recharge;
+import com.example.commons.domain.vo.RechargePage;
 import com.example.commons.domain.vo.RechargeVo;
 import com.example.commons.domain.vo.Result;
 import com.example.commons.sevice.RechargeService;
@@ -42,12 +43,12 @@ public class RechargeController {
         return Result.success();
     }
     @PostMapping
-    public Result search(Integer pageNum, Integer pageSize,@RequestBody RechargeVo rechargeVo) {
-        if(ObjectUtils.isEmpty(pageNum)){
-            return Result.success(rechargeService.search(rechargeVo));
+    public Result search(@RequestBody RechargePage rechargePage) {
+       if(ObjectUtils.isEmpty(rechargePage.getPageNum())){
+            return Result.success(rechargeService.search(rechargePage.getRechargeVo()));
         }
-        else {
-            return Result.success(rechargeService.searchForPage(pageNum,pageSize,rechargeVo));
+       else {
+            return Result.success(rechargeService.searchForPage(rechargePage.getPageNum(),rechargePage.getPageSize(),rechargePage.getRechargeVo()));
         }
     }
 }
diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
index ea40137..01ab5a8 100644
--- a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
+++ b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
@@ -24,14 +24,7 @@ public interface ActivityMapper {
            "<script>",
            "update activity",
            "<set>",
-           "<if test='adminId != null'> admin_id = #{adminId}, </if>",
-           "<if test='dept != null '> dept= #{dept}, </if>",
-           "<if test='startTime != null '> start_time = #{startTime}, </if>",
-           "<if test='endTime != null '> end_time = #{endTime}, </if>",
-           "<if test='rechargeRatio != null '> recharge_ratio = #{rechargeRatio}, </if>",
-           "<if test='activityName != null and activityName.length>0'> activity_name = #{activityName}, </if>",
-           "<if test='activityFlag != null'> `activity_flag` = #{activityFlag}, </if>",
-           "<if test='status != null'> `status` = #{status}, </if>",
+           "<if test= 'activityFlag!=null '>activity_flag=#{activityFlag},</if>",
            "</set>",
            "where activity_id=#{activityId}",
            "</script>"
diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java
index 72b62de..899eed9 100644
--- a/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java
+++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java
@@ -51,7 +51,7 @@ public interface RateMapper {
             "select * from rate",
             "<where>",
             "<if test='rateId!=null'>rate_id =#{rateId}</if>",
-            "<if test='startTime!=null'>start_time &gt;=#{startTime}</if>",
+            "<if test='startTime!=null'>and start_time &gt;=#{startTime}</if>",
             "<if test='endTime!=null'>and end_time &lt;=#{endTime}</if>",
             "<if test='currency!=null and currency.length>0'>and currency like concat('%','#{currency}','%')</if>",
             "<if test='exchangeRate!=null'>and exchange_rate like concat('%','#{exchangeRate}','%')</if>",