From 061e912ff3cec51f8f8dcb4e6336bcd2fc03c164 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 28 四月 2020 17:53:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 441 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 440 insertions(+), 1 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 5c155f0..ad08e56 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
@@ -1,6 +1,13 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -10,22 +17,44 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
+import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
+import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
+import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.entity.push.DeviceActive;
+import com.yeshi.fanli.entity.shop.BanLiShopOrder;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.UserAccountException;
+import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
+import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
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;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenXMService;
+import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.BindRemindService;
@@ -36,17 +65,27 @@
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
+import com.yeshi.fanli.service.inter.user.vip.TearcherService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.vo.user.UserVipRateVO;
import net.sf.json.JSONObject;
@@ -94,6 +133,9 @@
private DeviceTokenOPPOService deviceTokenOPPOService;
@Resource
+ private DeviceTokenXMService deviceTokenXMService;
+
+ @Resource
private DeviceTokenVIVOService deviceTokenVIVOService;
@Resource
@@ -135,6 +177,43 @@
@Resource
private BindRemindService bindRemindService;
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private HongBaoV2CountService hongBaoV2CountService;
+
+ @Resource
+ private IntegralDetailService integralDetailService;
+
+ @Resource
+ private BanLiShopOrderService banLiShopOrderService;
+
+ @Resource
+ private ConfigService configService;
+
+ @Resource
+ private UserVipConfigService userVipConfigService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private UserMoneyDetailService userMoneyDetailService;
+
+ @Resource
+ private UserInviteService userInviteService;
+
+ @Resource
+ private UserInviteValidNumService userInviteValidNumService;
+
+ @Resource
+ private CommonOrderService commonOrderService;
+
+ @Resource
+ private TearcherService tearcherService;
+
+
/**
* 鏂扮増鐧诲綍 V1.5.3
*
@@ -174,6 +253,7 @@
} else {
JSONObject data = new JSONObject();
data.put("userInfo", UserUtil.filterForClientUser(userInfo));
+ data.put("inviteCode", userInfoExtraService.getInviteCodeByUid(userInfo.getId()));
out.print(JsonUtil.loadTrueResult(data));
final UserInfo uuser = userInfo;
@@ -192,6 +272,7 @@
if (active != null) {
deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenXMService.bindUid(active.getId(), uuser.getId());
}
}
});
@@ -209,7 +290,7 @@
} else {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
try {
- LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+ LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -302,4 +383,362 @@
out.print(JsonUtil.loadTrueResult("璁板綍鎴愬姛"));
}
+ /**
+ * 鑾峰彇vip淇℃伅
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getVIPInfo")
+ public void getVIPInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ if (userInfo == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇ョ敤鎴蜂笉瀛樺湪"));
+ return;
+ }
+ //
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+
+ UserVipRateVO vo = new UserVipRateVO();
+ vo.setId(uid);
+ vo.setInviteCode(inviteCode);
+ vo.setNickName(userInfo.getNickName());
+ vo.setPortrait(userInfo.getPortrait());
+ vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));
+ vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+
+ Date now = new Date();
+ Date start = new Date(0);
+
+ // 杩斿埄璁㈠崟銆佸鍔卞埜鎻愭垚
+ List<UserMoneyDetailTypeEnum> typeFanli = new ArrayList<>();
+ typeFanli.add(UserMoneyDetailTypeEnum.fanli);
+ typeFanli.add(UserMoneyDetailTypeEnum.orderReward);
+ BigDecimal finishMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeFanli, start, now)
+ .abs();
+
+ // 閭�璇疯鍗曘�佸垎浜鍗曘�佽ˉ璐�
+ List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();
+ typeList.add(UserMoneyDetailTypeEnum.share);
+ typeList.add(UserMoneyDetailTypeEnum.invite);
+ typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+ typeList.add(UserMoneyDetailTypeEnum.systemEqualize);
+ typeList.add(UserMoneyDetailTypeEnum.subsidy);
+ BigDecimal rewardMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, start, now).abs();
+
+ UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);
+ vo.setVipInfo(userVIPInfo);
+ String leftTime = "";
+ if (userVIPInfo != null && userVIPInfo.getApplyTime() != null) {
+ // TODO 璁＄畻鏃堕棿
+ long s = 48 * 60 * 60 - ((System.currentTimeMillis() - userVIPInfo.getApplyTime().getTime()) / 1000);
+ if (s > 3600) {
+ leftTime = s / 3600 + "灏忔椂";
+ leftTime = "杩樺墿" + leftTime;
+ } else if (s >= 60) {
+ leftTime = s / 60 + "鍒嗛挓";
+ leftTime = "杩樺墿" + leftTime;
+ } else if (s > 0) {
+ leftTime = s + "绉�";
+ leftTime = "杩樺墿" + leftTime;
+ }
+ }
+ vo.setLeftTime(leftTime);
+
+ if (userVIPInfo != null && userVIPInfo.getState() != null
+ && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) { // VIP
+ vo.setSuccessTime(TimeUtil.getGernalTime(userVIPInfo.getSuccessTime().getTime(), "yyyy.MM.dd"));
+ vo.setConserveMoney(finishMoney);
+ vo.setEarnMoney(rewardMoney);
+ } else {
+ BigDecimal rate = new BigDecimal("0.409");
+ vo.setConserveMoney(MoneyBigDecimalUtil.mul2(finishMoney, rate));
+ vo.setEarnMoney(MoneyBigDecimalUtil.mul2(rewardMoney, rate));
+ }
+ vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid));
+
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(BanLiShopOrder.STATE_SUCCESS);
+ BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
+
+ vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString()));
+
+// vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
+// , payMoney));
+
+ int finishTeam = 0;
+ long vipBegin = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+ List<ThreeSale> listThreeSale = threeSaleSerivce.getValidWorkerIdsByTime(uid, vipBegin);
+ if (listThreeSale != null && listThreeSale.size() > 0) {
+ for (ThreeSale three: listThreeSale) {
+ UserInfo worker = three.getWorker();
+ if (worker == null || worker.getId() == null) {
+ continue;
+ }
+ // 1銆侀個璇峰叧绯绘垚鍔熷悗锛�2銆佸崟锛堝垎浜� + 鑷喘锛夊疄浠樻澶т簬1鍏�
+ long countValid = commonOrderService.countOrderByUidAndSettled(worker.getId(), payMoney);
+ if (countValid > 0) {
+ finishTeam ++;
+ }
+ }
+ }
+ vo.setFinishTeam(finishTeam);
+ vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
+
+ // 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
+ String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
+ Date executeDate = null;
+ try {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-mm-dd");
+ executeDate = format.parse(limtDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+ if (extra != null
+ && (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {
+ vo.setLimitTeam(Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user")));
+ } else {
+ vo.setLimitTeam(Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user")));
+ }
+ vo.setLimitHongBao(Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));
+ vo.setLimitMoney(new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));
+ vo.setLimitgoldCoin(Long.parseLong(userVipConfigService.getValueByKey("require_gold_coin")));
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
+ @Override
+ public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ // 淇濈暀2浣嶅皬鏁�
+ value = value.setScale(2);
+ return new JsonPrimitive(value.toString());
+ }
+ }
+ });
+ Gson gson = gsonBuilder.create();
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(vo))));
+ } else {
+ out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
+ }
+ }
+
+ /**
+ * 寮�閫歏IP
+ *
+ * @param callback
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "applyVip")
+ public void applyVip(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ try {
+ userVIPInfoService.applyVIP(uid);
+ } catch (UserVIPInfoException e) {
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMsg())));
+ } else {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ }
+ return;
+ }
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("鐢宠鎴愬姛锛屾鍦ㄥ彈鐞嗕腑")));
+ } else {
+ out.print(JsonUtil.loadTrueResult("鐢宠鎴愬姛锛屾鍦ㄥ彈鐞嗕腑"));
+ }
+ }
+
+
+
+ /**
+ * 鑾峰彇vip淇℃伅
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getVIPInfoV2")
+ public void getVIPInfoV2(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ // 鐢ㄦ埛淇℃伅
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ if (userInfo == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇ョ敤鎴蜂笉瀛樺湪"));
+ return;
+ }
+ // 鑾峰彇绛夌骇
+ UserInviteLevelEnum level = userInviteService.getUserInviteLevelNew(uid);
+
+ // 杈句汉
+ long limitOrder = 0;
+ long limitFirst = 0;
+ long limitSecond = 0;
+ if (level == UserInviteLevelEnum.actived || level == UserInviteLevelEnum.noActive) {
+ String orderCount = userVipConfigService.getValueByKey("vip_pre_7_order_count");
+ if (!StringUtil.isNullOrEmpty(orderCount)) {
+ limitOrder = Long.parseLong(orderCount);
+ }
+ String first = userVipConfigService.getValueByKey("vip_pre_7_first_level_team_count");
+ if (!StringUtil.isNullOrEmpty(first)) {
+ limitFirst = Long.parseLong(first);
+ }
+ String second = userVipConfigService.getValueByKey("vip_pre_7_second_level_team_count");
+ if (!StringUtil.isNullOrEmpty(second)) {
+ limitSecond = Long.parseLong(second);
+ }
+ } else if (level == UserInviteLevelEnum.highVIP || level == UserInviteLevelEnum.vipApply) {
+ String orderCount = userVipConfigService.getValueByKey("vip_pre_10_order_count");
+ if (!StringUtil.isNullOrEmpty(orderCount)) {
+ limitOrder = Long.parseLong(orderCount);
+ }
+ String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");
+ if (!StringUtil.isNullOrEmpty(first)) {
+ limitFirst = Long.parseLong(first);
+ }
+ String second = userVipConfigService.getValueByKey("vip_pre_10_second_level_team_count");
+ if (!StringUtil.isNullOrEmpty(second)) {
+ limitSecond = Long.parseLong(second);
+ }
+ } else if (level == UserInviteLevelEnum.vip || level == UserInviteLevelEnum.tearcherApply) {
+ // TODO 姣斾緥
+
+ } else if (level == UserInviteLevelEnum.tearcher) {
+ // TODO
+ }
+
+ // 鑷喘璁㈠崟
+ long doneOrder = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY);
+ // 鏈夋晥绮変笣
+ int doneFirst = 0;
+ int doneSecond = 0;
+ UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+ if (userInviteValidNum != null) {
+ doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+ doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
+ }
+
+ Date now = new Date();
+ Date start = new Date(0);
+ // 鐪侀挶锛� ---杩斿埄璁㈠崟銆佸鍔卞埜鎻愭垚
+ List<UserMoneyDetailTypeEnum> typeFanli = new ArrayList<>();
+ typeFanli.add(UserMoneyDetailTypeEnum.fanli);
+ typeFanli.add(UserMoneyDetailTypeEnum.orderReward);
+ BigDecimal saveMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeFanli, start, now).abs();
+
+ // 璧氶挶锛� 閭�璇疯鍗曘�佸垎浜鍗曘�佽ˉ璐�
+ List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();
+ typeList.add(UserMoneyDetailTypeEnum.share);
+ typeList.add(UserMoneyDetailTypeEnum.invite);
+ typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+ typeList.add(UserMoneyDetailTypeEnum.systemEqualize);
+ typeList.add(UserMoneyDetailTypeEnum.subsidy);
+ BigDecimal earnMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, start, now).abs();
+ if (level != UserInviteLevelEnum.vip) {
+ BigDecimal rate = new BigDecimal("0.409");
+ saveMoney = MoneyBigDecimalUtil.mul2(saveMoney, rate);
+ earnMoney = MoneyBigDecimalUtil.mul2(earnMoney, rate);
+ }
+
+ String shareRate = "鍙韩浣ｉ噾鐨�<label style=\"color:#E5005C;\">%s</label>";
+ String teamRate = "鏈�楂樹剑閲戠殑<label style=\"color:#E5005C;\">%s</label>";
+ // 杈句汉鐗�
+ JSONObject jsonrRed1 = new JSONObject();
+ jsonrRed1.put("enjoyRate", String.format(shareRate, "145%"));
+ jsonrRed1.put("teamRate", String.format(teamRate, "25%"));
+ jsonrRed1.put("teamIncome", "楂樼骇浼氬憳浠ヤ笂涓撳睘");
+
+ // 楂樼骇浼氬憳
+ JSONObject jsonrRed2 = new JSONObject();
+ jsonrRed2.put("enjoyRate", String.format(shareRate, "195%"));
+ jsonrRed2.put("teamRate", String.format(teamRate, "50%"));
+ jsonrRed2.put("teamIncome", "浜珮绾у洟闃熸敹鐩�");
+
+ // 瓒呯骇浼氬憳
+ JSONObject jsonrRed3 = new JSONObject();
+ jsonrRed3.put("enjoyRate", String.format(shareRate, "210%"));
+ jsonrRed3.put("teamRate", String.format(teamRate, "110%"));
+ jsonrRed3.put("teamIncome", "浜秴绾у洟闃熸敹鐩�");
+
+
+ JSONObject json = new JSONObject();
+ json.put("level", level.name());
+ json.put("nickName", userInfo.getNickName());
+ json.put("portrait", userInfo.getPortrait());
+ json.put("ruleLink", userVipConfigService.getValueByKey("help_link_vip_h5"));
+ json.put("saveMoney", saveMoney);
+ json.put("earnMoney", earnMoney);
+
+ String tearcherWX = "";
+ TearcherInfo tearcherInfo = tearcherService.selectByUid(uid);
+ if (tearcherInfo != null && !StringUtil.isNullOrEmpty(tearcherInfo.getWxID())) {
+ tearcherWX = tearcherInfo.getWxID();
+ }
+ json.put("tearcherWX", tearcherWX);
+ json.put("tearcherTip", "鎴戞槸浣犵殑瀵煎笀锛屼负浣犲湪鐪佽禋杩囩▼涓В闅剧瓟鐤戯紝瀵逛綘涓�瀵逛竴杈呭锛屽�惧惉浣犵殑闇�姹傛�荤粨骞跺弽棣堢粰鏉挎牀蹇渷瀹樻柟杩愯惀鍥㈤槦锛屽揩鏉ユ坊鍔犳垜鍚с��");
+ json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
+
+ // 宸插畬鎴�
+ json.put("doneOrder", doneOrder);
+ json.put("doneFirst", doneFirst);
+ json.put("doneSecond", doneSecond);
+
+ // 鏍囧噯
+ json.put("limitOrder", limitOrder);
+ json.put("limitFirst", limitFirst);
+ json.put("limitSecond", limitSecond);
+
+ // 宸插畬鎴�
+ json.put("daRen", jsonrRed1);
+ json.put("highVIP", jsonrRed2);
+ json.put("superVIP", jsonrRed3);
+
+ // 浜哄伐瀹㈡湇閾炬帴
+ json.put("csdLink", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+
+ UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);
+ String leftTime = "";
+ if (userVIPInfo != null && userVIPInfo.getState() == UserVIPInfo.STATE_VERIFING && userVIPInfo.getApplyTime() != null) {
+ long s = 48 * 60 * 60 - ((System.currentTimeMillis() - userVIPInfo.getApplyTime().getTime()) / 1000);
+ if (s > 3600) {
+ leftTime = s / 3600 + "灏忔椂";
+ leftTime = "杩樺墿" + leftTime;
+ } else if (s >= 60) {
+ leftTime = s / 60 + "鍒嗛挓";
+ leftTime = "杩樺墿" + leftTime;
+ } else if (s > 0) {
+ leftTime = s + "绉�";
+ leftTime = "杩樺墿" + leftTime;
+ }
+ }
+ json.put("leftTime", leftTime);
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(json));
+ }
+ }
+
}
--
Gitblit v1.8.0