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 maRechargerecords = maRechargerecordMapper.selectMaRechargerecordList(maRechargerecord); float total = 0; for (MaRechargerecord record : maRechargerecords) {