From 0922bfdb56bc30125d6fc8e13c50cdda7cd9dc72 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 九月 2019 18:59:52 +0800
Subject: [PATCH] 提现自动绑定修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
index b091997..b01eedd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
@@ -37,6 +37,7 @@
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
import com.yeshi.fanli.vo.money.UserMoneyStatisticVO;
@@ -303,23 +304,41 @@
}
});
- // 鑾峰彇鎻愮幇涓殑淇℃伅
- BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
- if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
- vo.setExtractingMoneyInfo("鎻愮幇涓�:楼" + extractingMoney.setScale(2));
- // 鑾峰彇鏄惁缁戝畾浜嗗井淇�
- if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
- vo.setBindingWX(true);
- } else
- vo.setBindingWX(false);
+ if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ // 鑾峰彇鎻愮幇涓殑淇℃伅
+ BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
+ if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
+ vo.setExtractingMoneyInfo("鎻愮幇涓�:楼" + extractingMoney.setScale(2));
+ // 鑾峰彇鏄惁缁戝畾浜嗗井淇�
+ if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
+ vo.setBindingWX(true);
+ } else
+ vo.setBindingWX(false);
- UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
- if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)
- vo.setAutoExtract(true);
- else
- vo.setAutoExtract(false);
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+ // 濡傛灉缁戝畾浜嗗井淇¤�屼笖鏈紑閫氳嚜鍔ㄦ彁鐜板氨鍏堝紑閫氳嚜鍔ㄦ彁鐜�
+ if (extra.getAutoExtract() == null && !StringUtil.isNullOrEmpty(user.getWxUnionId())) {
+ UserInfoExtra update = new UserInfoExtra();
+ update.setId(extra.getId());
+ update.setAutoExtract(true);
+ try {
+ userInfoExtraService.saveUserInfoExtra(update);// 璁剧疆鑷姩鎻愮幇寮�鍚�
+ extra.setAutoExtract(true);
+ } catch (UserInfoExtraException e) {
+ e.printStackTrace();
+ }
+ }
- vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));
+ if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)
+ vo.setAutoExtract(true);
+ else
+ vo.setAutoExtract(false);
+
+ vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));
+ vo.setOpenAutoExtractMsg("鑷姩鎻愮幇蹇呴』瑕佸井淇℃巿鏉冿紝褰撹处鎴蜂腑鐨勪綑棰濃墺2鍏冩椂锛岀郴缁熷湪淇濋殰浣犺祫閲戝畨鍏ㄧ殑鎯呭喌涓嬶紝浠ュ井淇＄孩鍖呯殑褰㈠紡瀹屾垚鎻愮幇");
+ vo.setCloseAutoExtractMsg("鍏抽棴鑷姩鎻愮幇鍚庯紝60澶╀互鍐呭皢涓嶈嚜鍔ㄦ彁鐜帮紝60澶╁悗绯荤粺灏嗕細鑷姩寮�鍚紝鏁鐭ユ檽");
+ }
+
out.print(JsonUtil.loadTrueResult(builder.create().toJson(vo)));
}
--
Gitblit v1.8.0