From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 195 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 59 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index 8325c04..a6d3c50 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1,15 +1,16 @@
package com.yeshi.fanli.controller.client;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Type;
import java.math.BigDecimal;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
import javax.annotation.Resource;
@@ -50,6 +51,9 @@
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.common.Config;
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
@@ -57,8 +61,8 @@
import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.goods.CollectionGoodsV2;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
@@ -82,6 +86,7 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.WxDownService;
+import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.HongBaoUtil;
@@ -91,6 +96,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.account.UserUtil;
+import com.yeshi.fanli.util.email.MailSenderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
@@ -172,6 +178,9 @@
@Resource
private CollectionGoodsV2Service collectionGoodsV2Service;
+
+ @Resource
+ private AdminUserService adminUserService;
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -773,7 +782,7 @@
ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);
boolean canExtract = true;
String errorMsg = "";
- if (extractRecord != null && extractRecord.getCount() + 1 >= maxDayCount) {
+ if (extractRecord != null && extractRecord.getCount() + 1 > maxDayCount) {
canExtract = false;
errorMsg = String.format("姣忔棩鏈�澶氭彁鐜�%s娆�", maxDayCount + "");
} else if (extractRecord != null
@@ -1236,6 +1245,30 @@
JSONObject data = new JSONObject();
data.put("id", extract.getId());
out.print(JsonUtil.loadTrueResult(data));
+ ThreadUtil.run(new Runnable() {
+
+ @Override
+ public void run() {
+ JSONObject json = new JSONObject();
+ json.put("timeStamp", java.lang.System.currentTimeMillis());
+ json.put("adminId", 4L);
+ String sign = AESUtil.encrypt(json.toString(), Constant.ADMINH5_AESKEY);
+ String url="";
+ try {
+ url = String.format("%s?from=emailh5&sign=%s",
+ Constant.systemCommonConfig.getExtractNotifyUrl(), URLEncoder.encode(sign, "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ AdminUser adminUser = adminUserService.selectByPrimaryKey(4L);
+ Config config = configService.getConfig("extract_code_email_from");
+ String[] sts = config.getValue().split(",");
+ String account = sts[0];
+ String pwd = sts[1];
+ String msg = "鎻愮幇瀹℃牳閾炬帴:" + url;
+ boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "鏈夋柊鐨勬彁鐜板鏍�", msg);
+ }
+ });
return;
} else if (etype == 1) {
out.print(JsonUtil.loadFalseResult("宸茶秴杩囧綋鏃ユ彁鐜版鏁�"));
@@ -1505,15 +1538,13 @@
// collectionGoodsService.findCollectionGoods(uid, page + 1);
long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);
JSONObject data = new JSONObject();
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
collectionGoodsList.parallelStream().forEachOrdered(cg -> {
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());
goodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(goodsBrief.getBiz30day()));
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,
- fcRate, "");
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
+ proportion.toString(), "");
taoBaoGoodsBriefExtra.setCreatetime(cg.getCreateTime());
list.add(taoBaoGoodsBriefExtra);
});
@@ -1643,6 +1674,42 @@
resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
}
+ // 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
+ String platform = acceptData.getPlatform();
+ if ("android".equalsIgnoreCase(platform)) {
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
+ long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
+
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
+ long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
+
+ JSONObject bossData = null;
+ ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
+ if (threeSale != null) {
+ bossData = new JSONObject();
+ UserInfo boss = threeSale.getBoss();
+ if (boss != null) {
+ bossData.put("nickName", boss.getNickName());
+ bossData.put("portrait", boss.getPortrait());
+ }
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ Long createTime = threeSale.getCreateTime();
+ Date inviteTime = new Date(createTime);
+ bossData.put("inviteTime", "閭�璇锋椂闂�: " + sdf.format(inviteTime));
+ }
+
+ String helpLink = configService.get("team_help_url");
+ if (helpLink == null) {
+ helpLink = "";
+ }
+ resultData.put("helpLink", helpLink);
+ resultData.put("firstTeam", firstTeam);
+ resultData.put("firstTeamTotal", firstTeamTotal);
+ resultData.put("secondTeam", secondTeam);
+ resultData.put("secondTeamTotal", secondTeamTotal);
+ resultData.put("boss", bossData);
+ }
out.print(JsonUtil.loadTrueResult(resultData));
}
@@ -1661,11 +1728,9 @@
long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
-
JSONObject bossData = new JSONObject();
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
if (threeSale != null) {
-
UserInfo boss = threeSale.getBoss();
if (boss != null) {
bossData.put("nickName", boss.getNickName());
@@ -1705,42 +1770,49 @@
* @param out
*/
@RequestMapping(value = "setextrainfo", method = RequestMethod.POST)
- public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String nickname, PrintWriter out) {
+ public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
- if (listThreeSale == null || listThreeSale.size() == 0) {
- out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
- return;
+ try {
+ List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
+ if (listThreeSale == null || listThreeSale.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+ return;
+ }
+
+ UserInfo worker = listThreeSale.get(0).getWorker();
+ if (worker == null) {
+ out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+ return;
+ }
+
+ List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());
+ if (list == null || list.size() == 0) {
+
+ ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();
+ extraInfo.setWorker(worker);
+ extraInfo.setNickname(memoName);
+ extraInfo.setCreateTime(new Date());
+ extraInfo.setUpdateTime(new Date());
+
+ UserInfo boss = new UserInfo(uid);
+ extraInfo.setBoss(boss);
+
+ threeSaleExtraInfoSerivce.insert(extraInfo);
+
+ } else {
+ ThreeSaleExtraInfo extraInfo = list.get(0);
+ extraInfo.setNickname(memoName);
+ extraInfo.setUpdateTime(new Date());
+ threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
+ }
+
+ out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
}
- UserInfo worker = listThreeSale.get(0).getWorker();
- if (worker == null) {
- out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
- return;
- }
-
- List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());
- if (list == null || list.size() == 0) {
-
- ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();
- extraInfo.setWorker(worker);
- extraInfo.setNickname(nickname);
- extraInfo.setCreateTime(new Date());
- extraInfo.setUpdateTime(new Date());
-
- UserInfo boss = new UserInfo(uid);
- extraInfo.setBoss(boss);
-
- threeSaleExtraInfoSerivce.insert(extraInfo);
-
- } else {
- ThreeSaleExtraInfo extraInfo = list.get(0);
- extraInfo.setNickname(nickname);
- extraInfo.setUpdateTime(new Date());
- threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
- }
-
- out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
}
/**
@@ -1754,25 +1826,30 @@
*/
@RequestMapping(value = "removethreesale", method = RequestMethod.POST)
public void removethreesale(AcceptData acceptData, long uid, long inviteId, PrintWriter out) {
+ try {
+ List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
+ if (listThreeSale == null || listThreeSale.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
+ return;
+ }
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
- if (listThreeSale == null || listThreeSale.size() == 0) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
- return;
+ UserInfo worker = listThreeSale.get(0).getWorker();
+ if (worker == null) {
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
+ return;
+ }
+
+ // 鍒犻櫎鍏崇郴
+ threeSaleSerivce.deleteByPrimaryKey(inviteId);
+ // 鍒犻櫎澶囨敞
+ threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());
+
+ out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ e.printStackTrace();
}
- UserInfo worker = listThreeSale.get(0).getWorker();
- if (worker == null) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
- return;
- }
-
- // 鍒犻櫎鍏崇郴
- threeSaleSerivce.deleteByPrimaryKey(inviteId);
- // 鍒犻櫎澶囨敞
- threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());
-
- out.print(JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
}
}
--
Gitblit v1.8.0