教练APP微信登录 接口调整

jsjp-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -35,7 +35,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -185,9 +187,18 @@ public class SysLoginController
         coachInfoOpenidDTO.setCity(city);
         coachInfoOpenidDTO.setOpenid(wxUserInfo.getOpenid());
 
-
         TmsCoachInfoVo tmsCoachInfoVo = coachInfoService.getCoachInfoByOpenid(coachInfoOpenidDTO);
-        return Response.success(tmsCoachInfoVo) ;
+
+        Map<String,Object> resultMap = new HashMap();
+        if(tmsCoachInfoVo==null){
+            resultMap.put("openid",wxUserInfo.getOpenid());
+            resultMap.put("coach",null);
+            return Response.success(resultMap);
+        } else {
+            resultMap.put("openid",null);
+            resultMap.put("coach",tmsCoachInfoVo);
+            return Response.success(resultMap) ;
+        }
 
     }
 

jsjp-service/src/main/java/com/miaxis/tms/dto/TmsCoachInfoBindDTO.java

@@ -16,7 +16,7 @@ public class TmsCoachInfoBindDTO implements Serializable {
     @ApiModelProperty(value = "登录密码")
     private String password;
 
-    @ApiModelProperty(value = "微信openid")
+    @ApiModelProperty(value = "微信openid",hidden = true)
     private String openid;
 
     @ApiModelProperty(value = "地区编号",required = true)
@@ -24,4 +24,5 @@ public class TmsCoachInfoBindDTO implements Serializable {
 
 
 
+
 }

jsjp-service/src/main/java/com/miaxis/tms/service/impl/TmsCoachInfoServiceImpl.java

@@ -1,16 +1,25 @@
 package com.miaxis.tms.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.annotation.DataSource;
 import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.WxUserInfo;
+import com.miaxis.common.core.domain.model.WxResult;
 import com.miaxis.common.enums.DataSourceTypeEnum;
+import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.StringUtils;
+import com.miaxis.feign.service.IWxService;
 import com.miaxis.tms.domain.TmsCoachInfo;
 import com.miaxis.tms.dto.*;
 import com.miaxis.tms.mapper.TmsCoachInfoMapper;
 import com.miaxis.tms.service.ITmsCoachInfoService;
 import com.miaxis.tms.vo.TmsCoachInfoVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,6 +40,8 @@ public class TmsCoachInfoServiceImpl extends ServiceImpl<TmsCoachInfoMapper, Tms
     @Resource
     TmsCoachInfoMapper mapper;
 
+    private static Logger logger = LoggerFactory.getLogger(TmsCoachInfoServiceImpl.class);
+
     @Override
     public TmsCoachInfoVo getCoachInfoById(TmsCoachInfoIdDTO coaDto) {
         return  mapper.getCoachInfoById(coaDto);
@@ -64,11 +75,10 @@ public class TmsCoachInfoServiceImpl extends ServiceImpl<TmsCoachInfoMapper, Tms
 
     @Override
     public Response bindCoachOpenid(TmsCoachInfoBindDTO coachInfoBindDTO) {
+
         TmsCoachInfoDTO coaDto = new TmsCoachInfoDTO();
         BeanUtils.copyProperties(coachInfoBindDTO,coaDto);
-
-        TmsCoachInfoVo coachInfoVo = mapper.getCoachBylogin(coaDto);
-
+        TmsCoachInfoVo coachInfoVo = mapper.getCoachBylogin(coaDto);  //查询帐号是否绑定过
         if(coachInfoVo!=null) {
             if(!StringUtils.isEmpty(coachInfoVo.getOpenid())) {
                 Response response = new Response(502,"该教练员账号已绑定微信，请解绑后再次绑定。");