From ffbf32105eaad3b0896f227dec5f9224c845d31e Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 17 Sep 2021 17:35:01 +0800 Subject: [PATCH] upd address --- .../controller/UserBasicInfoAddressController.java | 10 +++++----- .../controller/WxQuestionOneselfController.java | 9 ++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java index 6f826d0ca..06d41aa89 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java @@ -86,7 +86,7 @@ public class UserBasicInfoAddressController extends BaseController { return new ResultData(); } - @ApiOperation("消息模板-删除") + @ApiOperation("删除") @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(Long id) { @@ -98,10 +98,10 @@ public class UserBasicInfoAddressController extends BaseController { userBasicInfoAddress.setId(id); userBasicInfoAddress.undateFinalTenantId(getTenantInfo()); userBasicInfoAddressService.deleteById(userBasicInfoAddress); - return new ResultData(Result.SUCCESS, "删除成功", null); + return new ResultData(); } - @ApiOperation("消息模板-查询") + @ApiOperation("查询") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData findById(Long id) { @@ -112,8 +112,8 @@ public class UserBasicInfoAddressController extends BaseController { UserBasicInfoAddress userBasicInfoAddress = new UserBasicInfoAddress(); userBasicInfoAddress.setId(id); userBasicInfoAddress.undateFinalTenantId(getTenantInfo()); - userBasicInfoAddressService.findById(userBasicInfoAddress); - return new ResultData(Result.SUCCESS, "查询成功", null); + UserBasicInfoAddress userAddress = userBasicInfoAddressService.findById(userBasicInfoAddress); + return new ResultData(userAddress); } } \ No newline at end of file diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java index 195fd60b0..d68762b36 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxQuestionOneself; @@ -79,11 +80,17 @@ public class WxQuestionOneselfController extends BaseController { public ResultData detailsById(Long id) { logger.debug("[" + getIpAddr() + "] WxQuestionOneselfController::detailsById"); Map map = new HashMap(); + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } WxQuestionOneself wxQuestionOneself = wxQuestionOneselfService.detailsById(id); if(wxQuestionOneself != null){ WxQuestionOneselfUser userQ = new WxQuestionOneselfUser(); userQ.updateTenantInfo(getTenantInfo()); - userQ.setUserId(getMemberId()); + userQ.setUserId(memberId); userQ.setQuestionId(wxQuestionOneself.getId()); wxQuestionOneself.setUserStatus(wxQuestionOneselfUserService.countQuestion(userQ));