diff --git a/src/main/java/com/quinn/common/wx/AccSettingType.java b/src/main/java/com/quinn/common/wx/AccSettingType.java index 23ac972..4ea2a51 100644 --- a/src/main/java/com/quinn/common/wx/AccSettingType.java +++ b/src/main/java/com/quinn/common/wx/AccSettingType.java @@ -10,7 +10,11 @@ public enum AccSettingType { */ EXPEND_SETTING, /** - * 账户 + * 现金账户 */ - ACCOUNT_SETTING + CASH_SETTING, + /** + * 负债账户 + */ + OWE_SETTING } diff --git a/src/main/java/com/quinn/controller/wx/WxSettingsController.java b/src/main/java/com/quinn/controller/wx/WxSettingsController.java index 3b03f0e..a1c399b 100644 --- a/src/main/java/com/quinn/controller/wx/WxSettingsController.java +++ b/src/main/java/com/quinn/controller/wx/WxSettingsController.java @@ -47,7 +47,8 @@ public class WxSettingsController extends BaseWxController{ List userSetting = accSettingService.list(new QueryWrapper().eq("user_id", getLoginUserId(request))); result.put(AccSettingType.INCOME_SETTING.name(), userSetting.stream().filter(x -> AccSettingType.INCOME_SETTING.equals(x.getSettingType())).collect(Collectors.toList())); result.put(AccSettingType.EXPEND_SETTING.name(), userSetting.stream().filter(x -> AccSettingType.EXPEND_SETTING.equals(x.getSettingType())).collect(Collectors.toList())); - result.put(AccSettingType.ACCOUNT_SETTING.name(), userSetting.stream().filter(x -> AccSettingType.ACCOUNT_SETTING.equals(x.getSettingType())).collect(Collectors.toList())); + result.put(AccSettingType.CASH_SETTING.name(), userSetting.stream().filter(x -> AccSettingType.CASH_SETTING.equals(x.getSettingType())).collect(Collectors.toList())); + result.put(AccSettingType.OWE_SETTING.name(), userSetting.stream().filter(x -> AccSettingType.OWE_SETTING.equals(x.getSettingType())).collect(Collectors.toList())); return ResponseDTO.ok().setData(result); } @@ -56,7 +57,7 @@ public class WxSettingsController extends BaseWxController{ * @return */ @PostMapping("user/setting/{id}") - public ResponseDTO getSetting(@PathVariable("id") String id){ + public ResponseDTO getSetting(@PathVariable("id") Integer id){ AccSetting byId = accSettingService.getById(id); return ResponseDTO.ok().setData(byId); } @@ -66,7 +67,7 @@ public class WxSettingsController extends BaseWxController{ * @return */ @PostMapping("user/settings/del/{id}") - public ResponseDTO deleteSetting(@PathVariable("id") String id){ + public ResponseDTO deleteSetting(@PathVariable("id") Integer id){ accSettingService.removeById(id); return ResponseDTO.ok(); } @@ -76,11 +77,21 @@ public class WxSettingsController extends BaseWxController{ * @param request * @return */ - @PostMapping("user/settings/add") + @PostMapping("user/settings/edit") public ResponseDTO addSetting(HttpServletRequest request,AccSetting accSetting){ - accSetting.setGmtCreate(new Date()); - accSetting.setUserId(getLoginUserId(request)); - accSettingService.save(accSetting); + if (accSetting.getId() != -1){ + AccSetting byId = accSettingService.getById(accSetting.getId()); + if (byId != null){ + byId.setName(accSetting.getName()); + byId.setIcon(accSetting.getIcon()); + byId.setSettingType(accSetting.getSettingType()); + } + accSettingService.updateById(byId); + }else { + accSetting.setGmtCreate(new Date()); + accSetting.setUserId(getLoginUserId(request)); + accSettingService.save(accSetting); + } return ResponseDTO.ok(); } diff --git a/src/main/java/com/quinn/pojo/AccSetting.java b/src/main/java/com/quinn/pojo/AccSetting.java index 72e88f9..2059efe 100644 --- a/src/main/java/com/quinn/pojo/AccSetting.java +++ b/src/main/java/com/quinn/pojo/AccSetting.java @@ -37,12 +37,9 @@ public class AccSetting implements Serializable { @ApiModelProperty(value = "名称") private String name; - @ApiModelProperty(value = "设置类型1-支出 2-收入 3-账户") + @ApiModelProperty(value = "设置类型1") private AccSettingType settingType; - @ApiModelProperty(value = "0-普通账户 1-负债账户") - private String accType; - @ApiModelProperty(value = "收藏者id") private String icon; diff --git a/src/main/resources/sql/account.sql b/src/main/resources/sql/account.sql index c39b8ba..5a0cc44 100644 --- a/src/main/resources/sql/account.sql +++ b/src/main/resources/sql/account.sql @@ -5,7 +5,7 @@ DROP TABLE IF EXISTS `qn_acc_setting`; CREATE TABLE `qn_acc_setting` ( `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '自增id', `name` varchar(200) NOT NULL COMMENT '名称', - `setting_type` varchar(20) DEFAULT NULL COMMENT '设置类型1-支出 2-收入 3-账户', + `setting_type` varchar(20) DEFAULT NULL COMMENT '设置类型', `icon` varchar(200) NOT NULL COMMENT '收藏者id', `user_id` varchar(200) DEFAULT NULL, `gmt_create` datetime NOT NULL COMMENT '收藏创建时间', @@ -19,6 +19,7 @@ CREATE TABLE `qn_acc_bill` ( `account_type` int(10) NOT NULL COMMENT '账户分类ID', `date` datetime DEFAULT NULL, `remark` varchar(500) DEFAULT NULL, + `user_id` varchar(200) DEFAULT NULL, `gmt_create` datetime NOT NULL COMMENT '收藏创建时间', PRIMARY KEY (`id`) );