统计可用的免单券数量-countUsableFreeCouponForBuy

yujian

2019-09-03 972d3bc71115ec977dccf835fbcd148da3bcc86c

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

@@ -41,11 +41,11 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.OrderItemException;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.order.HongBaoException;

import com.yeshi.fanli.exception.order.OrderItemException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

@@ -308,12 +308,20 @@
         return;

      }



      // 灰度测试中，京东/拼多多不返利

      if (hongBaoOrder.getCommonOrder() == null

            || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD

            || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD) {

      if (hongBaoOrder.getCommonOrder() == null) {// ||

                                       // hongBaoOrder.getCommonOrder().getSourceType()

                                       // ==

                                       // Constant.SOURCE_TYPE_JD

         // || hongBaoOrder.getCommonOrder().getSourceType() ==

         // Constant.SOURCE_TYPE_PDD

         return;

      }



      // 如果是拼多多/京东维权则返回，不需要返利

      if ((hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD

            || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD)

            && hongBaoOrder.getCommonOrder().getState() == CommonOrder.STATE_WQ)

         return;



      if (hongBaoOrder.getCommonOrder() != null

            && hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {

@@ -602,17 +610,13 @@
            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(item.getId());

            if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {

               CommonOrder co = hongBaoOrder.getCommonOrder();

               if (co.getSourceType() == Constant.SOURCE_TYPE_JD

                     || co.getSourceType() == Constant.SOURCE_TYPE_PDD) {

               // 上级用户不是正常用户，订单均不能到账

               UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());

               if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                  hongBaoList.remove(i);

                  i--;

               } else {// 上级用户不是正常用户，订单均不能到账

                  UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());

                  if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                     hongBaoList.remove(i);

                     i--;

                  }

               }



            }

         }

      }

@@ -713,11 +717,9 @@
                  minDate, maxDate);

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

                  minDate, maxDate);

            long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,

                  minDate, maxDate);



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

                  (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());

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



            // 增加资金

            userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);

@@ -809,7 +811,7 @@
                  minDate, maxDate);



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

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

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

            // 添加资金

            userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);