From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java | 38 ++++++++++++--------------------------
1 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
index f824710..8faef37 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
@@ -25,10 +25,8 @@
import org.yeshi.utils.wx.WXPayUtil;
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.response.AlipayFundTransToaccountTransferResponse;
+import com.alipay.api.response.AlipayFundTransUniTransferResponse;
import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.dao.mybatis.AlipayAccountValidNormalHistoryMapper;
@@ -58,6 +56,7 @@
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.exception.money.UserMoneyDetailException;
+import com.yeshi.fanli.exception.user.AlipayTransferException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
@@ -74,6 +73,7 @@
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.util.AlipayUtil;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -82,8 +82,6 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
-
-import net.sf.json.JSONObject;
@Service
public class ExtractServiceImpl implements ExtractService {
@@ -273,9 +271,6 @@
&& (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L)
return 111;
- final String autoExtract = configService.get(ConfigKeyEnum.extractWay.getKey()); // 鏄惁鑷姩杞处
- final String maxCount = configService.get(ConfigKeyEnum.extractDayCount.getKey());
- final String maxMoney = configService.get(ConfigKeyEnum.extractMoneyDay.getKey());
UserInfo user = userInfoMapper.selectByPrimaryKeyForUpdate(extract.getUserInfo().getId());
// 浣欓涓嶈冻
@@ -288,6 +283,11 @@
if (isHaveToReplay) {
return 110;
}
+
+ final String autoExtract = configService.getValue(ConfigKeyEnum.extractWay.getKey(),user.getSystem()); // 鏄惁鑷姩杞处
+ final String maxCount = configService.getValue(ConfigKeyEnum.extractDayCount.getKey(),user.getSystem());
+ final String maxMoney = configService.getValue(ConfigKeyEnum.extractMoneyDay.getKey(),user.getSystem());
+
Integer type = setExtractRecord(extract, maxCount, maxMoney);
if (type != 0) {
@@ -424,23 +424,9 @@
@Transactional
private void extractByZhiFuBao(Extract extract, AdminUser adminUser) {
LogHelper.userErrorInfo("鎻愮幇:寮�濮嬮�氳繃鎻愮幇-" + extract.getId());
- 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 appName = Constant.systemCommonConfig.getProjectChineseName();
- JSONObject json = new JSONObject();
- json.put("out_biz_no", "widthdraw_" + extract.getId());// 鏈�闀块暱搴�64浣嶏紝鏀寔鑻辨枃锛屼笅鍒掔嚎锛屾暟瀛�
- json.put("payee_type", "ALIPAY_LOGONID");
- json.put("payee_account", extract.getAccount());
- json.put("amount", extract.getMoney());
- json.put("payer_show_name", appName);
- json.put("payee_real_name", extract.getName());
- json.put("remark", "鏉ヨ嚜閲嶅簡蹇渷绉戞妧鏈夐檺鍏徃");
- request.setBizContent(json.toString());
- AlipayFundTransToaccountTransferResponse response = null;
+ AlipayFundTransUniTransferResponse response = null;
try {
- response = alipayClient.execute(request);
+ response = AlipayUtil.transferNoThrowException("widthdraw_" + extract.getId(), extract.getAccount(), extract.getName(), extract.getMoney(), "鏉挎牀蹇渷鎻愮幇鍒拌处", "鏉ヨ嚜鏉挎牀蹇渷鐨勬彁鐜�");
LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濋�氳繃鎻愮幇鎴愬姛-" + extract.getId());
} catch (AlipayApiException e) {
LogHelper.errorDetailInfo(e, "鏀粯瀹濊浆璐﹀紓甯�:" + extract.getId(), "");
@@ -656,7 +642,7 @@
public void processExtractResult(AlipayTransferResultInfo info) {
if (info == null)
return;
- AlipayFundTransToaccountTransferResponse response = info.getAlipayFundTransToaccountTransferResponse();
+ AlipayFundTransUniTransferResponse response = info.getAlipayFundTransUniTransferResponse();
Extract extract = info.getExtract();
AdminUser admin = info.getAdminUser();
if (response == null)
@@ -688,7 +674,7 @@
payInfo.setState(2);
}
payInfo.setOrderId(response.getOrderId());
- payInfo.setOrdertime(response.getPayDate());
+ payInfo.setOrdertime(response.getTransDate());
payInfo.setInfo(response.getSubMsg());
payInfoMapper.insertSelective(payInfo);
--
Gitblit v1.8.0