From cbf825f4e63e77241a11ec90841637991e43940f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 24 七月 2021 18:11:28 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java
index e75c4e0..e4b9a51 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java
@@ -14,11 +14,9 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActEasyPhotoActivityMapper;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
+import com.panzhihua.service_community.dao.ComActEasyPhotoRewardMapper;
import com.panzhihua.service_community.dao.ComActUserWalletMapper;
-import com.panzhihua.service_community.model.dos.ComActEasyPhotoActivityDO;
-import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
-import com.panzhihua.service_community.model.dos.ComActUserWalletDO;
-import com.panzhihua.service_community.model.dos.ComActUserWalletTradeDO;
+import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActUserWalletChangeService;
import com.panzhihua.service_community.service.ComActUserWalletService;
import com.panzhihua.service_community.service.ComActUserWalletTradeService;
@@ -51,6 +49,8 @@
private ComActUserWalletTradeService comActUserWalletTradeService;
@Resource
private ComActUserWalletChangeService comActUserWalletChangeService;
+ @Resource
+ private ComActEasyPhotoRewardMapper comActEasyPhotoRewardMapper;
/**
* 查询用户钱包信息
@@ -113,7 +113,7 @@
* @param easyPhotoId 随手拍id
*/
@Override
- public void examineAddMoney(Integer activityType,Long easyPhotoId,Long userId){
+ public void examineAddMoney(Integer activityType,Long easyPhotoId,Long userId,BigDecimal amount){
//查询随手拍信息
ComActEasyPhotoDO easyPhotoDO = comActEasyPhotoDAO.selectById(easyPhotoId);
@@ -128,11 +128,11 @@
}
//查询随手拍活动
- ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(easyPhotoDO.getActivityId());
- if(photoActivityDO == null){
- log.error("给用户添加收益失败，原因：未查到活动记录，活动id：" + easyPhotoDO.getActivityId());
- return;
- }
+// ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(easyPhotoDO.getActivityId());
+// if(photoActivityDO == null){
+// log.error("给用户添加收益失败，原因：未查到活动记录，活动id：" + easyPhotoDO.getActivityId());
+// return;
+// }
// if(photoActivityDO.getStatus() != ComActEasyPhotoActivityDO.status.jxz){
// log.error("给用户添加收益失败，原因：活动未在进行中，活动id：" + easyPhotoDO.getActivityId());
@@ -156,17 +156,7 @@
this.baseMapper.insert(userWalletDO);
}
- //计算收益
- BigDecimal profitAmount = BigDecimal.ZERO;
- if(activityType.equals(ComActEasyPhotoDO.activityType.yz)){
- profitAmount = photoActivityDO.getGoodReward();
- }else if(activityType.equals(ComActEasyPhotoDO.activityType.jl)){
- profitAmount = photoActivityDO.getExcellentReward();
- }else if(activityType.equals(ComActEasyPhotoDO.activityType.pt)){
- profitAmount = photoActivityDO.getOrdinaryReward();
- }
-
- if(profitAmount.compareTo(BigDecimal.ZERO) == 0){
+ if(amount.compareTo(BigDecimal.ZERO) == 0){
log.error("此次参加活动的随手拍收益为0，不记录本次交易");
return;
}else{
@@ -176,23 +166,42 @@
BigDecimal oldSettlementAmount = userWalletDO.getSettlementAmount();
//更新钱包金额
- userWalletDO.setIncomeAmount(userWalletDO.getIncomeAmount().add(profitAmount));
- userWalletDO.setAvailableAmount(userWalletDO.getAvailableAmount().add(profitAmount));
+ userWalletDO.setIncomeAmount(userWalletDO.getIncomeAmount().add(amount));
+ userWalletDO.setAvailableAmount(userWalletDO.getAvailableAmount().add(amount));
comActUserWalletMapper.updateById(userWalletDO);
//新增钱包资金交易记录
Long tradeId = comActUserWalletTradeService.addWalletTrade(easyPhotoDO.getSponsorId(),easyPhotoDO.getCommunityId()
- ,easyPhotoDO.getId(),profitAmount, ComActUserWalletTradeDO.type.fb,"发布随手拍"
+ ,easyPhotoDO.getId(),amount, ComActUserWalletTradeDO.type.fb,"发布随手拍"
,userId,userWalletDO.getId(),ComActUserWalletTradeDO.changeType.add);
//新增钱包资金变动记录
comActUserWalletChangeService.addWalletChange(easyPhotoDO.getSponsorId(),easyPhotoDO.getCommunityId(),userWalletDO.getId()
,oldIncomeAmount,userWalletDO.getIncomeAmount(),oldAvailableAmount,userWalletDO.getAvailableAmount()
,oldSettlementAmount,userWalletDO.getSettlementAmount(),tradeId);
+
+ //查询用户未读奖励金额
+ ComActEasyPhotoRewardDO easyPhotoRewardDO = comActEasyPhotoRewardMapper.selectOne(new QueryWrapper<ComActEasyPhotoRewardDO>().lambda()
+ .eq(ComActEasyPhotoRewardDO::getCommunityId,easyPhotoDO.getCommunityId())
+ .eq(ComActEasyPhotoRewardDO::getUserId,easyPhotoDO.getSponsorId())
+ .eq(ComActEasyPhotoRewardDO::getIsRead,ComActEasyPhotoRewardDO.isRead.no));
+ if(easyPhotoRewardDO == null){
+ easyPhotoRewardDO = new ComActEasyPhotoRewardDO();
+ easyPhotoRewardDO.setCommunityId(easyPhotoDO.getCommunityId());
+ easyPhotoRewardDO.setUserId(easyPhotoDO.getSponsorId());
+ easyPhotoRewardDO.setIsRead(ComActEasyPhotoRewardDO.isRead.no);
+ easyPhotoRewardDO.setCreateAt(new Date());
+ easyPhotoRewardDO.setAmount(amount);
+ comActEasyPhotoRewardMapper.insert(easyPhotoRewardDO);
+ }else{
+ easyPhotoRewardDO.setAmount(easyPhotoRewardDO.getAmount().add(amount));
+ easyPhotoRewardDO.setUpdateAt(new Date());
+ comActEasyPhotoRewardMapper.updateById(easyPhotoRewardDO);
+ }
}
//更新随手拍活动信息
easyPhotoDO.setActivityType(activityType);
- easyPhotoDO.setActivityAmount(profitAmount);
+ easyPhotoDO.setActivityAmount(amount);
comActEasyPhotoDAO.updateById(easyPhotoDO);
}
--
Gitblit v1.7.1