Merge remote-tracking branch 'origin/master'

admin

2019-03-15 3cf41feae65a864fc00d72fdd09a676372fc3b27

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java

@@ -37,6 +37,7 @@
import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.dto.money.AccountDetails;

import com.yeshi.fanli.dto.order.OrderItem;

import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.AccountMessage;

@@ -44,7 +45,6 @@
import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.ExtractRecord;

import com.yeshi.fanli.entity.bus.user.LostOrder;

import com.yeshi.fanli.entity.bus.user.OrderItem;

import com.yeshi.fanli.entity.bus.user.PassWordErrorRecord;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

@@ -59,7 +59,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.exception.BindingAccountException;

@@ -71,8 +71,8 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

@@ -143,7 +143,7 @@
   private ConfigService configService;



   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;



   @Resource

   private ShamUserService shamUserService;

@@ -246,8 +246,6 @@


            // 邀请关系生效

            threeSaleSerivce.effective(find);

            // 重新计算用户等级

            threeSaleSerivce.reComputeUserRank(id);



            // 添加用户活跃记录

            UserActiveLog userActiveLog = new UserActiveLog();

@@ -267,7 +265,7 @@
         }

      }

      // 不是用ID的登陆的事就多了

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -453,7 +451,7 @@
         }

      }

      // 不是用ID的登陆的事就多了

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -1108,7 +1106,7 @@
         out.print(JsonUtil.loadFalseResult("用户不存在"));

         return;

      }

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         LogHelper.userInfo("提现时，不存在该系统");

         out.print(JsonUtil.loadFalseResult("系统不存在"));

@@ -1224,7 +1222,7 @@
         return;

      }



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         LogHelper.userInfo("提现时，不存在该系统");

         out.print(JsonUtil.loadFalseResult("系统不存在"));