兑换邀请码调整

yujian

2019-08-23 89e89fe2b2a1578a94b2e2c8ee81efbfbbf85f08

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -53,6 +53,7 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;



@Service

@@ -501,7 +502,13 @@
            }

         }

      } else if (type == HongBaoV2.TYPE_SHARE_GOODS) {

         BigDecimal fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());

         BigDecimal fanliRate = null;

         if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_TAOBAO

               && commonOrder.getSourcePosition().equalsIgnoreCase(TaoBaoConstant.TAOBAO_TLJ_RELATION_PID_DEFAULT))

            fanliRate = hongBaoManageService.getTLJShareRate(commonOrder.getCreateTime().getTime());

         else

            fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());



         List<ShareGoodsActivityOrder> list = shareGoodsActivityOrderService

               .listByOrderIdAndUid(commonOrder.getUserInfo().getId(), commonOrder.getOrderNo());

         if (list != null && list.size() > 0) {

@@ -818,7 +825,12 @@
         if (commonOrder.getState() == CommonOrder.STATE_SX || commonOrder.getState() == CommonOrder.STATE_WQ)

            return;

         // 分享赚

         BigDecimal shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());

         BigDecimal shareRate = null;

         if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_TAOBAO

               && commonOrder.getSourcePosition().equalsIgnoreCase(TaoBaoConstant.TAOBAO_TLJ_RELATION_PID_DEFAULT))// 来自于淘礼金的分享

            shareRate = hongBaoManageService.getTLJShareRate(commonOrder.getCreateTime().getTime());

         else

            shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());



         // 判断订单分享活动是否开启

         if ("1".equalsIgnoreCase(configService.get("share_goods_activity_open"))) {

@@ -1061,8 +1073,8 @@
      long count = hongBaoV2Mapper.countByParentUidAndTypeAndState(parentUid, typeList, stateList);

      int page = (int) (count % 100 == 0 ? count / 100 : count / 100 + 1);

      for (int i = 1; i <= page; i++) {

         List<HongBaoV2> list = hongBaoV2Mapper.listByParentUidAndTypeAndState(parentUid, typeList, stateList,

               0, 100);

         List<HongBaoV2> list = hongBaoV2Mapper.listByParentUidAndTypeAndState(parentUid, typeList, stateList, 0,

               100);

         if (list != null)

            for (HongBaoV2 v2 : list) {

               HongBaoV2 update = new HongBaoV2(v2.getId());