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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -10,11 +10,9 @@


import com.xxl.job.core.biz.model.ReturnT;

import com.xxl.job.core.handler.annotation.XxlJob;

import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO;

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

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.TimeUtil;



//订单团队分红

@@ -42,7 +40,7 @@


      long count = teamDividentsSourceOrderService.countCanSendUidByPreSendTime(preSendTime);

      int pageSize = 500;

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

      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);

         for (Long uid : list) {

@@ -68,13 +66,9 @@
            targetUidList.addAll(uidList);

      }



      for (Long uid : targetUidList)

         CMQManager.getInstance().addTeamDividentsMsg(new UserDividentsDayDTO(uid, day));

      // for (Long uid : targetUidList)

      // CMQManager.getInstance().addTeamDividentsMsg(new

      // UserDividentsDayDTO(uid, day));

   }

	
	
	
	
	


}