微信小程序signup接口修改7 修改接口添加返回信息

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteStaffService.java

@@ -35,6 +35,9 @@ public interface RemoteStaffService {
     @GetMapping("/staff/inner-api/selectOne/{staffId}")
     JSONObject fetchStaff(@RequestParam(value = "staffId") String staffId, @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @GetMapping("/staff/inner-api/selectByPhone")
+    JSONObject fetchStaffByPhone(@RequestParam(value = "phone") String phone, @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     @GetMapping("/staff/inner/tenantId/{enterpriseName}")
     public R<SysEnterpriseDto> tenantIdInner(@RequestParam(value = "enterpriseName") String enterpriseName) ;
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmStaffInnerApiController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -73,6 +74,17 @@ public class DmStaffInnerApiController extends BaseApiController {
         return output(ResponseCode.DATA_NOT_EXISTS,"指定ID的员工").toJSON();
     }
 
+    @InnerAuth
+    @GetMapping(value = "selectByPhone")
+    @ResponseBody
+    public JSONObject fetchStaffByPhone(@RequestParam(value = "phone") String phone){
+        DmStaffPo dmStaff = dmStaffMapper.selectOne(Wrappers.<DmStaffPo>lambdaQuery().eq(DmStaffPo::getPhone, phone).last(SqlConstants.LIMIT_ONE));
+        if (dmStaff!= null) {
+            return outputSuccess(dmStaff).toJSON();
+        }
+        return output(ResponseCode.DATA_NOT_EXISTS,"指定phone的员工").toJSON();
+    }
+
     @InnerAuth
     @PostMapping(value = "new-staff")
     @ResponseBody

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/wechat/controller/WeappController.java

@@ -1,15 +1,20 @@
 package com.xueyi.system.wechat.controller;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.xueyi.common.core.constant.basic.SecurityConstants;
+import com.xueyi.common.core.utils.JwtUtil;
 import com.xueyi.common.core.utils.core.CryptoUtil;
 import com.xueyi.common.core.utils.core.ObjectUtil;
 import com.xueyi.common.core.web.result.AjaxResult;
 import com.xueyi.common.core.web.result.R;
 import com.xueyi.common.security.service.TokenService;
+import com.xueyi.common.security.utils.SecurityUtils;
 import com.xueyi.system.api.authority.feign.RemoteLoginService;
 import com.xueyi.system.api.model.LoginUser;
+import com.xueyi.system.api.staff.domain.po.DmStaffPo;
+import com.xueyi.system.api.staff.feign.RemoteStaffService;
 import com.xueyi.system.wechat.domain.bean.WeappSessionResponse;
 import com.xueyi.system.wechat.domain.bean.WeappSignUpReq;
 import com.xueyi.system.wechat.domain.po.WeappUserInfo;
@@ -48,6 +53,9 @@ public class WeappController {
     @Autowired
     RemoteLoginService remoteLoginService;
 
+    @Autowired
+    RemoteStaffService staffService;
+
     @Autowired
     TokenService tokenService;
 
@@ -126,6 +134,11 @@ public class WeappController {
             return AjaxResult.error("手机号无对应员工，请查证后重试！");
         } else {
             Map<String, Object> map = tokenService.createToken(loginInfoResult.getData());
+            String token = (String)map.get("access_token");
+            log.info("信息，token:{}, enterpriseName:{}, source:{}", token, JwtUtil.getEnterpriseName(token),JwtUtil.getSourceName(token));
+            JSONObject json = staffService.fetchStaffByPhone(phone, Long.valueOf(JwtUtil.getEnterpriseId(token)), JwtUtil.getSourceName(token), SecurityConstants.INNER);
+            map.put("enterpriseName", loginInfoResult.getData().getEnterpriseName());
+            map.put("staff", json.get("data"));
             return AjaxResult.success(map);
         }
     }