From 2ba431be9c12a79783e0f9ef249292b7fa95f2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 一月 2021 19:13:58 +0800
Subject: [PATCH] 拼多多备案调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 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 9f34446..4d5e92d 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.util.*;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -71,13 +72,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;
import org.yeshi.utils.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.ThreadUtil;
import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
@@ -298,7 +293,7 @@
auditRecord.setBeforeMoney(user.getMyHongBao());
auditRecord.setExtract(extract);
- Date minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);
+ Date minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60L * 24 * 180);
extractAuditRecordMapper.insertSelective(auditRecord);
@@ -310,12 +305,12 @@
int less10Count = commonOrderCountService.countOderByUidAndLess10(user.getId());
ExtractAuditRecord update = new ExtractAuditRecord();
update.setId(auditRecord.getId());
- int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(),
- minTime);
+ int orderCountBigMoneyOrder = orderUserStatisticService.countOrderMoneyMoreByUidAndMinTime(user.getId(),
+ minTime, OrderConstant.BIG_ORDER_MONEY);
BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),
minTime);
int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);
- update.setExtraInfoStr(new Gson().toJson(new ExtractOrderStatisticDTO(orderCount50More,
+ update.setExtraInfoStr(new Gson().toJson(new ExtractOrderStatisticDTO(orderCountBigMoneyOrder,
weiQuanOrderCount, weiQuanOrderFanAmount, 0, less10Count)));
extractAuditRecordMapper.updateByPrimaryKeySelective(update);
}
@@ -443,14 +438,12 @@
*
* @param extract
* @param msg
- * @param session
*/
- @Transactional
- private void extractFail(Extract extract, String msg) {
+ private void extractFail(Extract extract, String subCode, String msg) {
UserInfo user = extract.getUserInfo();
// MoneyRecord moneyRecord = new MoneyRecord(user, null, extract
// .getMoney(), "鎻愮幇", "鎻愮幇澶辫触", new Date().getTime(), 3);
- if ("浠樻鏂逛綑棰濅笉瓒�".equals(msg)) {
+ if ("PAYER_BALANCE_NOT_ENOUGH".equals(subCode)) {
Extract updateExtract = new Extract();
updateExtract.setId(extract.getId());
updateExtract.setState(Constant.EXTRACT_DEFUALT);
@@ -676,10 +669,10 @@
if ("10000".equals(code)) {
extractSuccess(extract, response.getOrderId());
} else {
- extractFail(extract, response.getSubMsg());
+ extractFail(extract, response.getSubCode(), response.getSubMsg());
}
} else {
- extractFail(extract, response.getSubMsg());
+ extractFail(extract, response.getSubCode(), response.getSubMsg());
}
PayInfo payInfo = new PayInfo();
payInfo.setBizno(response.getOutBizNo());
--
Gitblit v1.8.0