金币限制

yujian

2019-08-30 26e3e6452df6fdf2d145775871af0a27fd01cdd2

 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--;

                  }

               }



            }

         }

      }