From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 8a0c186..0e6a85c 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
@@ -15,6 +15,7 @@
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.util.*;
+import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -148,6 +149,9 @@
@Resource
private CommonOrderCountService commonOrderCountService;
+
+ @Resource
+ private RabbitmqManager rabbitmqManager;
@Transactional
public Integer addExtract(Extract extract) {
@@ -349,7 +353,6 @@
* @param extract
* @param session
*/
- @Transactional
private void transfer(Extract extract, AdminUser adminUser) {
Integer type = extract.getType();
if (Constant.ZHIFUBAO == type) {
@@ -406,6 +409,15 @@
return 0;
}
+ private String getOrderPrefix(SystemEnum system) {
+ if (system == SystemEnum.yhqjx) {
+ return "TJ";
+ } else if (system == SystemEnum.hsb) {
+ return "HSB";
+ }
+ return "";
+ }
+
/**
* 鎻愮幇鍒版敮浠樺疂
*
@@ -413,7 +425,6 @@
* @param session
*/
// TODO 杞处閫昏緫闇�瑕佹敼鍙橈紝鍥哄畾IP
- @Transactional
private void extractByZhiFuBao(Extract extract, AdminUser adminUser) {
LogHelper.userErrorInfo("鎻愮幇:寮�濮嬮�氳繃鎻愮幇-" + extract.getId());
//鑾峰彇鐢ㄦ埛鐨勭郴缁�
@@ -422,7 +433,7 @@
//澶囨敞
String remark = appName + "APP娓犻亾鎻愮幇";
//鐞嗙敱
- String reason = String.format("鐢ㄦ埛ID銆�%s銆戝彂璧风殑鎻愮幇", user.getSystem() == SystemEnum.yhqjx ? "TJ" + user.getId() : user.getId() + "");
+ String reason = String.format("鐢ㄦ埛ID銆�%s銆戝彂璧风殑鎻愮幇", getOrderPrefix(user.getSystem()) + user.getId());
AlipayFundTransUniTransferResponse response = null;
try {
@@ -434,7 +445,7 @@
}
try {
- CMQManager.getInstance().addExtractResultMsg(extract, response, adminUser);
+ rabbitmqManager.addExtractResultMsg(extract, response, adminUser);
LogHelper.userErrorInfo("鎻愮幇:娣诲姞澶勭悊闃熷垪鎴愬姛-" + extract.getId());
} catch (Exception e) {
LogHelper
@@ -452,7 +463,7 @@
UserInfo user = extract.getUserInfo();
// MoneyRecord moneyRecord = new MoneyRecord(user, null, extract
// .getMoney(), "鎻愮幇", "鎻愮幇澶辫触", new Date().getTime(), 3);
- if ("PAYER_BALANCE_NOT_ENOUGH".equals(subCode)) {
+ if ("PAYER_BALANCE_NOT_ENOUGH".equals(subCode) || "BALANCE_IS_NOT_ENOUGH".equals(subCode)) {
Extract updateExtract = new Extract();
updateExtract.setId(extract.getId());
updateExtract.setState(Constant.EXTRACT_DEFUALT);
@@ -506,7 +517,6 @@
* @param extract
* @param session
*/
- @Transactional
private void extractSuccess(Extract extract, String alipayNo) {
// 鑰佺増鏈姛鑳�
// List<MoneyRecord> list = moneyRecordDao.list("from MoneyRecord mr
--
Gitblit v1.8.0