From 77cd7f9358cc62d70249a78ee33c7626d4bdc5b5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 27 四月 2020 11:12:16 +0800
Subject: [PATCH] 导师微信号随机
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index 7f253b6..f9ab73d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -45,6 +45,7 @@
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
+import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
@@ -203,6 +204,9 @@
@Resource
private UserInviteValidNumService userInviteValidNumService;
+
+ @Resource
+ private CommonOrderService commonOrderService;
/**
@@ -473,7 +477,7 @@
continue;
}
// 1銆侀個璇峰叧绯绘垚鍔熷悗锛�2銆佸崟锛堝垎浜� + 鑷喘锛夊疄浠樻澶т簬1鍏�
- long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);
+ long countValid = commonOrderService.countOrderByUidAndSettled(worker.getId(), payMoney);
if (countValid > 0) {
finishTeam ++;
}
@@ -682,7 +686,19 @@
json.put("earnMoney", earnMoney);
json.put("tearcherTip", "鎴戞槸浣犵殑瀵煎笀锛屼负浣犲湪鐪佽禋杩囩▼涓В闅剧瓟鐤戯紝瀵逛綘涓�瀵逛竴杈呭锛屽�惧惉浣犵殑闇�姹傛�荤粨骞跺弽棣堢粰鏉挎牀蹇渷瀹樻柟杩愯惀鍥㈤槦锛屽揩鏉ユ坊鍔犳垜鍚с��");
- json.put("tearcherWX", userVipConfigService.getValueByKey("tearcher_weixin_num"));
+
+
+ String tearcherWX = "";
+ String wxs = userVipConfigService.getValueByKey("tearcher_weixin_num");
+ if (!StringUtil.isNullOrEmpty(wxs)) {
+ String[] array = wxs.split(",");
+ if (array != null && array.length > 0) {
+ int pos = (int) (Math.random() * array.length);
+ tearcherWX = array[pos];
+ }
+ }
+
+ json.put("tearcherWX", tearcherWX);
json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
// 宸插畬鎴�
--
Gitblit v1.8.0