angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 拨比计算时，保存拓展业绩数据；

This commit is contained in:
cabbage 2025-05-17 16:01:01 +08:00
parent 1a76a86596
commit 3c59748bc2
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java
View File

@ -19,9 +19,7 @@ import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.util.TransactionUtils; import com.hzs.common.util.TransactionUtils;
import com.hzs.member.statis.service.ICuBonusLenjoyStatisService;
import com.hzs.member.statis.service.ICuBonusVertexStatisService; import com.hzs.member.statis.service.ICuBonusVertexStatisService;
import com.hzs.member.statis.vo.CuBonusLenjoyStatisVO;
import com.hzs.member.statis.vo.CuBonusVertexStatisVO; import com.hzs.member.statis.vo.CuBonusVertexStatisVO;
import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.ICurrencyServiceApi;
import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.base.dto.CurrencyDTO;
@ -55,8 +53,6 @@ public class CuBonusVertexStatisController extends BaseController {
@Autowired @Autowired
private ICuBonusVertexStatisService iCuBonusVertexStatisService; private ICuBonusVertexStatisService iCuBonusVertexStatisService;
@Autowired
private ICuBonusLenjoyStatisService iCuBonusLenjoyStatisService;
@DubboReference @DubboReference
ICurrencyServiceApi currencyServiceApi; ICurrencyServiceApi currencyServiceApi;
@ -866,8 +862,8 @@ public class CuBonusVertexStatisController extends BaseController {
if (StringUtils.isEmpty(startDate) || StringUtils.isEmpty(endDate)) { if (StringUtils.isEmpty(startDate) || StringUtils.isEmpty(endDate)) {
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECT_DATE_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECT_DATE_NOT_NULL));
} }
List<CuBonusLenjoyStatisVO> vertexList = iCuBonusLenjoyStatisService.vertexList(null); List<CuBonusVertexStatisVO> vertexList = iCuBonusVertexStatisService.vertexList(null);
List<Integer> pkVertexList = vertexList.stream().map(CuBonusLenjoyStatisVO::getPkVertex).collect(Collectors.toList()); List<Integer> pkVertexList = vertexList.stream().map(CuBonusVertexStatisVO::getPkVertex).collect(Collectors.toList());
//删除数据 //删除数据
if (CollectionUtil.isNotEmpty(pkVertexList)) { if (CollectionUtil.isNotEmpty(pkVertexList)) {
iCuBonusVertexStatisService.delStatis(startDate, endDate, pkVertexList); iCuBonusVertexStatisService.delStatis(startDate, endDate, pkVertexList);

9
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java
View File

@ -3,9 +3,8 @@ package com.hzs.member.statis.provider;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.member.statis.ICuBonusVertexStatisServiceApi; import com.hzs.member.statis.ICuBonusVertexStatisServiceApi;
import com.hzs.member.statis.service.ICuBonusLenjoyStatisService;
import com.hzs.member.statis.service.ICuBonusVertexStatisService; import com.hzs.member.statis.service.ICuBonusVertexStatisService;
import com.hzs.member.statis.vo.CuBonusLenjoyStatisVO; import com.hzs.member.statis.vo.CuBonusVertexStatisVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -22,8 +21,6 @@ public class ICuBonusVertexStatisServiceProvider implements ICuBonusVertexStatis
@Autowired @Autowired
private ICuBonusVertexStatisService iCuBonusVertexStatisService; private ICuBonusVertexStatisService iCuBonusVertexStatisService;
@Autowired
private ICuBonusLenjoyStatisService iCuBonusLenjoyStatisService;
/** /**
* @description: 7天重算顶点奖金拨比统计 * @description: 7天重算顶点奖金拨比统计
@ -38,9 +35,9 @@ public class ICuBonusVertexStatisServiceProvider implements ICuBonusVertexStatis
**/ **/
@Override @Override
public R<?> delStats(String startDate, String endDate) { public R<?> delStats(String startDate, String endDate) {
List<CuBonusLenjoyStatisVO> vertexList = iCuBonusLenjoyStatisService.vertexList(null); List<CuBonusVertexStatisVO> vertexList = iCuBonusVertexStatisService.vertexList(null);
if (CollectionUtil.isNotEmpty(vertexList)) { if (CollectionUtil.isNotEmpty(vertexList)) {
List<Integer> pkVertexList = vertexList.stream().map(CuBonusLenjoyStatisVO::getPkVertex).collect(Collectors.toList()); List<Integer> pkVertexList = vertexList.stream().map(CuBonusVertexStatisVO::getPkVertex).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(pkVertexList)) { if (CollectionUtil.isNotEmpty(pkVertexList)) {
iCuBonusVertexStatisService.delStatis(startDate, endDate, pkVertexList); iCuBonusVertexStatisService.delStatis(startDate, endDate, pkVertexList);
} }

2
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java
View File

@ -373,6 +373,8 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
bs.setHiFunIncome(cb.getHiFunIncome()); bs.setHiFunIncome(cb.getHiFunIncome());
bs.setMakerDirect(cb.getMakerDirect()); bs.setMakerDirect(cb.getMakerDirect());
bs.setMakerShare(cb.getMakerShare()); bs.setMakerShare(cb.getMakerShare());
bs.setCalFirAchieve(cb.getCalFirAchieve());
bs.setCalRepAchieve(cb.getCalRepAchieve());
// 查询数据库判断记录是否存在 // 查询数据库判断记录是否存在
List<CuBonusVertexStatis> existingRecord = getCuBonusStatis(bs); List<CuBonusVertexStatis> existingRecord = getCuBonusStatis(bs);

1
bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusLenjoyStatisMapper.xml
View File

@ -205,7 +205,6 @@
AND m.pk_country = 1 AND m.pk_country = 1
AND m.category = 0 AND m.category = 0
AND m.pay_status = 1 AND m.pay_status = 1
AND m.SYSTEM_TYPE =1
<if test="pkVertex!=null"> <if test="pkVertex!=null">
AND m.pk_id=#{pkVertex} AND m.pk_id=#{pkVertex}
</if> </if>

4
bd-third/src/main/java/com/hzs/third/pay/controller/notify/AdaRefundNotifyController.java
View File

@ -89,8 +89,4 @@ public class AdaRefundNotifyController {
throw new BaseException("汇付退款回调处理失败"); throw new BaseException("汇付退款回调处理失败");
} }
public static void main(String[] args) {
System.out.println();
}
} }