admin
2019-03-15 3ff6731a55c21a982f0ba3fc95f0e9410e144ceb
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;
@@ -96,7 +96,6 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.WxDownService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -158,13 +157,7 @@
   private LostOrderService lostOrderService;
   @Resource
   private AccountMessageService accountMessageService;
   @Resource
   private HongBaoManageService hongBaoManageService;
   @Resource
   private WxDownService wxDownService;
   @Resource
   private UserAccountService loginService;
@@ -211,6 +204,9 @@
   @Resource
   private HongBaoV2CountService hongBaoV2CountService;
   @Resource
   private AccountMessageService accountMessageService;
   private static final String PASSWORD_MAX_ERROR = "password_max_error";
   private static final String EXTRACT_MIN_MONEY = "extract_min_money";
   private static final String EXTRACT_MAX_MONEY = "extract_max_money";
@@ -246,8 +242,6 @@
            // 邀请关系生效
            threeSaleSerivce.effective(find);
            // 重新计算用户等级
            threeSaleSerivce.reComputeUserRank(id);
            // 添加用户活跃记录
            UserActiveLog userActiveLog = new UserActiveLog();
@@ -267,7 +261,8 @@
         }
      }
      // 不是用ID的登陆的事就多了
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
            acceptData.getPackages());
      if (system == null) {
         out.print(JsonUtil.loadFalseResult("系统不存在"));
         return;
@@ -453,7 +448,8 @@
         }
      }
      // 不是用ID的登陆的事就多了
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
            acceptData.getPackages());
      if (system == null) {
         out.print(JsonUtil.loadFalseResult("系统不存在"));
         return;
@@ -605,7 +601,6 @@
            uuser.setLastLoginIp(remotIP);
            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
            userInfoService.updateLoginInfo(uuser);
            wxDownService.save(device);
            // 更新用户附加信息,老用户不存在的需要添加
            try {
               userInfoExtraService.updateUserRankByUid(uuser.getId());
@@ -1108,7 +1103,8 @@
         out.print(JsonUtil.loadFalseResult("用户不存在"));
         return;
      }
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
            acceptData.getPackages());
      if (system == null) {
         LogHelper.userInfo("提现时,不存在该系统");
         out.print(JsonUtil.loadFalseResult("系统不存在"));
@@ -1224,7 +1220,8 @@
         return;
      }
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
            acceptData.getPackages());
      if (system == null) {
         LogHelper.userInfo("提现时,不存在该系统");
         out.print(JsonUtil.loadFalseResult("系统不存在"));
@@ -1694,19 +1691,6 @@
      }
      data.put("list", array);
      data.put("count", count);
      out.print(JsonUtil.loadTrueResult(data));
   }
   @RequestMapping(value = "isWxDown")
   public void isWxDown(AcceptData acceptData, PrintWriter out) {
      boolean b = wxDownService.isWxDownFirstLogin(acceptData.getDevice());
      // IOS上线测试
      if (Integer.parseInt(acceptData.getVersion()) >= 22
            && acceptData.getPackages().equalsIgnoreCase(Constant.systemCommonConfig.getIosBundleId()))
         b = false;
      JSONObject data = new JSONObject();
      data.put("isFirst", b);
      out.print(JsonUtil.loadTrueResult(data));
   }