From 856d99bb5adf7f8670206b01750bc0260b8666d2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 二月 2023 15:36:55 +0800
Subject: [PATCH] 修复客户端特价首页商品列表无数据的问题
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 074abee..21a51d2 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
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.util.*;
import org.dom4j.Document;
import org.dom4j.DocumentException;
@@ -348,7 +349,6 @@
* @param extract
* @param session
*/
- @Transactional
private void transfer(Extract extract, AdminUser adminUser) {
Integer type = extract.getType();
if (Constant.ZHIFUBAO == type) {
@@ -405,6 +405,15 @@
return 0;
}
+ private String getOrderPrefix(SystemEnum system) {
+ if (system == SystemEnum.yhqjx) {
+ return "TJ";
+ } else if (system == SystemEnum.hsb) {
+ return "HSB";
+ }
+ return "";
+ }
+
/**
* 鎻愮幇鍒版敮浠樺疂
*
@@ -412,12 +421,19 @@
* @param session
*/
// TODO 杞处閫昏緫闇�瑕佹敼鍙橈紝鍥哄畾IP
- @Transactional
private void extractByZhiFuBao(Extract extract, AdminUser adminUser) {
LogHelper.userErrorInfo("鎻愮幇:寮�濮嬮�氳繃鎻愮幇-" + extract.getId());
+ //鑾峰彇鐢ㄦ埛鐨勭郴缁�
+ UserInfo user = userInfoMapper.selectByPrimaryKey(extract.getUserInfo().getId());
+ String appName = user.getSystem().getName();
+ //澶囨敞
+ String remark = appName + "APP娓犻亾鎻愮幇";
+ //鐞嗙敱
+ String reason = String.format("鐢ㄦ埛ID銆�%s銆戝彂璧风殑鎻愮幇", getOrderPrefix(user.getSystem()) + user.getId());
+
AlipayFundTransUniTransferResponse response = null;
try {
- response = AlipayUtil.transferNoThrowException("widthdraw_" + extract.getId(), extract.getAccount(), extract.getName(), extract.getMoney(), "鏉挎牀蹇渷鎻愮幇鍒拌处", "鏉ヨ嚜鏉挎牀蹇渷鐨勬彁鐜�");
+ response = AlipayUtil.transferNoThrowException("widthdraw_" + extract.getId(), extract.getAccount(), extract.getName(), extract.getMoney(), remark, reason);
LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濋�氳繃鎻愮幇鎴愬姛-" + extract.getId());
} catch (AlipayApiException e) {
LogHelper.errorDetailInfo(e, "鏀粯瀹濊浆璐﹀紓甯�:" + extract.getId(), "");
@@ -443,7 +459,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);
@@ -497,7 +513,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