From 7264440b34122ed0d1c5482d4c9fabaa8dd9f691 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 28 五月 2019 12:31:46 +0800
Subject: [PATCH] 站内信推送打开的页面修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
index 23003de..7afddd7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -47,6 +47,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.ExtractRecordService;
@@ -123,6 +124,9 @@
@Resource
private UserAccountBindingHistoryService userAccountBindingHistoryService;
+
+ @Resource
+ private UserMoneyDebtService userMoneyDebtService;
@Transactional
public Integer addExtract(Extract extract) {
@@ -237,7 +241,7 @@
.getLatestHistory(extract.getUserInfo().getId(), UserAccountBindingHistory.TYPE_PHONE);
// 鎵嬫満鍙锋洿鎹㈢粦瀹氱殑7澶╁唴涓嶈兘鎻愮幇
if (history != null && !history.getFirst()
- && (System.currentTimeMillis() - history.getCreateTime().getTime()) > 1000 * 60 * 60 * 24 * 7L)
+ && (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L)
return 111;
final String autoExtract = configService.get("extract_way"); // 鏄惁鑷姩杞处
@@ -250,10 +254,17 @@
return 3;
}
+ // 鏈夊�熻捶鍏崇郴
+ boolean isHaveToReplay = userMoneyDebtService.isHaveDebtToRepay(extract.getUserInfo().getId());
+ if (isHaveToReplay) {
+ return 110;
+ }
+
Integer type = setExtractRecord(extract, maxCount, maxMoney);
if (type != 0) {
return type;
}
+
extractMapper.insertSelective(extract);
ExtractAuditRecord auditRecord = new ExtractAuditRecord();
@@ -283,7 +294,8 @@
if ("鏄�".equals(autoExtract)) {
LogHelper.userInfo("uid=" + user.getId() + ",鎻愪氦杞处鐢宠!");
} else {// 鏆傛椂涓嶈嚜鍔ㄦ彁鐜�
- transfer(extract, null);
+ // transfer(extract, null);
+ ;
}
return null;
}
@@ -366,15 +378,15 @@
Constant.alipayConfig.getAppId(), privateKey, "json", "gbk", null, "RSA2");
AlipayFundTransToaccountTransferRequest request = new AlipayFundTransToaccountTransferRequest();
String uuid = UUID.randomUUID().toString().replace("-", "");
- String appName = systemConfigService.get("appName", extract.getSystem());
+ 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", extract.getAccount());
json.put("amount", extract.getMoney());
- json.put("payer_show_name", appName + "鎻愮幇");
+ json.put("payer_show_name", appName + "App" + "鎻愮幇");
json.put("payee_real_name", extract.getName());
- json.put("remark", "鏉ヨ嚜" + appName + "鐨勬彁鐜�");
+ json.put("remark", "鏉ヨ嚜" + appName + "App" + "鐨勬彁鐜�");
request.setBizContent(json.toString());
AlipayFundTransToaccountTransferResponse response = null;
try {
@@ -503,9 +515,18 @@
@Transactional
@Override
public void checkExtract(Long uid) throws ExtractException {
+ BigDecimal compensateMoney = extractMapper.computeCompensateByUid(uid);
+ if (compensateMoney == null)
+ compensateMoney = new BigDecimal(0);
+ // 涓嶅垽瀹氬埌璐︾孩鍖呴棶棰�
Long count = hongBaoV2Mapper.countByUidAndState(uid, HongBao.STATE_YILINGQU);
- if (count == null || count == 0)
+ if ((count == null || count == 0) && compensateMoney.compareTo(new BigDecimal(0)) == 0) {
throw new ExtractException(1, "娌℃湁宸插埌璐︾殑绾㈠寘");
+ }
+ // 鏌ヨ鏄惁鏈夋瑺璐�
+ boolean isDebt = userMoneyDebtService.isHaveDebtToRepay(uid);
+ if (isDebt)
+ throw new ExtractException(3, "鏈夋瑺璐︽湭杩�");
// 鑾峰彇鎵�鏈夋敹鍏ユ墍寰�
BigDecimal hongBaoMoney = hongBaoV2Service.computeMoneyByUidAndState(uid, HongBaoV2.STATE_YILINGQU);
@@ -530,10 +551,6 @@
weiqaunMoney = weiqaunMoney.abs();
BigDecimal balance = userInfoService.selectByPKey(uid).getMyHongBao();
-
- BigDecimal compensateMoney = extractMapper.computeCompensateByUid(uid);
- if (compensateMoney == null)
- compensateMoney = new BigDecimal(0);
BigDecimal after = hongBaoMoney.subtract(extractMoney.add(weiqaunMoney).add(balance).add(compensateMoney));
--
Gitblit v1.8.0