admin
2019-09-16 87e3fa8532276bb2bf85ae9bc8d9e664b9e187c4
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -338,7 +338,7 @@
      // 查询最新的红包数据
      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());
      // 正常用户才能到账
      UserInfo mainUser = userInfoMapper.selectByPrimaryKey(hb1.getUserInfo().getId());
      UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());
      if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {
         return;
      }
@@ -462,7 +462,7 @@
         }
         // 站内信+推送
         UserInfo user = userInfoMapper.selectByPKey(uid);
         UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
         // 新版通知
         userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
@@ -652,7 +652,7 @@
            if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {
               CommonOrder co = hongBaoOrder.getCommonOrder();
               // 上级用户不是正常用户,订单均不能到账
               UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());
               UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
               if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
                  hongBaoList.remove(i);
                  i--;
@@ -776,7 +776,7 @@
         // 新版通知
         userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),
               inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());
               inviteGoodsCount, invitemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
         for (String orderId : drawBackOrders)
            taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);
@@ -870,7 +870,7 @@
         // 新版通知
         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
               shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
         for (String orderId : drawBackOrders)
            taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);