From c37e84a5bc4629475da4a38415a231f121d39c61 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 07 十一月 2019 12:28:57 +0800
Subject: [PATCH] 品牌
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java | 160 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 102 insertions(+), 58 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 0f751a1..08a2d77 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,5 +1,6 @@
package com.yeshi.fanli.service.impl.user.integral;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -55,14 +56,12 @@
@Lazy
@Resource
private IntegralTaskClassService integralTaskClassService;
-
+
@Resource
private UserOtherMsgNotificationService userOtherMsgNotificationService;
-
+
@Resource
private ConfigService configService;
-
-
@Override
public Integer getTotalGoldCoin(long uid, Long cid, Integer dateType) {
@@ -149,7 +148,6 @@
return listRecord;
}
-
@Override
public List<IntegralTaskRecord> getSign7DaysRecord(long uid, Long cid) {
List<IntegralTaskRecord> listRecord = new ArrayList<IntegralTaskRecord>();
@@ -165,8 +163,8 @@
}
date = createTime;
listRecord.add(record);
-
- if(listRecord.size() >= 7)
+
+ if (listRecord.size() >= 7)
break;
}
}
@@ -175,7 +173,7 @@
}
return listRecord;
}
-
+
@Override
public List<IntegralTaskRecord> listNotReceived(int count, long uid) {
return integralTaskRecordMapper.listNotReceived(count, uid);
@@ -190,7 +188,7 @@
}
@Override
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
public Integer receiveGoldCoinALL(Long uid) throws IntegralTaskRecordException {
UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);
if (userInfoExtra == null)
@@ -205,21 +203,15 @@
if (addDetail(uid, record))
totalGoldCoin += record.getGoldCoin();
}
-
- Integer goldCoin = userInfoExtra.getGoldCoin();
- if (goldCoin == null)
- goldCoin = 0;
- goldCoin = goldCoin + totalGoldCoin;
-
// 鏇存柊閲戝竵
- userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), goldCoin);
-
- return goldCoin;
+ userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
+
+ return (userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin()) + totalGoldCoin;
}
- @Override
- @Transactional(rollbackFor=Exception.class)
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public Integer receiveGoldCoin(Long uid, Set<Long> idList) throws IntegralTaskRecordException {
if (idList == null || idList.size() == 0) {
throw new IntegralTaskRecordException(1, "id涓虹┖");
@@ -229,32 +221,26 @@
if (userInfoExtra == null) {
throw new IntegralTaskRecordException(1, "鐢ㄦ埛淇℃伅涓嶅叏");
}
-
+
Integer totalGoldCoin = 0;
for (Long id : idList) {
IntegralTaskRecord record = integralTaskRecordMapper.selectByPrimaryKey(id);
if (record == null)
continue;
-
+
// 宸查鍙�
Integer state = record.getState();
- if (state != null && state == 1)
+ if (state != null && state == 1)
continue;
-
+
if (addDetail(uid, record))
totalGoldCoin += record.getGoldCoin();
}
-
- Integer goldCoin = userInfoExtra.getGoldCoin();
- if (goldCoin == null)
- goldCoin = 0;
- goldCoin = goldCoin + totalGoldCoin;
-
// 鏇存柊閲戝竵
- userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), goldCoin);
+ userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
- return goldCoin;
+ return totalGoldCoin+(userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin());
}
@Transactional
@@ -321,7 +307,7 @@
FrequencyEnum frequency = integralTask.getFrequency();
if (frequency == FrequencyEnum.everyday) {
int num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,
- TimeUtil.getWholeTime(record.getCreateTime().getTime()));
+ TimeUtil.getWholeTime(record.getCreateTime().getTime()), record.getId());
if (num <= 0)
num = 1;
String title = taskClass.getName() + "-" + integralTask.getName() + "-绗�" + num + "娆�";
@@ -389,6 +375,13 @@
public List<IntegralTaskRecord> listByUidAndTaskId(Long uid, Long taskId, int page, int count) {
return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
}
+
+
+ @Override
+ public long getTotalGoldCoinByUid(Long uid) {
+ return integralTaskRecordMapper.getTotalGoldCoinByUid(uid);
+ }
+
@Async()
@@ -396,78 +389,77 @@
public void firstRebateOrderRewardBoss(Long uid, Long originUid, String beizu) {
if (uid == null || originUid == null)
return;
-
+
String reward = configService.get("first_order_reward_boss");
- if (StringUtil.isNullOrEmpty(reward))
+ if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
}
-
+
@Async()
@Override
public void firstRebateOrderRewardBossSuper(Long uid, Long originUid, String beizu) {
if (uid == null || originUid == null)
return;
-
+
String reward = configService.get("first_order_reward_boss_super");
- if (StringUtil.isNullOrEmpty(reward))
+ if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "浜�", beizu);
}
-
-
+
@Async()
@Override
public void firstShareOrderReward(Long uid, String beizu) {
- if(uid == null)
+ if (uid == null)
return;
-
+
String reward = configService.get("first_share_order_reward");
- if (StringUtil.isNullOrEmpty(reward))
+ if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, null, Integer.parseInt(reward), null, beizu);
}
-
-
+
@Async()
@Override
public void firstSharerOrderRewardBoss(Long uid, Long originUid, String beizu) {
if (uid == null || originUid == null)
return;
-
+
String reward = configService.get("first_share_order_reward_boss");
- if (StringUtil.isNullOrEmpty(reward))
+ if (StringUtil.isNullOrEmpty(reward))
return;
firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
}
-
-
+
/**
* 闃熷憳棣栧崟濂栧姳閲戝竵
+ *
* @param uid
* @param addGoldCoin
- * @param level 鎵�灞炲摢绾ч槦鍛�
+ * @param level
+ * 鎵�灞炲摢绾ч槦鍛�
* @param beizu
*/
private void firstOrderReward(Long uid, Long originUid, Integer addGoldCoin, String level, String beizu) {
- String uniqueKey = "firstOrder-"+ uid.toString();
- if (originUid != null)
+ String uniqueKey = "firstOrder-" + uid.toString();
+ if (originUid != null)
uniqueKey = uniqueKey + "-" + originUid;
-
+
// 鍒ゆ柇鏄惁宸查鍙�
IntegralDetail detailRecord = integralDetailService.getDetailByUniqueKey(uniqueKey);
if (detailRecord != null)
return;
-
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra == null)
+ 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());
@@ -487,7 +479,7 @@
detail.setUniqueKey(uniqueKey);
detail.setCreateTime(new Date());
integralDetailService.insertSelective(detail);
-
+
// 娑堟伅
MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();
msgOther.setTitle("閲戝竵濂栧姳");
@@ -502,4 +494,56 @@
}
userOtherMsgNotificationService.firstOrderRewardMsg(uid, null, msgOther);
}
+
+
+ /**
+ * 鎺ㄥ箍绾㈠寘鎶樼畻閲戝竵
+ * @param uid
+ * @param addGoldCoin
+ * @param tlj
+ */
+ @Override
+ 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(goldCoin + "鏋�");
+ msgOther.setSource("宸茶繘鍏ュ埌鍙敤閲戝竵涓�");
+ msgOther.setExplain("鍘熸帹骞跨孩鍖呭姛鑳戒笅绾匡紝鍓╀綑鎺ㄥ箍绾㈠寘鎸夌収10:1鎶樼畻涓洪噾甯� ");
+ userOtherMsgNotificationService.taoLiJinExchangeMsg(uid, "鏈姌绠楁湁涓斾粎鏈変竴娆�", msgOther);
+ }
}
--
Gitblit v1.8.0