Merge remote-tracking branch 'origin/master'

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/UserLoginDao.java

@@ -29,4 +29,6 @@ public interface UserLoginDao extends BaseMapper<UserEntity> {
     String getTokenByUserId(Long userId);
 
     Boolean updateUserLogin(@Param("userId") Long userId, @Param("date") Date date);
+
+    Integer countWeChatId(String weChatId);
 }

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java

@@ -169,6 +169,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
             loginLog.setNewestTime(new Date());
             loginLogService.updateById(loginLog);
         }
+
         // 更新用户登录信息
         this.getBaseMapper().updateUserLogin(userEntity.getId(),new Date());
 

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java

@@ -130,7 +130,7 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
      */
     @Override
     public Boolean weChatBinding(String code, HttpServletResponse response,String state) {
-
+        //String md5Code = Md5Util.md5(code);
         String accessTokenUrl = String.format(weChatConfig.getOPEN_ACCESS_TOKEN_URL(),weChatConfig.getOpenAppid(),weChatConfig.getOpenAppsecret(),code);
 
         //获取access_token
@@ -139,10 +139,20 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
             return false;
         }
         String openId  = (String) baseMap.get("openid");
-        Boolean result = this.getBaseMapper().updateWeChat(Long.parseLong(state), openId);
+        String md5OpenId = Md5Util.md5(openId);
+        Integer countWeChatId = this.getBaseMapper().countWeChatId(md5OpenId);
+        String token = this.getBaseMapper().getTokenByUserId(Long.parseLong(state));
+        if (countWeChatId > 0){
+            try {
+                response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token+"&message=1");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        Boolean result = this.getBaseMapper().updateWeChat(Long.parseLong(state), md5OpenId);
         log.info("绑定成功---------------------------------------");
         if (result){
-            String token = this.getBaseMapper().getTokenByUserId(Long.parseLong(state));
+
             if (token != null){
                 try {
                     log.info("转发成功---------------------------------------");

dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml

@@ -58,4 +58,8 @@
         UPDATE hrms_user SET login_num = login_num + 1,lasttime = #{date} WHERE id = #{userId}
     </update>
 
+    <select id="countWeChatId" parameterType="string" resultType="integer">
+        SELECT COUNT(id) FROM hrms_user WHERE wechat_id = #{weChatId}
+    </select>
+
 </mapper>