Merge remote-tracking branch 'origin/dev' into dev

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

@@ -53,6 +53,11 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
         return dates;
     }
 
+    @Override
+    public Boolean delStatis(String startDate, String endDate, List<Integer> pkVertexList) {
+        return baseMapper.delStatis(startDate, endDate, pkVertexList);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void anewStatisHistoryBonus(String startDate, String endDate) {
@@ -126,11 +131,6 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
         }
     }
 
-    @Override
-    public Boolean delStatis(String startDate, String endDate, List<Integer> pkVertexList) {
-        return baseMapper.delStatis(startDate, endDate, pkVertexList);
-    }
-
     @Override
     public List<CuBonusVertexStatisVO> queryCuBonusStatis(CuBonusVertexStatisVO cuBonusVertexStatisVO) {
         return baseMapper.queryCuBonusStatis(cuBonusVertexStatisVO);

bd-third/src/main/java/com/hzs/third/job/MemberJob.java

@@ -73,7 +73,7 @@ public class MemberJob {
         date = DateUtils.beforeDate(1, ChronoUnit.DAYS, date);
         String payTimeStr = (DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date));
         R<Boolean> statis = iCuBonusVertexStatisServiceApi.anewStatisHistoryBonus(payTimeStr, payTimeStr);
-        if (!statis.getData()) {
+        if (!statis.isSuccess()) {
             log.info("{}-定时统计奖金拨统计失败", DateUtils.currentDate());
         }
     }
@@ -91,10 +91,10 @@ public class MemberJob {
         String startDateStr = (DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endDate));
         //删除前6天的数据
         R<Boolean> delstatis = iCuBonusVertexStatisServiceApi.delStatis(startDateStr, endDateStr);
-        if (delstatis.getData()) {
+        if (delstatis.isSuccess()) {
             //重算前6天的数据
             R<Boolean> statis = iCuBonusVertexStatisServiceApi.anewStatisHistoryBonus(startDateStr, endDateStr);
-            if (!statis.getData()) {
+            if (!statis.isSuccess()) {
                 log.info("{}-重算7天定时统计顶点奖金拨统计失败", DateUtils.currentDate());
             }
         }