Commit b60eb87e authored by chenzhao's avatar chenzhao

登录问题修复 2024-05-17现场版本

parent be0d485e
...@@ -109,6 +109,8 @@ public class ControllerAop { ...@@ -109,6 +109,8 @@ public class ControllerAop {
urls.add("/hygf/maintenance/getDealer"); urls.add("/hygf/maintenance/getDealer");
urls.add("/hygf/maintenance/save"); urls.add("/hygf/maintenance/save");
urls.add("/hygf/qiyuesuo/getUserToken"); urls.add("/hygf/qiyuesuo/getUserToken");
urls.add("/hygf/peasant-household/mobile/register");
// 获取请求路径 // 获取请求路径
for (String uri : urls) { for (String uri : urls) {
......
...@@ -301,7 +301,12 @@ public class HouseholdContractController extends BaseController { ...@@ -301,7 +301,12 @@ public class HouseholdContractController extends BaseController {
@PostMapping (value = "/reissue") @PostMapping (value = "/reissue")
@ApiOperation(httpMethod = "POST", value = "重新发起", notes = "重新发起") @ApiOperation(httpMethod = "POST", value = "重新发起", notes = "重新发起")
public ResponseModel<HouseholdContract> reissue(@RequestBody HouseholdContract model ) { public ResponseModel<HouseholdContract> reissue(@RequestBody HouseholdContract model ) {
HouseholdContract householdContract= householdContractServiceImpl.reissueinitiateHouseholdContract(model); HouseholdContract householdContract = new HouseholdContract();
try {
householdContract = householdContractServiceImpl.reissueinitiateHouseholdContract(model);
}catch (Exception e){
throw new BadRequest(e.getMessage());
}
return ResponseHelper.buildResponse(householdContract); return ResponseHelper.buildResponse(householdContract);
} }
......
...@@ -130,11 +130,11 @@ public class PeasantHouseholdWxController extends BaseController { ...@@ -130,11 +130,11 @@ public class PeasantHouseholdWxController extends BaseController {
@RequestMapping (value = "/register", method = RequestMethod.POST) @RequestMapping (value = "/register", method = RequestMethod.POST)
@ApiOperation (httpMethod = "POST", value = "微信农户注册", notes = "微信农户注册") @ApiOperation (httpMethod = "POST", value = "微信农户注册", notes = "微信农户注册")
public ResponseModel<PeasantHouseholdWxDto> wxUserRegister(@ApiParam @RequestBody MobileLoginParamDto mobileLoginParam) { public ResponseModel<PeasantHouseholdWxDto> wxUserRegister(@ApiParam @RequestBody MobileLoginParamDto mobileLoginParam) {
PeasantHousehold peasantHousehold = new PeasantHousehold();
//注册并登录 生成农户信息表数据
PeasantHouseholdWxDto peasantHouseholdWxDto = peasantHouseholdServiceImpl.registerAndLogin(mobileLoginParam);
PeasantHousehold peasantHousehold = peasantHouseholdWxDto.getPeasantHousehold();
try { try {
//注册并登录 生成农户信息表数据
PeasantHouseholdWxDto peasantHouseholdWxDto = peasantHouseholdServiceImpl.registerAndLogin(mobileLoginParam);
peasantHousehold = peasantHouseholdWxDto.getPeasantHousehold();
log.info("微信农户注册, 入参 => {}", mobileLoginParam); log.info("微信农户注册, 入参 => {}", mobileLoginParam);
PeasantHouseholdDto model = mobileLoginParam.getPeasantHouseholdDto(); PeasantHouseholdDto model = mobileLoginParam.getPeasantHouseholdDto();
validatedPeasantHouseholdDto(model); validatedPeasantHouseholdDto(model);
......
...@@ -119,7 +119,12 @@ public class QiyuesuoController extends BaseController { ...@@ -119,7 +119,12 @@ public class QiyuesuoController extends BaseController {
@ApiOperation(httpMethod = "POST",value = "创建合同", notes = "创建合同") @ApiOperation(httpMethod = "POST",value = "创建合同", notes = "创建合同")
@PostMapping (value = "/addContract") @PostMapping (value = "/addContract")
public ResponseModel<HouseholdContract> initiateHouseholdContract(@RequestBody HouseholdContractDto model) { public ResponseModel<HouseholdContract> initiateHouseholdContract(@RequestBody HouseholdContractDto model) {
HouseholdContract householdContract=householdContractServiceImpl.initiateHouseholdContract(model); HouseholdContract householdContract = new HouseholdContract();
try {
householdContract= householdContractServiceImpl.initiateHouseholdContract(model);
}catch (Exception e){
throw new BadRequest(e.getMessage());
}
return ResponseHelper.buildResponse(householdContract); return ResponseHelper.buildResponse(householdContract);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment