From eceec825ff1c8983654d9ad7c3f1b34d1d654391 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 14 七月 2021 10:10:07 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java | 147 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 107 insertions(+), 40 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 3376892..e75c4e0 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
@@ -1,12 +1,17 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletVO;
+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.ComActUserWalletMapper;
@@ -20,6 +25,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -73,8 +79,22 @@
Map<String,String> resultMap = this.baseMapper.getCommunityName(walletDetailDTO.getCommunityId());
if(!resultMap.isEmpty()){
comActWalletVO.setCommunityName(resultMap.get("name"));
- comActWalletVO.setAgreement(resultMap.get("content"));
+ if(StringUtils.isEmpty(resultMap.get("content"))){
+ this.baseMapper.insertSysAgreement(Constants.PROFIT_EXPLAIN,walletDetailDTO.getCommunityId());
+ comActWalletVO.setAgreement(Constants.PROFIT_EXPLAIN);
+ }else{
+ comActWalletVO.setAgreement(resultMap.get("content"));
+ }
+
}
+
+ Integer easyCount = 0;
+ //查询用户发布随手拍数量
+ easyCount = comActEasyPhotoDAO.selectCount(new QueryWrapper<ComActEasyPhotoDO>().lambda()
+ .eq(ComActEasyPhotoDO::getSponsorId,walletDetailDTO.getUserId())
+ .eq(ComActEasyPhotoDO::getCommunityId,walletDetailDTO.getCommunityId()));
+ comActWalletVO.setEasyCount(easyCount);
+
return R.ok(comActWalletVO);
}
@@ -114,44 +134,42 @@
return;
}
- if(photoActivityDO.getStatus() != ComActEasyPhotoActivityDO.status.jxz){
- log.error("给用户添加收益失败，原因：活动未在进行中，活动id：" + easyPhotoDO.getActivityId());
- return;
+// if(photoActivityDO.getStatus() != ComActEasyPhotoActivityDO.status.jxz){
+// log.error("给用户添加收益失败，原因：活动未在进行中，活动id：" + easyPhotoDO.getActivityId());
+// return;
+// }
+
+
+// Date nowDate = new Date();
+ //查询用户钱包
+ ComActUserWalletDO userWalletDO = comActUserWalletMapper.selectOne(new QueryWrapper<ComActUserWalletDO>()
+ .lambda().eq(ComActUserWalletDO::getUserId,easyPhotoDO.getSponsorId()).eq(ComActUserWalletDO::getCommunityId,easyPhotoDO.getCommunityId()));
+ if(userWalletDO == null){
+ userWalletDO = new ComActUserWalletDO();
+ userWalletDO.setIncomeAmount(BigDecimal.ZERO);
+ userWalletDO.setAvailableAmount(BigDecimal.ZERO);
+ userWalletDO.setSettlementAmount(BigDecimal.ZERO);
+ userWalletDO.setUserId(easyPhotoDO.getSponsorId());
+ userWalletDO.setCommunityId(easyPhotoDO.getCommunityId());
+ userWalletDO.setEasyCount(0);
+ userWalletDO.setCreateAt(new Date());
+ this.baseMapper.insert(userWalletDO);
}
- Date nowDate = new Date();
- //活动正在进行中，需要给用户计算收益
- if(nowDate.getTime() - photoActivityDO.getActivityStartAt().getTime() > 0 && nowDate.getTime() - photoActivityDO.getActivityEndAt().getTime() < 0){
- //查询用户钱包
- ComActUserWalletDO userWalletDO = comActUserWalletMapper.selectOne(new QueryWrapper<ComActUserWalletDO>()
- .lambda().eq(ComActUserWalletDO::getUserId,easyPhotoDO.getSponsorId()).eq(ComActUserWalletDO::getCommunityId,easyPhotoDO.getCommunityId()));
- if(userWalletDO == null){
- userWalletDO = new ComActUserWalletDO();
- userWalletDO.setIncomeAmount(BigDecimal.ZERO);
- userWalletDO.setAvailableAmount(BigDecimal.ZERO);
- userWalletDO.setSettlementAmount(BigDecimal.ZERO);
- userWalletDO.setUserId(easyPhotoDO.getSponsorId());
- userWalletDO.setCommunityId(easyPhotoDO.getCommunityId());
- userWalletDO.setEasyCount(0);
- userWalletDO.setCreateAt(new Date());
- 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();
+ }
- //计算收益
- 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.equals(BigDecimal.ZERO)){
- log.error("此次参加活动的随手拍收益为0，不记录本次交易");
- return;
- }
-
+ if(profitAmount.compareTo(BigDecimal.ZERO) == 0){
+ log.error("此次参加活动的随手拍收益为0，不记录本次交易");
+ return;
+ }else{
//记录钱包变动前金额
BigDecimal oldIncomeAmount = userWalletDO.getIncomeAmount();
BigDecimal oldAvailableAmount = userWalletDO.getAvailableAmount();
@@ -171,11 +189,60 @@
comActUserWalletChangeService.addWalletChange(easyPhotoDO.getSponsorId(),easyPhotoDO.getCommunityId(),userWalletDO.getId()
,oldIncomeAmount,userWalletDO.getIncomeAmount(),oldAvailableAmount,userWalletDO.getAvailableAmount()
,oldSettlementAmount,userWalletDO.getSettlementAmount(),tradeId);
+ }
+ //更新随手拍活动信息
+ easyPhotoDO.setActivityType(activityType);
+ easyPhotoDO.setActivityAmount(profitAmount);
+ comActEasyPhotoDAO.updateById(easyPhotoDO);
+ }
- //更新随手拍活动信息
- easyPhotoDO.setActivityType(activityType);
- easyPhotoDO.setActivityAmount(profitAmount);
- comActEasyPhotoDAO.updateById(easyPhotoDO);
+ /**
+ * 分页查询收益结算列表
+ * @param pageWalletAdminDTO 请求参数
+ * @return 收益结算列表
+ */
+ @Override
+ public R pageUserWalletAdmin(PageComActWalletAdminDTO pageWalletAdminDTO){
+ return R.ok(this.baseMapper.getUserWalletList(new Page(pageWalletAdminDTO.getPageNum(),pageWalletAdminDTO.getPageSize()),pageWalletAdminDTO));
+ }
+
+ /**
+ * 用户结算收益
+ * @param settlementAdminDTO 请求参数
+ * @return 结算结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R userWalletSettlementAdmin(ComActWalletSettlementAdminDTO settlementAdminDTO){
+ //查询用户钱包
+ ComActUserWalletDO userWalletDO = this.baseMapper.selectById(settlementAdminDTO.getId());
+ if(userWalletDO == null){
+ return R.fail("未查询到用户钱包");
+ }
+ if(userWalletDO.getAvailableAmount().compareTo(settlementAdminDTO.getSettlementAmount()) < 0){
+ return R.fail("结算金额不能高于钱包可结算金额");
+ }
+ try {
+ BigDecimal oldIncomeAmount = userWalletDO.getIncomeAmount();
+ BigDecimal oldAvailableAmount = userWalletDO.getAvailableAmount();
+ BigDecimal oldSettlementAmount = userWalletDO.getSettlementAmount();
+ userWalletDO.setAvailableAmount(userWalletDO.getAvailableAmount().subtract(settlementAdminDTO.getSettlementAmount()));
+ userWalletDO.setSettlementAmount(userWalletDO.getSettlementAmount().add(settlementAdminDTO.getSettlementAmount()));
+ userWalletDO.setUpdateAt(new Date());
+ this.baseMapper.updateById(userWalletDO);
+ //添加钱包交易记录
+ Long tradeServiceId = comActUserWalletTradeService.addWalletTrade(userWalletDO.getUserId(),userWalletDO.getCommunityId()
+ ,null,settlementAdminDTO.getSettlementAmount(),ComActUserWalletTradeDO.type.js
+ ,settlementAdminDTO.getRemark(),settlementAdminDTO.getUserId(),userWalletDO.getId(),ComActUserWalletTradeDO.changeType.reduce);
+ //添加钱包变动记录
+ comActUserWalletChangeService.addWalletChange(userWalletDO.getUserId(),userWalletDO.getCommunityId(),userWalletDO.getId()
+ ,oldIncomeAmount,userWalletDO.getIncomeAmount(),oldAvailableAmount,userWalletDO.getAvailableAmount()
+ ,oldSettlementAmount,userWalletDO.getSettlementAmount(),tradeServiceId);
+
+ return R.ok();
+ }catch (Exception e){
+ log.error("给用户结算收益失败，原因：" + e.getMessage());
+ return R.fail("结算失败");
}
}
--
Gitblit v1.7.1