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

yujian

2020-04-23 2bd2200f209ddb7bcc59b636d9de6f8b3f762958

 fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java

@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.money.TeamEincomeRecord;

import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;

import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;

import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderUserMapService;

import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceUserService;

import com.yeshi.fanli.service.manger.money.TeamEincomeManager;

import com.yeshi.fanli.service.manger.order.TeamDividentsManager;

@@ -30,6 +31,9 @@


   @Resource

   private TeamDividentsSourceOrderService teamDividentsSourceOrderService;



   @Resource

   private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;



   @Resource

   private TeamDividentsSourceUserService teamDividentsSourceUserService;

@@ -54,11 +58,12 @@


      Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));



      long count = teamDividentsSourceOrderService.countCanSendUidByPreSendTime(preSendTime);

      long count = teamDividentsSourceOrderUserMapService.countCanSendSourceUidByPreSendTime(preSendTime);

      int pageSize = 500;

      int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

      for (int i = 0; i < totalPage; i++) {

         List<Long> list = teamDividentsSourceOrderService.listCanSendUidByPreSendTime(preSendTime, i + 1, pageSize);

         List<Long> list = teamDividentsSourceOrderUserMapService.listCanSendSourceUidByPreSendTime(preSendTime,

               i + 1, pageSize);

         for (Long uid : list) {

            teamDividentsManager.startDividents(uid, preSendTime);

         }