Merge remote-tracking branch 'origin/master'

jsjp-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptUserInfoController.java

@@ -206,7 +206,7 @@ public class GzptUserInfoController extends BaseController {
     /**
      * 解绑学员微信绑定关系
      */
-    @PutMapping("/unBindGzptUserOpenid")
+    @PostMapping("/unBindGzptUserOpenid")
     @ApiOperation("解绑学员微信绑定关系")
     public Response unBindGzptUserOpenid(@RequestBody GzptUserLoginDTO GzptUserLoginDTO) {
         return userInfoService.unBindGzptUserOpenid(GzptUserLoginDTO);

jsjp-service/src/main/java/com/miaxis/newgzpt/mapper/GzptUserInfoMapper.java

@@ -43,4 +43,6 @@ public interface GzptUserInfoMapper extends BaseMapper<GzptUserInfo> {
     int updateGzptUserOpenid(GzptUserInfoBindDTO userInfoBindDTO);
 
     GzptUserInfo getUserInfoByOpenid(String openid);
+
+    int getUserInfoCountByOpenid(String openid);
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/service/impl/GzptUserInfoServiceImpl.java

@@ -88,16 +88,21 @@ public class GzptUserInfoServiceImpl extends ServiceImpl<GzptUserInfoMapper, Gzp
     public Response bindGzptUserOpenid(GzptUserInfoBindDTO userInfoBindDTO) {
 
         GzptUserLoginDTO userLoginDto = new GzptUserLoginDTO();
-        String passMd5 = MD5Utils.MD5Encode(userInfoBindDTO.getPassword());
-        userInfoBindDTO.setPassword(passMd5);
         BeanUtils.copyProperties(userInfoBindDTO,userLoginDto);
+        int userInfoExist = mapper.getUserInfoCountByOpenid(userInfoBindDTO.getOpenid()); //微信是否已绑定
+
+        if(userInfoExist>0) {
+            Response response = new Response(50004,"该微信已绑定过学员，请解绑后再次绑定。");
+            return response;
+        }
+
         GzptUserInfo gzptUserInfo = mapper.getUserByLoginCodeAndPw(userLoginDto);  //查询帐号是否绑定过
         if(gzptUserInfo!=null) {
             if(!StringUtils.isEmpty(gzptUserInfo.getOpenId())) {
                 Response response = new Response(50002,"该学员账号已绑定微信，请解绑后再次绑定。");
                 return response;
             }
-        } else {
+        }  else {
             Response response = new Response(50003,"用户不存在或用户密码错误");
             return response;
         }
@@ -116,8 +121,6 @@ public class GzptUserInfoServiceImpl extends ServiceImpl<GzptUserInfoMapper, Gzp
     public Response unBindGzptUserOpenid(GzptUserLoginDTO userLoginDTO) {
 
         GzptUserInfoBindDTO userInfoBindDTO = new GzptUserInfoBindDTO();
-        String passMd5 = MD5Utils.MD5Encode(userLoginDTO.getPassword());
-        userLoginDTO.setPassword(passMd5);
         BeanUtils.copyProperties(userLoginDTO,userInfoBindDTO);
         GzptUserInfo gzptUserInfo = mapper.getUserByLoginCodeAndPw(userLoginDTO);  //查询帐号是否绑定过
         if(gzptUserInfo==null) {

jsjp-service/src/main/resources/mapper/newgzpt/GzptUserInfoMapper.xml

@@ -88,10 +88,11 @@
     </select>
 
     <select id="getUserInfoByOpenid" resultType="com.miaxis.newgzpt.domain.GzptUserInfo">
-
         select * from GZPT_USER_INFO where open_id =#{openid,jdbcType=VARCHAR}
-
     </select>
 
+    <select id="getUserInfoCountByOpenid" resultType="Integer">
+        select count(*) from GZPT_USER_INFO where open_id =#{openid,jdbcType=VARCHAR}
+    </select>
 
 </mapper>