diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java index f27728ad..60322d62 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java @@ -19,9 +19,7 @@ import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.security.utils.SecurityUtils; 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.vo.CuBonusLenjoyStatisVO; import com.hzs.member.statis.vo.CuBonusVertexStatisVO; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; @@ -55,8 +53,6 @@ public class CuBonusVertexStatisController extends BaseController { @Autowired private ICuBonusVertexStatisService iCuBonusVertexStatisService; - @Autowired - private ICuBonusLenjoyStatisService iCuBonusLenjoyStatisService; @DubboReference ICurrencyServiceApi currencyServiceApi; @@ -866,8 +862,8 @@ public class CuBonusVertexStatisController extends BaseController { if (StringUtils.isEmpty(startDate) || StringUtils.isEmpty(endDate)) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECT_DATE_NOT_NULL)); } - List vertexList = iCuBonusLenjoyStatisService.vertexList(null); - List pkVertexList = vertexList.stream().map(CuBonusLenjoyStatisVO::getPkVertex).collect(Collectors.toList()); + List vertexList = iCuBonusVertexStatisService.vertexList(null); + List pkVertexList = vertexList.stream().map(CuBonusVertexStatisVO::getPkVertex).collect(Collectors.toList()); //删除数据 if (CollectionUtil.isNotEmpty(pkVertexList)) { iCuBonusVertexStatisService.delStatis(startDate, endDate, pkVertexList); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java index 466fbb51..7126597e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusVertexStatisServiceProvider.java @@ -3,9 +3,8 @@ package com.hzs.member.statis.provider; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.domain.R; 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.vo.CuBonusLenjoyStatisVO; +import com.hzs.member.statis.vo.CuBonusVertexStatisVO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; @@ -22,8 +21,6 @@ public class ICuBonusVertexStatisServiceProvider implements ICuBonusVertexStatis @Autowired private ICuBonusVertexStatisService iCuBonusVertexStatisService; - @Autowired - private ICuBonusLenjoyStatisService iCuBonusLenjoyStatisService; /** * @description: 7天重算顶点奖金拨比统计 @@ -38,9 +35,9 @@ public class ICuBonusVertexStatisServiceProvider implements ICuBonusVertexStatis **/ @Override public R delStats(String startDate, String endDate) { - List vertexList = iCuBonusLenjoyStatisService.vertexList(null); + List vertexList = iCuBonusVertexStatisService.vertexList(null); if (CollectionUtil.isNotEmpty(vertexList)) { - List pkVertexList = vertexList.stream().map(CuBonusLenjoyStatisVO::getPkVertex).collect(Collectors.toList()); + List pkVertexList = vertexList.stream().map(CuBonusVertexStatisVO::getPkVertex).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(pkVertexList)) { iCuBonusVertexStatisService.delStatis(startDate, endDate, pkVertexList); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java index c4c95cfd..8204fda4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java @@ -373,6 +373,8 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl existingRecord = getCuBonusStatis(bs); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusLenjoyStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusLenjoyStatisMapper.xml index a544d1b5..8bfe4d2b 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusLenjoyStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusLenjoyStatisMapper.xml @@ -204,8 +204,7 @@ AND m.del_flag = 0 AND m.pk_country = 1 AND m.category = 0 - AND m.pay_status =1 - AND m.SYSTEM_TYPE =1 + AND m.pay_status = 1 AND m.pk_id=#{pkVertex} diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml index 4517d47c..8bc160eb 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml @@ -845,10 +845,10 @@ ) - + delete from CU_BONUS_VERTEX_STATIS - where 1=1 + where 1 = 1 and PK_BD_VERTEX not in diff --git a/bd-third/src/main/java/com/hzs/third/pay/controller/notify/AdaRefundNotifyController.java b/bd-third/src/main/java/com/hzs/third/pay/controller/notify/AdaRefundNotifyController.java index c4065684..b50a6dff 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/controller/notify/AdaRefundNotifyController.java +++ b/bd-third/src/main/java/com/hzs/third/pay/controller/notify/AdaRefundNotifyController.java @@ -89,8 +89,4 @@ public class AdaRefundNotifyController { throw new BaseException("汇付退款回调处理失败"); } - public static void main(String[] args) { - System.out.println(); - } - }