团队收益改为团队奖金到账

admin

2020-06-28 af4035a259c4b2a61e2784b53f74717e47881781

团队收益改为团队奖金到账

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java

@@ -238,8 +238,8 @@
    }



    @Override

    public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {

        MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "团队收益");

    public void teamRewardReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {

        MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "团队奖金");

        try {

            msgMoneyDetailService.addMsgMoneyDetail(detail);

        } catch (MsgMoneyDetailException e) {


 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java

@@ -143,13 +143,13 @@
    

    

    /**

     * 团队收益消息

     * 团队奖金消息

     * @param uid

     * @param money 本次到账金额

     * @param balance 余额

     * @param receivedDate  结算月度

     */

    public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate);

    public void teamRewardReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate);



    /**

     * 使用奖励券


 fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java

@@ -94,7 +94,7 @@


    /**

     * @throws UserMoneyDetailException 

     * 团队收益 到账到用户余额

     * 团队奖金 到账到用户余额

     * @Title: addTOUserAccount

     * @Description: 

     * @param day

@@ -103,10 +103,8 @@
     * @throws

     */

    @Transactional(rollbackFor = Exception.class)

    public void addTeamIncomeTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {



    public void addTeamRewardTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {

        List<Integer> typeList = new ArrayList<>();

        typeList.add(TeamEincomeRecord.TYPE_TEAM_SUBSIDY);

        typeList.add(TeamEincomeRecord.TYPE_TEAM_REWARD);



        Date now = new Date();

@@ -123,13 +121,24 @@
        userMoneyService.addUserMoney(uid, money, detail);

        // 发送消息

        BigDecimal balance = userMoneyService.getBalance(uid);

        userMoneyMsgNotificationService.teamReceive(uid, money, balance, now);

        userMoneyMsgNotificationService.teamRewardReceive(uid, money, balance, now);

    }



    /**

     * 团队分红到账

     * @Title: addTeamDividentsTOUserAccount

     * @Description: 
     * @param preSendTime

     * @param uid

     * @throws UserMoneyDetailException 
     * void 返回类型

     * @throws

     */

    @Transactional(rollbackFor = Exception.class)

    public void addTeamDividentsTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {

        List<Integer> typeList = new ArrayList<>();

        typeList.add(TeamEincomeRecord.TYPE_TEAM_DIVIDENTS);

        typeList.add(TeamEincomeRecord.TYPE_TEAM_SUBSIDY);

        Date now = new Date();

        List<TeamEincomeRecord> list = teamEincomeRecordService.listCanRecieveRecord(preSendTime, uid, typeList);

        BigDecimal money = new BigDecimal(0);


 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -203,7 +203,7 @@
            doOrderTeamIncomePreFanLi();// 处理订单提成返利

            doDividentsPreJob();



            doOrderTeamIncomeFanLi();

            doOrderTeamRewardFanLi();

            doDividentsJob();

        }

        

@@ -429,9 +429,9 @@
    }



    /**

     * 处理团队订单返利

     * 处理团队奖金返利

     */

    public void doOrderTeamIncomeFanLi() {

    public void doOrderTeamRewardFanLi() {

        executor.execute(new Runnable() {

            @Override

            public void run() {

@@ -444,7 +444,7 @@
                                String handler = its.next();

                                try {

                                    UidDateDTO dto = map.get(handler);

                                    teamEincomeManager.addTeamIncomeTOUserAccount(dto.getDate(), dto.getUid());

                                    teamEincomeManager.addTeamRewardTOUserAccount(dto.getDate(), dto.getUid());

                                    TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);

                                } catch (Exception e) {

                                    try {