|
|
|
@@ -11,10 +11,7 @@ import com.iformall.annotation.AuthIgnore; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.WxAppinfo; |
|
|
|
import com.iformall.domain.po.WxCUser; |
|
|
|
import com.iformall.domain.po.WxCUserCar; |
|
|
|
import com.iformall.domain.po.WxLevelConfig; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.WxCUserVo; |
|
|
|
import com.iformall.enums.EnumAssignTagsTrigger; |
|
|
|
import com.iformall.service.*; |
|
|
|
@@ -23,6 +20,7 @@ import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import me.chanjar.weixin.common.error.WxErrorException; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.http.util.EntityUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -49,6 +47,9 @@ public class WxUserGrantController extends BaseController { |
|
|
|
@Autowired |
|
|
|
private WxCUserService wxCUserService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxCUserBasicInfoService wxCUserBasicInfoService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxCUserCarService wxCUserCarService; |
|
|
|
|
|
|
|
@@ -365,8 +366,15 @@ public class WxUserGrantController extends BaseController { |
|
|
|
userVo.setLevelName(levelConfig.getLevel()); |
|
|
|
} |
|
|
|
} |
|
|
|
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getId()); |
|
|
|
if (wxCUserBasicInfo != null) { |
|
|
|
userVo.setName(wxCUserBasicInfo.getName()); |
|
|
|
userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); |
|
|
|
userVo.setSex(wxCUserBasicInfo.getSex()); |
|
|
|
userVo.setAddress(wxCUserBasicInfo.getAddress()); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS,"查询成功", userVo); |
|
|
|
return new ResultData(userVo); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("当前用户名下是否有车") |
|
|
|
@@ -470,5 +478,33 @@ public class WxUserGrantController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 用户更新信息 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@PostMapping("/updateUserInfo") |
|
|
|
@ApiOperation(value = "用户更新信息", notes="") |
|
|
|
public ResultData updateUserInfo(@ModelAttribute WxCUserBasicInfo wxCUserBasicInfo) { |
|
|
|
if (wxCUserBasicInfo == null) |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
if (wxCUserBasicInfoService.getById(getUser().getId()) == null) |
|
|
|
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER); |
|
|
|
|
|
|
|
if (wxCUserBasicInfo.getName() != null || |
|
|
|
wxCUserBasicInfo.getBirthdate() != null || |
|
|
|
wxCUserBasicInfo.getSex() != null || |
|
|
|
wxCUserBasicInfo.getAddress() != null) { |
|
|
|
WxCUserBasicInfo record = new WxCUserBasicInfo(); |
|
|
|
record.setName(wxCUserBasicInfo.getName()); |
|
|
|
record.setBirthdate(wxCUserBasicInfo.getBirthdate()); |
|
|
|
record.setSex(wxCUserBasicInfo.getSex() ); |
|
|
|
record.setAddress(wxCUserBasicInfo.getAddress()); |
|
|
|
record.setId(getUser().getId()); |
|
|
|
record.setUpdateDate(new Date()); |
|
|
|
wxCUserBasicInfoService.update(wxCUserBasicInfo); |
|
|
|
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
} |