From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期二, 18 十二月 2018 11:17:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java index b782423..e00b5c5 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java @@ -153,7 +153,7 @@ UserInfo userInfo = userInfoMapper.selectByPrimaryKeyForUpdate(uid); if (userInfo.getMyHongBao().compareTo(new BigDecimal("0")) <= 0) - throw new AlipayAccountException(AlipayAccountException.CODE_NO_MONEY, "浣犵殑璐︽埛鐩墠娌℃湁浣欓锛屾殏鏃朵笉鑳界粦瀹氭敮浠樺疂鎻愮幇"); + throw new AlipayAccountException(AlipayAccountException.CODE_NO_MONEY, "浣犵殑璐︽埛鐩墠娌℃湁浣欓锛屾棤闇�缁戝畾鎻愮幇甯愬彿銆�"); // 闇�瑕佽浆璐﹂獙璇� BigDecimal money = new BigDecimal("0.1"); @@ -246,7 +246,7 @@ public boolean canVerifyAlipayAccount(Long uid) throws BindingAccountException { UserInfo userInfo = userInfoMapper.selectByPrimaryKeyForUpdate(uid); if (userInfo.getMyHongBao().compareTo(new BigDecimal("0")) <= 0) - throw new BindingAccountException(1, "璐︽埛鏃犱綑棰�"); + throw new BindingAccountException(1, "浣犵殑璐︽埛鐩墠娌℃湁浣欓锛屾棤闇�缁戝畾鎻愮幇甯愬彿銆�"); AlipayAccountValidNormalHistory latest = alipayAccountValidNormalHistoryMapper.selectLatestByUid(uid); if (latest != null) { @@ -254,7 +254,7 @@ caLatest.setTimeInMillis(latest.getCreateTime().getTime()); Calendar nowLatest = Calendar.getInstance(); if (caLatest.get(Calendar.MONTH) == nowLatest.get(Calendar.MONTH))// 涓婃鏇存敼鍜岀幇鍦ㄦ槸鍚屼竴涓湀 - throw new BindingAccountException(2, "鏈湀鏀粯瀹濈粦瀹氭鏁拌秴闄�"); + throw new BindingAccountException(2, "姣忔湀浠呭彲淇敼1娆℃彁鐜拌处鍙凤紝璇蜂笅鏈堝啀璇曞惂銆�"); } return true; } -- Gitblit v1.8.0