From 58b20a4b8dcc3c132f538b825a9490de4245f51a Mon Sep 17 00:00:00 2001
From: wyw <373811525@qq.com>
Date: Wed, 14 Aug 2024 19:04:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=AA=E5=85=85=E5=80=BC=E7=9A=84=E8=AE=B0=E5=BD=95=E4=B8=BA?=
 =?UTF-8?q?0=E6=97=B6=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/controller/waterele/MaRechargerecordController.java  | 4 ++--
 .../java/com/fastbee/waterele/domain/MaRechargerecord.java    | 2 +-
 .../waterele/service/impl/MaRechargerecordServiceImpl.java    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaRechargerecordController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaRechargerecordController.java
index 79f1142..005e627 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaRechargerecordController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaRechargerecordController.java
@@ -108,7 +108,7 @@ public class MaRechargerecordController extends BaseController {
     @ApiOperation("查询未充值的记录")
     public AjaxResult queryUnchargeAmount(MaRechargerecord maRechargerecord) {
         UnchargeAmountVo amount = maRechargerecordService.queryUnchargeAmount(maRechargerecord);
-        return AjaxResult.success(amount);
+        return success(amount);
     }
 
 
@@ -118,6 +118,6 @@ public class MaRechargerecordController extends BaseController {
     @ApiOperation("充值成功反馈")
     public AjaxResult rechargeReply(MaRechargerecord maRechargerecord) {
         String msg = maRechargerecordService.rechargeReply(maRechargerecord);
-        return AjaxResult.success(msg);
+        return success(msg);
     }
 }
diff --git a/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/domain/MaRechargerecord.java b/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/domain/MaRechargerecord.java
index 1332be9..874bec3 100644
--- a/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/domain/MaRechargerecord.java
+++ b/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/domain/MaRechargerecord.java
@@ -72,7 +72,7 @@ public class MaRechargerecord extends BaseEntity {
      * 充值状态
      */
     @Excel(name = "充值状态")
-    @ApiModelProperty("充值状态：0=未充值,1=充值成功")
+    @ApiModelProperty("充值状态：2=未充值,1=充值成功")
     private Integer isRecharge;
 
 }
diff --git a/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaRechargerecordServiceImpl.java b/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaRechargerecordServiceImpl.java
index d827c0d..bc787a0 100644
--- a/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaRechargerecordServiceImpl.java
+++ b/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaRechargerecordServiceImpl.java
@@ -93,7 +93,7 @@ public class MaRechargerecordServiceImpl implements IMaRechargerecordService {
 
     @Override
     public UnchargeAmountVo queryUnchargeAmount(MaRechargerecord maRechargerecord) {
-        maRechargerecord.setIsRecharge(0);
+        maRechargerecord.setIsRecharge(2);
         List<MaRechargerecord> maRechargerecords = maRechargerecordMapper.selectMaRechargerecordList(maRechargerecord);
         float total = 0;
         for (MaRechargerecord record : maRechargerecords) {