金币任务多次获取bug修改

admin

2019-08-27 fe879975a3e8a0a1aa280fb839e02d159bfbcff8

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpSession;



import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.JsonUtil;

@@ -33,6 +34,7 @@
import com.yeshi.fanli.entity.bus.user.UserConnectHistory;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

@@ -47,6 +49,7 @@
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

@@ -108,7 +111,12 @@


   @Resource

   private JedisPool jedisPool;



	
	
   @Lazy

   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

	
   @Transactional

   @Override

   public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,

@@ -703,6 +711,14 @@
      } catch (Exception e) {

         e.printStackTrace();

      }

		
		
      if (!StringUtil.isNullOrEmpty(user.getPhone())) 
         userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, user.getPhone());

		
      if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) 
         userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, user.getWxUnionId());

		
   }



   @Override

@@ -727,6 +743,9 @@
      update.setPhone(phone);

      userInfoMapper.updateByPrimaryKeySelective(update);

      userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

		
		
      userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, phone);

   }



   @Override

@@ -841,6 +860,9 @@
      userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);



      userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);

		
		
      userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, weiXinUser.getUnionid());

   }



   @Override

@@ -992,6 +1014,7 @@
         if (exec == null || exec.size() == 0) {

            throw new UserAccountException(10, "请稍后再试");

         } else {

				
            // 查询是否存在该电话历史用户

            UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByPhone(phone);

            if (userInfo != null) {

@@ -1014,12 +1037,16 @@
               } catch (Exception e) {

                  e.printStackTrace();

               }

					
               userInfoModifyRecordService.addModifyRecord(userInfo.getId(), ModifyTypeEnum.bindPhone, phone);

            }

			
            return userInfo;

         }

      } catch (Exception e) {

         e.printStackTrace();

      } finally {

         jedis.del(watchKey);

         jedis.unwatch();

         jedisPool.returnResource(jedis);

      }

@@ -1096,12 +1123,15 @@
               } catch (Exception e) {

                  e.printStackTrace();

               }

					
               userInfoModifyRecordService.addModifyRecord(userInfo.getId(), ModifyTypeEnum.bindWeiXin, weiXinUser.getUnionid());

            }

            return userInfo;

         }

      } catch (Exception e) {

         e.printStackTrace();

      } finally {

         jedis.del(watchKey);

         jedis.unwatch();

         jedisPool.returnResource(jedis);

      }

@@ -1160,6 +1190,9 @@


      // 发送消息

      userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

		
      userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, phone);

		
   }



   @Override

@@ -1228,6 +1261,9 @@
      userAccountBindingHistoryService.addUserAccountBindingHistory(history);



      userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);

		
		
      userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, wxUnionId);

   }



   @Override