From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java | 86 ++++++------------------------------------
1 files changed, 13 insertions(+), 73 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
index c56924e..ed9cbad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
@@ -1,6 +1,5 @@
package com.yeshi.fanli.service.impl.user.integral;
-import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -18,7 +17,6 @@
import com.aliyun.openservices.ons.api.Producer;
import com.yeshi.fanli.dao.mybatis.integral.IntegralTaskRecordMapper;
-import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.integral.IntegralDetail;
import com.yeshi.fanli.entity.integral.IntegralTask;
@@ -26,6 +24,7 @@
import com.yeshi.fanli.entity.integral.IntegralTaskClass;
import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;
import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
@@ -397,7 +396,7 @@
if (uid == null || originUid == null)
return;
- String reward = configService.get("first_order_reward_boss");
+ String reward = configService.get(ConfigKeyEnum.firstOrderRewardBoss.getKey());
if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
@@ -409,7 +408,7 @@
if (uid == null || originUid == null)
return;
- String reward = configService.get("first_order_reward_boss_super");
+ String reward = configService.get(ConfigKeyEnum.firstOrderRewardBossSuper.getKey());
if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "浜�", beizu);
@@ -421,10 +420,10 @@
if (uid == null)
return;
- String reward = configService.get("first_share_order_reward");
+ String reward = configService.get(ConfigKeyEnum.firstShareOrderReward.getKey());
if (StringUtil.isNullOrEmpty(reward))
return;
- firstOrderReward(uid, null, Integer.parseInt(reward), null, beizu);
+ //firstOrderReward(uid, null, Integer.parseInt(reward), null, beizu);
}
@Async()
@@ -433,7 +432,7 @@
if (uid == null || originUid == null)
return;
- String reward = configService.get("first_share_order_reward_boss");
+ String reward = configService.get(ConfigKeyEnum.firstShareOrderRewardBoss.getKey());
if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
@@ -490,73 +489,14 @@
integralDetailService.insertSelective(detail);
// 娑堟伅
- MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();
- msgOther.setTitle("閲戝竵濂栧姳");
- msgOther.setNum(addGoldCoin + "閲戝竵");
- msgOther.setTotal(totalGoldCoin + "閲戝竵");
- if (StringUtil.isNullOrEmpty(level)) {
- msgOther.setSource("棣栫瑪鍒嗕韩璁㈠崟锛岀郴缁熷鍔遍噾甯� ");
- msgOther.setExplain("棣栫瑪鍒嗕韩璁㈠崟寰楀埌鐨勫閲戜笉瓒�0.01鍏冩椂濂栧姳 ");
+ if (level.equalsIgnoreCase("涓�") || level.equalsIgnoreCase("1")) {
+ // 鐩存帴绮変笣
+ userOtherMsgNotificationService.goldCoinOrderSubsidyMsg(originUid, addGoldCoin, totalGoldCoin, true);
} else {
- if (level.equalsIgnoreCase("涓�") || level.equalsIgnoreCase("1"))
- msgOther.setSource("鐩存帴绮変笣棣栨涓嬪崟锛岀郴缁熷鍔遍噾甯� ");
- else
- msgOther.setSource("闂存帴绮変笣棣栨涓嬪崟锛岀郴缁熷鍔遍噾甯� ");
- msgOther.setExplain("浠呮柊閭�璇风矇涓濋涓嬪崟浣犲緱鍒扮殑濂栭噾涓嶈冻0.01鍏冩椂濂栧姳 ");
+ // 闂存帴绮変笣
+ userOtherMsgNotificationService.goldCoinOrderSubsidyMsg(originUid, addGoldCoin, totalGoldCoin, false);
}
- userOtherMsgNotificationService.firstOrderRewardMsg(uid, null, msgOther);
+
}
-
- /**
- * 鎺ㄥ箍绾㈠寘鎶樼畻閲戝竵
- *
- * @param uid
- * @param addGoldCoin
- * @param tlj
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void taoLiJinExchange(Long uid, Integer addGoldCoin, BigDecimal tlj) {
- String uniqueKey = "taoLiJinExchange-" + uid.toString();
- IntegralDetail detailRecord = integralDetailService.getDetailByUniqueKey(uniqueKey);
- if (detailRecord != null)
- return;
-
- UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);
- if (userInfoExtra == null)
- return;
-
- Integer goldCoin = userInfoExtra.getGoldCoin();
- if (goldCoin == null)
- goldCoin = 0;
- goldCoin = goldCoin + addGoldCoin;
-
- try {
- UserInfoExtra extra = new UserInfoExtra();
- extra.setId(userInfoExtra.getId());
- extra.setGoldCoin(goldCoin);
- userInfoExtraService.saveUserInfoExtra(extra);
- } catch (UserInfoExtraException e) {
- LogHelper.errorDetailInfo(e);
- return;
- }
-
- // 閲戝竵璇︽儏
- IntegralDetail detail = new IntegralDetail();
- detail.setTitle("鎺ㄥ箍绾㈠寘涓嬬嚎-绯荤粺鎶樼畻鎴愰噾甯�");
- detail.setUid(uid);
- detail.setMoney(addGoldCoin);
- detail.setUniqueKey(uniqueKey);
- detail.setCreateTime(new Date());
- integralDetailService.insertSelective(detail);
-
- // 娑堟伅
- MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();
- msgOther.setTitle("鎺ㄥ箍绾㈠寘");
- msgOther.setTotal("鎺ㄥ箍绾㈠寘楼" + tlj.setScale(2));
- msgOther.setNum(addGoldCoin + "鏋�");
- msgOther.setSource("宸茶繘鍏ュ埌鍙敤閲戝竵涓�");
- msgOther.setExplain("鍘熸帹骞跨孩鍖呭姛鑳戒笅绾匡紝鍓╀綑鎺ㄥ箍绾㈠寘鎸夌収10:1鎶樼畻涓洪噾甯� ");
- userOtherMsgNotificationService.taoLiJinExchangeMsg(uid, "鏈姌绠楁湁涓斾粎鏈変竴娆�", msgOther);
- }
+
}
--
Gitblit v1.8.0