From 81a2c8e297787cc7dc405d6db4972cb917cd80b5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 一月 2020 16:50:57 +0800
Subject: [PATCH] 无用代码删除，单品分享接口修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
index d8147f1..d57ec05 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
@@ -2,8 +2,10 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
import java.math.BigDecimal;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -28,13 +30,18 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;
import com.yeshi.fanli.entity.redpack.RedPackExchange;
import com.yeshi.fanli.entity.redpack.RedPackWinInvite;
import com.yeshi.fanli.entity.redpack.RedPackWinInvite.RedPackWinInviteTypeEnum;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.redpack.RedPackExchangeException;
import com.yeshi.fanli.exception.redpack.RedPackGiveRecordException;
+import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
@@ -47,10 +54,13 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.UserInviteUtil;
+import com.yeshi.fanli.util.email.MailSenderUtil;
import com.yeshi.fanli.vo.redpack.RedPackDetailVO;
import com.yeshi.fanli.vo.redpack.RedPackGiveVO;
import com.yeshi.fanli.vo.redpack.RedPackWinInviteVO;
@@ -97,11 +107,16 @@
@Resource
private RedPackForbidService redPackForbidService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+ @Resource
+ private ConfigService configService;
+ @Resource
+ private AdminUserService adminUserService;
+
/**
* 缁熻
*
@@ -299,23 +314,22 @@
}
}
-
@RequestMapping(value = "getGiveList", method = RequestMethod.POST)
public void getGiveList(AcceptData acceptData, Integer page, Long uid, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
- if (page == null || page <= 0)
+
+ if (page == null || page <= 0)
page = 1;
-
+
try {
List<RedPackGiveVO> list = redPackGiveRecordService.getGiveList(page, Constant.PAGE_SIZE, uid);
-
+
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy.MM.dd HH:mm").create();
-
+
JSONObject data = new JSONObject();
data.put("list", gson.toJson(list));
data.put("count", redPackGiveRecordService.countGiveList(uid));
@@ -326,8 +340,6 @@
}
}
-
-
/**
* 杞崲绾㈠寘涓虹湡瀹為噾閽�
*
@@ -346,6 +358,35 @@
try {
redPackExchangeService.exchangeCash(uid, amount);
out.print(JsonUtil.loadTrueResult("鎻愮幇鐢宠鎴愬姛"));
+
+ 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();
+ }
+
+ long[] targetUids = new long[] { 3L, 4L };
+ Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey());
+ String[] sts = config.getValue().split(",");
+ String account = sts[0];
+ String pwd = sts[1];
+ for (long adminId : targetUids) {
+ AdminUser adminUser = adminUserService.selectByPrimaryKey(adminId);
+ String msg = "鏈夌敤鎴烽噰鐢ㄧ孩鍖呭厬鎹㈢幇閲�";
+ boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "绾㈠寘鍏戞崲鐜伴噾鎻愰啋", msg);
+ }
+ }
+ });
+
} catch (RedPackExchangeException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
@@ -425,12 +466,12 @@
data.put("redPackLock", redPackForbidService.verifyForbid(uid));
String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
- if ( !StringUtil.isNullOrEmpty(inviteCode)) {
+ if (!StringUtil.isNullOrEmpty(inviteCode)) {
data.put("inviteCode", inviteCode);
} else {
data.put("inviteCode", "");
}
-
+
// 璧犻�佸厤鍗曞埜
long freeCouponCount = userSystemCouponService.countGiveFreeCoupon(uid);
// 濂栧姳鍒�
@@ -446,8 +487,6 @@
}
}
-
-
/**
* 璇ョ敤鎴烽個璇峰閲戞
*
@@ -456,27 +495,27 @@
* @param out
*/
@RequestMapping(value = "getInviteReward")
- public void getInviteReward(AcceptData acceptData,Integer page, Long uid, String callback, PrintWriter out) {
+ public void getInviteReward(AcceptData acceptData, Integer page, Long uid, String callback, PrintWriter out) {
if (uid == null || uid <= 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (page == null || page < 1)
page = 1;
-
+
List<RedPackWinProgressVO> listVO = new ArrayList<RedPackWinProgressVO>();
List<RedPackWinInvite> list = redPackWinInviteService.getWinTopListByBossId(page, Constant.PAGE_SIZE, uid);
if (list != null) {
- for (RedPackWinInvite win: list) {
+ for (RedPackWinInvite win : list) {
ThreeSale threeSale = threeSaleSerivce.getNearRelationByBossIdAndWorkerId(uid, win.getTeamUid());
if (threeSale == null)
continue;
-
+
UserInfo userInfo = userInfoService.selectByPKey(win.getTeamUid());
if (userInfo == null)
continue;
-
+
RedPackWinProgressVO progressVO = new RedPackWinProgressVO();
progressVO.setUid(userInfo.getId());
progressVO.setName(userInfo.getNickName());
@@ -486,7 +525,7 @@
listVO.add(progressVO);
}
}
-
+
JSONObject data = new JSONObject();
data.put("list", listVO);
data.put("count", redPackWinInviteService.countWinTopListByBossId(uid));
@@ -496,8 +535,7 @@
out.print(JsonUtil.loadTrueResult(data));
}
}
-
-
+
/**
* 璇ョ敤鎴烽個璇疯繘搴�
*
@@ -511,7 +549,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "浼犻�掑弬鏁扮己澶�"));
return;
}
-
+
JSONObject data = new JSONObject();
data.put("list", redPackWinInviteService.getInviteProgressByWorkerId(uid, tid));
data.put("num", redPackWinInviteService.countTeamNumByTid(uid, tid));
--
Gitblit v1.8.0