Exception 位置移动

yujian

2019-09-03 2ddf5b8a1290123e2d1c05bcc851ec35cd217afc

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java

@@ -21,15 +21,16 @@
import com.yeshi.fanli.entity.bus.user.LoginResult;

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

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.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TBPid;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.AlipayAccountException;

import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.exception.UserAccountException;

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

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

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -51,6 +52,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;

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

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

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

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

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

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

@@ -141,16 +143,18 @@


   @Resource

   private UserAccountBindingHistoryService userAccountBindingHistoryService;

	


   @Resource

   private HomeNavbarUserService homeNavbarUserService;

	


   @Resource

   private UserInfoDeleteRecordService userInfoDeleteRecordService;

	


   @Resource

   private UserTaoLiJinOriginService userTaoLiJinOriginService;

   

   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -920,8 +924,6 @@
      }

      redisManager.cacheCommonString(key, "1", 120);



		


      // 支付宝绑定

      ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService

            .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.alipayAccount, account);

@@ -940,9 +942,17 @@
            "PERM_AML_NOT_REALNAME_REV", "PAYEE_USER_INFO_ERROR", "PAYEE_ACC_OCUPIED",

            "PERMIT_CHECK_PERM_IDENTITY_THEFT", "PERMIT_NON_BANK_LIMIT_PAYEE", "EXCEED_LIMIT_UNRN_DM_AMOUNT" };

      try {

         BigDecimal balance = user.getMyHongBao();

         BindingAccount bindingAccount = bindingAccountService.changeAlipayBindingWithVerify(uid, name, account);

         out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),

               "系统已成功转账0.1元到提现账号中，提现账号验证通过，恭喜你！可以提现了。"));

         // 余额充足

         if (balance.compareTo(new BigDecimal("0.1")) >= 0)

            out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),

                  "系统已成功转账0.1元到提现账号中，提现账号验证通过，恭喜你！可以提现了。"));

         else

            out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),

                  "系统已成功转账0.1元到提现账号中，提现账号验证通过，恭喜你！可以提现了。注：此0.1元将会在后续产生的余额中合理扣除，敬请知晓。"));

			
         userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindAlipay, account);

      } catch (AlipayTransferException e1) {

         if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {

            String msg = "系统未能成功转账0.1元，提现账号信息有误，请核对后重新填写。";

@@ -1166,7 +1176,7 @@
                  } catch (Exception e) {

                     LogHelper.errorDetailInfo(e);

                  }

						


                  /* 同步未登录之前设备抽奖数据 */

                  try {

                     int platformType = 0;

@@ -1180,15 +1190,15 @@
                  } catch (Exception e) {

                     e.printStackTrace();

                  }

						


                  if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

                     /* 新人红包 */

                     try {

                        userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(),  device);

                        userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);

                     } catch (Exception e) {

                        e.printStackTrace();

                     }

                  } 
                  }

               }

            });

         }