二期 管家小程序

src/main/java/com/care/client/service/PassportService.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.MessageFormat;
+import java.util.Date;
 
 @Slf4j
 @Service
@@ -32,8 +33,7 @@ public class PassportService extends AbstractPassportService {
     private WxPassportService wxPassportService;
     @Resource
     private CareMemberInfoService careMemberInfoService;
-    @Resource
-    private PlatformPinanbaoConfig platformPinanbaoConfig;
+
 
 
     public Result<Object> login(MemberInitParams params) {
@@ -42,6 +42,8 @@ public class PassportService extends AbstractPassportService {
             CheckUtils.valueIsNull(params, "code");
             CareMemberInfo  careMemberInfo = wxPassportService.login(params);
             if(careMemberInfo != null){
+                params.setPhone(careMemberInfo.getPhone());
+                params.setOpenid(careMemberInfo.getOpenId());
                 return cache(params);
             } else {
                 return Result.success();
@@ -98,21 +100,21 @@ public class PassportService extends AbstractPassportService {
              careMemberInfo.setPhone(phone);
              careMemberInfo.setOpenId(openId);
 
-             String accessToken= wxPassportService.accessToken();
-             WxConfig wxConfig = platformPinanbaoConfig.wxConfig();
-
-             String infoUrl = MessageFormat.format(wxConfig.getInfoUrl(),accessToken, openId);
-             JSONObject jsonObject = HttpUtil.httpGet(infoUrl);
-             log.warn("-----jsonObject:[{}]", jsonObject);
-             if(jsonObject != null){
-                 String headimgurl = jsonObject.getStr("headimgurl");
-                 careMemberInfo.setProfile(headimgurl);
-                 String nickname = jsonObject.getStr("nickname");
-                 careMemberInfo.setNickname(nickname);
-                 int sex = jsonObject.getInt("sex");
-                 careMemberInfo.setGender(sex == 1 ? "M" : (sex == 2 ? "W": null));
-             }
-
+//             String accessToken= wxPassportService.accessToken();
+//             WxConfig wxConfig = platformPinanbaoConfig.wxConfig();
+//
+//             String infoUrl = MessageFormat.format(wxConfig.getInfoUrl(),accessToken, openId);
+//             JSONObject jsonObject = HttpUtil.httpGet(infoUrl);
+//             log.warn("-----jsonObject:[{}]", jsonObject);
+//             if(jsonObject != null){
+//                 String headimgurl = jsonObject.getStr("headimgurl");
+//                 careMemberInfo.setProfile(headimgurl);
+//                 String nickname = jsonObject.getStr("nickname");
+//                 careMemberInfo.setNickname(nickname);
+//                 int sex = jsonObject.getInt("sex");
+//                 careMemberInfo.setGender(sex == 1 ? "M" : (sex == 2 ? "W": null));
+//             }
+             careMemberInfo.setCreateTime(new Date());
              boolean flag = careMemberInfoService.save(careMemberInfo);
              if (flag) {
                  return cache(params);

src/main/java/com/care/keeper/service/KeeperPassportService.java

@@ -34,6 +34,8 @@ public class KeeperPassportService extends AbstractKeeperPassportService{
             CheckUtils.valueIsNull(params, "code");
             CareSysUser careSysUser = wxKeeperPassportService.login(params);
             if(careSysUser != null){
+                params.setPhone(careSysUser.getPhone());
+                params.setOpenid(careSysUser.getOpenId());
                 return cache(params);
             } else {
                 return Result.success();