删除老版密码输入错误的相关代码

admin

2019-03-15 c9f28b430799cc8d40c7a7d99fd0f0eeecff6a5c

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

@@ -21,17 +21,12 @@
import com.qcloud.cos.model.COSObjectSummary;

import com.qcloud.cos.model.ObjectListing;

import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.dao.mybatis.BindingAccountMapper;

import com.yeshi.fanli.dao.mybatis.UserConnectHistoryMapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderMapper;

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

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

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

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

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

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

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

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

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

@@ -40,6 +35,7 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService;

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

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

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

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

@@ -60,16 +56,10 @@
   private UserInfoMapper userInfoMapper;



   @Resource

   private BindingAccountMapper bindingAccountMapper;

   private BindingAccountService bindingAccountService;



   @Resource

   private UserConnectHistoryMapper userConnectHistoryMapper;



   @Resource

   private OrderMapper orderMapper;



   @Resource

   private OrderItemMapper orderItemMapper;



   @Resource

   private ThreeSaleSerivce threeSaleSerivce;

@@ -480,27 +470,16 @@
         throw new UserAccountException(10, String.format("账户ID:%s 的资金超过10元，为保证资金安全请联系客服打通", lessUser.getId() + ""));



      // 判定是否绑定了同一支付宝

      List<BindingAccount> mainUserAccountList = bindingAccountMapper.selectByUid(mainUser.getId());

      if (mainUserAccountList != null)

         for (int i = 0; i < mainUserAccountList.size(); i++) {

            if (mainUserAccountList.get(i).getType() == BindingAccount.TYPE_WXPAY) {

               mainUserAccountList.remove(i);

               i--;

            }

         }

      List<BindingAccount> lessUserAccountList = bindingAccountMapper.selectByUid(lessUser.getId());

      if (lessUserAccountList != null)

         for (int i = 0; i < lessUserAccountList.size(); i++) {

            if (lessUserAccountList.get(i).getType() == BindingAccount.TYPE_WXPAY) {

               lessUserAccountList.remove(i);

               i--;

            }

         }

      BindingAccount mainUserAccount = bindingAccountService.getBindingAccountByUidAndType(mainUser.getId(),

            BindingAccount.TYPE_ALIPAY);



      BindingAccount lessUserAccount = bindingAccountService.getBindingAccountByUidAndType(lessUser.getId(),

            BindingAccount.TYPE_ALIPAY);



      // 有不同的支付宝账号

      boolean hasDiffrentAlipayAccount = false;

      if (mainUserAccountList != null && mainUserAccountList.size() > 0 && lessUserAccountList != null

            && lessUserAccountList.size() > 0) {

         if (!mainUserAccountList.get(0).getAccount().equalsIgnoreCase(lessUserAccountList.get(0).getAccount()))

      if (mainUserAccount != null && lessUserAccount != null) {

         if (!mainUserAccount.getAccount().equalsIgnoreCase(lessUserAccount.getAccount()))

            hasDiffrentAlipayAccount = true;

      }



@@ -833,9 +812,6 @@
      UserInfo user = userInfoMapper.selectByPrimaryKey(uid);



      // TODO 备份资金明细

      // 备份订单，子订单信息

      List<Order> orderList = orderMapper.selectByUid(uid);

      List<OrderItem> orderItemList = orderItemMapper.selectByUid(uid);



      // 备份邀请关系

      List<ThreeSale> threeSaleList = new ArrayList<>();

@@ -847,12 +823,6 @@


         fw.write("#UserInfo" + "\r\n");

         fw.write(JsonUtil.getSimpleGsonWithDate().toJson(user) + "\r\n");



         fw.write("#Order" + "\r\n");

         fw.write(JsonUtil.getSimpleGsonWithDate().toJson(orderList) + "\r\n");



         fw.write("#OrderItem" + "\r\n");

         fw.write(JsonUtil.getSimpleGsonWithDate().toJson(orderItemList) + "\r\n");



         fw.write("#ThreeSale" + "\r\n");

         fw.write(JsonUtil.getSimpleGsonWithDate().toJson(threeSaleList) + "\r\n");