admin
2019-08-30 6c7c445a0f4462c4e94f24a40bd1f59e8cc6fd63
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -308,10 +308,12 @@
         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;
      }
@@ -602,17 +604,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 +711,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 +805,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);