From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java |   31 +++++--------------------------
 1 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
index 3355e84..c10d9f9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
@@ -4,7 +4,6 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 import javax.annotation.Resource;
 
@@ -14,8 +13,9 @@
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.request.AlipayFundTransToaccountTransferRequest;
+import com.alipay.api.request.AlipayFundTransUniTransferRequest;
 import com.alipay.api.response.AlipayFundTransToaccountTransferResponse;
+import com.alipay.api.response.AlipayFundTransUniTransferResponse;
 import com.yeshi.fanli.dao.mybatis.AlipayAccountValidNormalHistoryMapper;
 import com.yeshi.fanli.dao.mybatis.BindingAccountMapper;
 import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
@@ -38,6 +38,7 @@
 import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;
 import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
 import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;
+import com.yeshi.fanli.util.AlipayUtil;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
@@ -197,31 +198,9 @@
 
 	private void transferAlipayWithVerify(String account, String name)
 			throws AlipayTransferException, AlipayApiException {
-		String privateKey = Constant.alipayConfig.getPrivateKey();
-		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
-				Constant.alipayConfig.getAppId(), privateKey, "json", "gbk", null, "RSA2");
-		AlipayFundTransToaccountTransferRequest request = new AlipayFundTransToaccountTransferRequest();
-		String uuid = UUID.randomUUID().toString().replace("-", "");
+		String outBizNo=StringUtil.Md5(account)+TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd");
 		String appName = Constant.systemCommonConfig.getProjectChineseName();
-		JSONObject json = new JSONObject();
-		json.put("out_biz_no", uuid);
-		json.put("payee_type", "ALIPAY_LOGONID");
-		json.put("payee_account", account);
-		json.put("amount", "0.1");
-		json.put("payer_show_name", appName + "鏀粯瀹濋獙璇�");
-		json.put("payee_real_name", name);
-		json.put("remark", "鏉ヨ嚜" + appName + "鐨勬敮浠樺疂楠岃瘉鎵撴");
-		request.setBizContent(json.toString());
-		AlipayFundTransToaccountTransferResponse response = null;
-		response = alipayClient.execute(request);
-		// 鎴愬姛杞处
-		if (response != null && response.isSuccess() && "10000".equals(response.getCode())) {
-			return;
-		} else// 杞处澶辫触
-		{
-			throw new AlipayTransferException(Integer.parseInt(response.getCode()), response.getSubCode(),
-					response.getSubMsg());
-		}
+		AlipayUtil.transfer(outBizNo, account, name, new BigDecimal("0.1"), appName + "鏀粯瀹濋獙璇�", "鏉ヨ嚜" + appName + "鐨勬敮浠樺疂楠岃瘉鎵撴");
 	}
 
 	@Transactional(rollbackFor=Exception.class)

--
Gitblit v1.8.0