统计可用的免单券数量-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;

@@ -317,6 +317,12 @@
         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) {

         // 维权中的不返利