微信API 用户配置
This commit is contained in:
@@ -10,7 +10,11 @@ public enum AccSettingType {
|
|||||||
*/
|
*/
|
||||||
EXPEND_SETTING,
|
EXPEND_SETTING,
|
||||||
/**
|
/**
|
||||||
* 账户
|
* 现金账户
|
||||||
*/
|
*/
|
||||||
ACCOUNT_SETTING
|
CASH_SETTING,
|
||||||
|
/**
|
||||||
|
* 负债账户
|
||||||
|
*/
|
||||||
|
OWE_SETTING
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,8 @@ public class WxSettingsController extends BaseWxController{
|
|||||||
List<AccSetting> userSetting = accSettingService.list(new QueryWrapper<AccSetting>().eq("user_id", getLoginUserId(request)));
|
List<AccSetting> userSetting = accSettingService.list(new QueryWrapper<AccSetting>().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.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.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);
|
return ResponseDTO.ok().setData(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,7 +57,7 @@ public class WxSettingsController extends BaseWxController{
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PostMapping("user/setting/{id}")
|
@PostMapping("user/setting/{id}")
|
||||||
public ResponseDTO getSetting(@PathVariable("id") String id){
|
public ResponseDTO getSetting(@PathVariable("id") Integer id){
|
||||||
AccSetting byId = accSettingService.getById(id);
|
AccSetting byId = accSettingService.getById(id);
|
||||||
return ResponseDTO.ok().setData(byId);
|
return ResponseDTO.ok().setData(byId);
|
||||||
}
|
}
|
||||||
@@ -66,7 +67,7 @@ public class WxSettingsController extends BaseWxController{
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PostMapping("user/settings/del/{id}")
|
@PostMapping("user/settings/del/{id}")
|
||||||
public ResponseDTO deleteSetting(@PathVariable("id") String id){
|
public ResponseDTO deleteSetting(@PathVariable("id") Integer id){
|
||||||
accSettingService.removeById(id);
|
accSettingService.removeById(id);
|
||||||
return ResponseDTO.ok();
|
return ResponseDTO.ok();
|
||||||
}
|
}
|
||||||
@@ -76,11 +77,21 @@ public class WxSettingsController extends BaseWxController{
|
|||||||
* @param request
|
* @param request
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PostMapping("user/settings/add")
|
@PostMapping("user/settings/edit")
|
||||||
public ResponseDTO addSetting(HttpServletRequest request,AccSetting accSetting){
|
public ResponseDTO addSetting(HttpServletRequest request,AccSetting accSetting){
|
||||||
accSetting.setGmtCreate(new Date());
|
if (accSetting.getId() != -1){
|
||||||
accSetting.setUserId(getLoginUserId(request));
|
AccSetting byId = accSettingService.getById(accSetting.getId());
|
||||||
accSettingService.save(accSetting);
|
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();
|
return ResponseDTO.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,12 +37,9 @@ public class AccSetting implements Serializable {
|
|||||||
@ApiModelProperty(value = "名称")
|
@ApiModelProperty(value = "名称")
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@ApiModelProperty(value = "设置类型1-支出 2-收入 3-账户")
|
@ApiModelProperty(value = "设置类型1")
|
||||||
private AccSettingType settingType;
|
private AccSettingType settingType;
|
||||||
|
|
||||||
@ApiModelProperty(value = "0-普通账户 1-负债账户")
|
|
||||||
private String accType;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "收藏者id")
|
@ApiModelProperty(value = "收藏者id")
|
||||||
private String icon;
|
private String icon;
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ DROP TABLE IF EXISTS `qn_acc_setting`;
|
|||||||
CREATE TABLE `qn_acc_setting` (
|
CREATE TABLE `qn_acc_setting` (
|
||||||
`id` int(10) NOT NULL AUTO_INCREMENT COMMENT '自增id',
|
`id` int(10) NOT NULL AUTO_INCREMENT COMMENT '自增id',
|
||||||
`name` varchar(200) NOT NULL COMMENT '名称',
|
`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',
|
`icon` varchar(200) NOT NULL COMMENT '收藏者id',
|
||||||
`user_id` varchar(200) DEFAULT NULL,
|
`user_id` varchar(200) DEFAULT NULL,
|
||||||
`gmt_create` datetime NOT NULL COMMENT '收藏创建时间',
|
`gmt_create` datetime NOT NULL COMMENT '收藏创建时间',
|
||||||
@@ -19,6 +19,7 @@ CREATE TABLE `qn_acc_bill` (
|
|||||||
`account_type` int(10) NOT NULL COMMENT '账户分类ID',
|
`account_type` int(10) NOT NULL COMMENT '账户分类ID',
|
||||||
`date` datetime DEFAULT NULL,
|
`date` datetime DEFAULT NULL,
|
||||||
`remark` varchar(500) DEFAULT NULL,
|
`remark` varchar(500) DEFAULT NULL,
|
||||||
|
`user_id` varchar(200) DEFAULT NULL,
|
||||||
`gmt_create` datetime NOT NULL COMMENT '收藏创建时间',
|
`gmt_create` datetime NOT NULL COMMENT '收藏创建时间',
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user