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

admin

2020-04-15 d4588f4e43336b26b356b869c29d0c76390167d5

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java

@@ -2,7 +2,6 @@


import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.HashSet;

@@ -710,22 +709,8 @@
      if (sharemoney.compareTo(new BigDecimal(0)) > 0) {

         // 添加新版详情记录

         try {

            // 计算本月的有效订单，失效订单，维权订单

            Calendar ca = Calendar.getInstance();



            Date maxDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            ca.add(Calendar.MONTH, -1);



            Date minDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,

                  minDate, maxDate, Constant.SOURCE_TYPE_TAOBAO);

            long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,

                  minDate, maxDate, Constant.SOURCE_TYPE_TAOBAO);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,

                  (int) validCount, (int) weiQuanCount, sharemoney, new Date());

                  sharemoney, new Date());

            // 添加资金

            userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



@@ -809,22 +794,8 @@
      if (sharemoney.compareTo(new BigDecimal(0)) > 0) {

         // 添加新版详情记录

         try {

            // 计算本月的有效订单，失效订单，维权订单

            Calendar ca = Calendar.getInstance();



            Date maxDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            ca.add(Calendar.MONTH, -1);



            Date minDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,

                  minDate, maxDate, sourceType);

            long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,

                  minDate, maxDate, sourceType);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, sourceType, (int) validCount,

                  (int) weiQuanCount, sharemoney, new Date());

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, sourceType, sharemoney,

                  new Date());

            // 添加资金

            userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



@@ -868,9 +839,9 @@
    */

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void inviteSubsidySettle(Long uid, String taskKey,Date maxPreGetTime)

   public void inviteSubsidySettle(Long uid, String taskKey, Date maxPreGetTime)

         throws OrderMoneySettleException, TeamEincomeRecordException, ParamsException {

      teamSubsidyManager.addToTeamEincome(uid, taskKey,maxPreGetTime);

      teamSubsidyManager.addToTeamEincome(uid, taskKey, maxPreGetTime);

   }



   private String getTaskKey(Long uid) {