commit

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/controller/WxaUserApiController.java

@@ -228,34 +228,32 @@ public class WxaUserApiController extends WxaController {
 //		 服务端解密用户信息
 //		String json = decrypt(encryptedData.replace(" ", "+"), iv, sessionKey);
 		ApiResult apiResult = wxaUserApi.getUserInfo(sessionKey, encryptedData.replace(" ", "+"), iv);
-		renderJson(apiResult);
-		return;
 
-//		ApiResult apiResult = ApiResult.create(json);
 		
-//		if (!apiResult.isSucceed()) {
-//			ResultBean resultBean = new ResultBean(apiResult.getInt("errcode"), apiResult.getStr("errmsg"));
-//			renderJson(resultBean);
-//			return;
-//		}
+		if (!apiResult.isSucceed()) {
+			ResultBean resultBean = new ResultBean(apiResult.getInt("errcode"), apiResult.getStr("errmsg"));
+			renderJson(resultBean);
+			return;
+		}
 		// 如果开发者拥有多个移动应用、网站应用、和公众帐号（包括小程序），可通过unionid来区分用户的唯一性
 		// 同一用户，对同一个微信开放平台下的不同应用，unionid是相同的。
 
-//		JSONObject object = JSON.parseObject(json);
-//		
-//		String phone = object.getString("purePhoneNumber");
-//		if (StrKit.isBlank(phone)) {
-//			renderJson(ErrorConstant.ERROR_PHONE_BLANK);
-//			return;
-//		}
-//
-//
-//		Doctors doctors = Doctors.dao.findFirst("select * from doctors where phone=?", phone);
-//		if (doctors == null) {
-//			renderJson(ErrorConstant.ERROR_DOCTOR_NOT_FIND);
-//			return;
-//		}
+		JSONObject object = JSON.parseObject(apiResult.getJson());
 		
+		String phone = object.getString("purePhoneNumber");
+		if (StrKit.isBlank(phone)) {
+			renderJson(ErrorConstant.ERROR_PHONE_BLANK);
+			return;
+		}
+
+
+		Doctors doctors = Doctors.dao.findFirst("select * from doctors where phone=?", phone);
+		if (doctors == null) {
+			renderJson(ErrorConstant.ERROR_DOCTOR_NOT_FIND);
+			return;
+		}
+		renderJson(doctors);
+		return;
 //		DoctorsWechat doctorsWechat = DoctorsWechat.dao.findFirst("select * from doctors_wechat where wxa_openid=?",sessionResult.get("openid"));
 //		doctorsWechat.setDoctorId(doctors.getId());
 //		doctorsWechat.update();