From 511983beb4ecf452f821fd85be497710959cb4cd Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 25 六月 2019 11:04:42 +0800
Subject: [PATCH] 调整淘礼金
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
index 37d8c72..7a46a6f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -31,7 +32,6 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail.TaoLiJinDetailTypeEnum;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -128,6 +128,8 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
/**
* 鑾峰彇娣樼ぜ閲戝垎浜褰�
@@ -372,7 +374,8 @@
data.put("content", "鑷喘鐩存帴鎶电幇锛屼紭鎯犵湡瀹炲彲瑙侊紒");
data.put("type", 1);
data.put("money", money.setScale(2).toString());
- data.put("usage", "棰嗗彇鎴愬姛锛屽幓鈥滈椤�-鍒嗕韩鐖嗘鈥濅娇鐢�>");
+ data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘");
+ data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));
data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));
@@ -406,7 +409,8 @@
data.put("content", "鑷喘鐩存帴鎶电幇锛屼紭鎯犵湡瀹炲彲瑙侊紒");
data.put("type", 1);
data.put("money", hasMoney.setScale(2).toString());
- data.put("usage", "棰嗗彇鎴愬姛锛屽幓鈥滈椤�-鍒嗕韩鐖嗘鈥濅娇鐢�>");
+ data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘");
+ data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));
@@ -422,11 +426,12 @@
UserRank userRank = userInfoExtraService.gerUserRank(uid);
if (userRank != null) {
try {
- isRank = true;
UserTaoLiJinOrigin origin = userTaoLiJinOriginService.addRankWinMoney(uid, userRank);
hasMoney = origin.getMoney();
+ isRank = true;
} catch (UserTaoLiJinOriginException e) {
if (e.getCode() != 2) {
+ isRank = false;
out.print(JsonUtil.loadFalseResult(e.getMsg()));
return;
}
@@ -440,7 +445,7 @@
data.put("content", "鎺ㄥ箍绾㈠寘锛屽ソ鍙嬬鍒╋紒");
data.put("type", 2);
data.put("money", "鏈湀璐︽埛绛夌骇鏈揪鍒癨r\n缁х画鍔犳补");
- data.put("usage", "鍘烩�滄垜鐨�-璐︽埛绛夌骇鈥濇煡鐪� >");
+ data.put("jumpName", "鍘绘煡鐪�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("user_rank"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_not_enough_tip"));
out.print(JsonUtil.loadTrueResult(data));
@@ -450,8 +455,9 @@
data.put("content", "鎺ㄥ箍绾㈠寘锛屽ソ鍙嬬鍒╋紒");
data.put("type", 1);
data.put("money", hasMoney.setScale(2).toString());
- data.put("usage", "宸插瓨鍏モ�滄垜鐨�-鎺ㄥ箍绾㈠寘鈥濓紝鍘绘煡鐪� >");
- data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("user_taolijin"));
+ data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘");
+ data.put("jumpName", "鍘讳娇鐢�");
+ data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));
}
@@ -495,6 +501,14 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
boolean isNewUser = userInfoExtraService.isNewUser(uid);
+ if (isNewUser) {
+ // 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
+ long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
+ if (countRecord > 0) {
+ isNewUser = false;
+ }
+ }
+
BigDecimal proportion = hongBaoManageService.getFanLiRate();
for (QualityFactory qualityFactory : listFreeGoods) {
@@ -505,29 +519,33 @@
TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
- // 鏄剧ず绫诲瀷
- if (isNewUser) {
- extra.setMoneyType(1);
- } else {
- extra.setMoneyType(2);
- }
-
- // 鍘绘帀鏍囩
- extra.setLabels(null);
-
BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoGoodsBrief);
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
if (spreadMoney.compareTo(new BigDecimal(1)) < 0) {
continue;
}
-
- extra.setSpreadMoney("鎺ㄥ箍绾㈠寘 楼"+ spreadMoney);
+ // 鍘绘帀鏍囩
+ extra.setLabels(null);
+
+ // 鏄剧ず绫诲瀷
+ if (isNewUser) {
+ extra.setMoneyType(1);
+ extra.setSpreadMoney("鎺ㄥ箍绾㈠寘 楼"+ 1);
+ } else {
+ extra.setMoneyType(2);
+ extra.setSpreadMoney("鎺ㄥ箍绾㈠寘 楼"+ spreadMoney);
+ }
array.add(gson.toJson(extra));
}
- // 杩囨湡
- userTaoLiJinOriginService.overdueHongBao(uid);
-
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ // 杩囨湡
+ userTaoLiJinOriginService.overdueHongBao(uid);
+ }
+ });
+
JSONObject data = new JSONObject();
data.put("count", count);
data.put("list", array);
--
Gitblit v1.8.0