pipIrr-SV.git - Gitblit

			@@ -8,7 +8,6 @@
			import com.dy.pipIrrGlobal.pojoSe.SeCodeVerify;
			import com.dy.pipIrrGlobal.pojoSe.SeOpenId;
			import com.dy.pipIrrGlobal.voSe.VoClientWechat;
			import com.dy.pipIrrSell.wechatpay.PayInfo;
			import com.dy.pipIrrWechat.client.dto.CodeLoginDTO;
			import com.dy.pipIrrWechat.client.dto.CodeVerifyDTO;
			import com.dy.pipIrrWechat.result.WechatResultCode;
			@@ -43,7 +42,6 @@
			private final ClientSv clientSv;
			private final AliyunSmsSv aliyunSmsSv;
			private final RestTemplateUtil restTemplateUtil;
			private final String privateCertFileName = PayInfo.privateCertFileName;
			private final String appid = PayInfo.appid;
			private final String secret = PayInfo.secret;
			private final String mchid = PayInfo.mchid;
			@@ -62,7 +60,7 @@
			* @throws IOException
			*/
			@PostMapping(path = "code_login", consumes = MediaType.APPLICATION_JSON_VALUE)
			public BaseResponse<VoClientWechat> codeLogin(@RequestBody @Valid CodeLoginDTO po, BindingResult bindingResult) throws IOException {
			public BaseResponse<JSONObject> codeLogin(@RequestBody @Valid CodeLoginDTO po, BindingResult bindingResult) throws IOException {
			if(bindingResult != null && bindingResult.hasErrors()){
			return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
			}
			@@ -77,14 +75,25 @@
			Map<String, String> headerParams = new HashMap<>();
			JSONObject job = restTemplateUtil.get(loginUrl, queryParams, headerParams);

			if(job.containsKey("errmsg ")) {
			return BaseResponseUtils.buildErrorMsg(WechatResultCode.INVALID_CODE.getMessage());
			}

			String openId = job.getString("openid");
			if(openId == null) {
			return BaseResponseUtils.buildErrorMsg(WechatResultCode.LOGIN_FAIL.getMessage());
			}

			try {
			JSONObject job_client = new JSONObject();
			VoClientWechat res = clientSv.getSimpleClientInfo(null, openId);
			return BaseResponseUtils.buildSuccess(res);
			if(res != null) {
			job_client.put("client", res);
			} else {
			VoClientWechat voClientWechat = new VoClientWechat();
			job_client.put("client", voClientWechat);
			}
			return BaseResponseUtils.buildSuccess(job_client);
			} catch (Exception e) {
			log.error("查询农户异常", e);
			return BaseResponseUtils.buildException(e.getMessage()) ;