diff --git a/src/main/java/com/quinn/controller/wx/WxSettingsController.java b/src/main/java/com/quinn/controller/wx/WxSettingsController.java index 71cf902..c889877 100644 --- a/src/main/java/com/quinn/controller/wx/WxSettingsController.java +++ b/src/main/java/com/quinn/controller/wx/WxSettingsController.java @@ -115,11 +115,16 @@ public class WxSettingsController extends BaseWxController{ */ @PostMapping("user/settings/expend") public ResponseDTO getBillExpend(HttpServletRequest request){ + double sumYearAmnt = 0; List billByType = accSettingService.getBillByType(getLoginUserId(request), AccSettingType.EXPEND_SETTING); Map result = new HashMap<>(); if (!CollectionUtils.isEmpty(billByType)){ + for (YearAmnt yearAmnt : billByType) { + sumYearAmnt = sumYearAmnt + yearAmnt.getMoney(); + } result = billByType.stream().collect(Collectors.toMap(YearAmnt::getSettingId, YearAmnt::getMoney, (k1, k2) -> k1)); } + result.put(-1,sumYearAmnt); return ResponseDTO.ok().setData(result); } @@ -130,11 +135,16 @@ public class WxSettingsController extends BaseWxController{ */ @PostMapping("user/settings/income") public ResponseDTO getBillIncome(HttpServletRequest request){ + double sumYearAmnt = 0; List billByType = accSettingService.getBillByType(getLoginUserId(request), AccSettingType.INCOME_SETTING); Map result = new HashMap<>(); if (!CollectionUtils.isEmpty(billByType)){ + for (YearAmnt yearAmnt : billByType) { + sumYearAmnt = sumYearAmnt + yearAmnt.getMoney(); + } result = billByType.stream().collect(Collectors.toMap(YearAmnt::getSettingId, YearAmnt::getMoney, (k1, k2) -> k1)); } + result.put(-1,sumYearAmnt); return ResponseDTO.ok().setData(result); } diff --git a/src/main/java/com/quinn/mapper/xml/AccSettingMapper.xml b/src/main/java/com/quinn/mapper/xml/AccSettingMapper.xml index 96fa164..81ebc0d 100644 --- a/src/main/java/com/quinn/mapper/xml/AccSettingMapper.xml +++ b/src/main/java/com/quinn/mapper/xml/AccSettingMapper.xml @@ -3,9 +3,10 @@ diff --git a/src/main/resources/sql/account.sql b/src/main/resources/sql/account.sql index a3895a9..010e5fb 100644 --- a/src/main/resources/sql/account.sql +++ b/src/main/resources/sql/account.sql @@ -37,3 +37,7 @@ CREATE TABLE `qn_acc_budget` ( `gmt_create` datetime NOT NULL COMMENT '收藏创建时间', PRIMARY KEY (`id`) ); + + +INSERT INTO `qn_acc_setting`(`id`, `name`, `setting_type`, `icon`, `balance`, `user_id`, `gmt_create`) VALUES (-1, '还款', 'OTHER', '/image/bill/repayment.png', 0.00, NULL, '2023-02-09 23:44:20'); +INSERT INTO `qn_acc_setting`(`id`, `name`, `setting_type`, `icon`, `balance`, `user_id`, `gmt_create`) VALUES (-2, '转账', 'OTHER', '/image/bill/transfer.png', 0.00, NULL, '2023-02-09 23:44:20');