From 8e30aa7c1f0384f09278699318b4902b815b42a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2019 18:01:25 +0800
Subject: [PATCH] 维权返利初步修改,拼多多初步增加

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..1a448a8 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
@@ -237,7 +237,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"); // 鏄惁鑷姩杞处
@@ -366,15 +366,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 {

--
Gitblit v1.8.0