fanli-server.git

			@@ -27,10 +27,8 @@
			import com.google.gson.stream.JsonWriter;
			import com.yeshi.fanli.entity.accept.AcceptData;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
			import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
			import com.yeshi.fanli.entity.system.ConfigKeyEnum;
			import com.yeshi.fanli.exception.user.UserInfoExtraException;
			import com.yeshi.fanli.service.inter.config.ConfigService;
			import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
			import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
			@@ -189,8 +187,11 @@
			// 上月提现
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.extract);
			typeList.add(UserMoneyDetailTypeEnum.extractNew);
			typeList.add(UserMoneyDetailTypeEnum.extractVerify);
			typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);
			typeList.add(UserMoneyDetailTypeEnum.extractReject);
			typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);
			long timeStamp = System.currentTimeMillis();
			Calendar calendar = Calendar.getInstance();
			calendar.setTimeInMillis(timeStamp);
			@@ -201,7 +202,7 @@
			.convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
			vo.setLastMonthExtractMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs());


			// 本月提现
			maxDate = new Date(timeStamp);
			calendar = Calendar.getInstance();
			@@ -210,22 +211,28 @@
			calendar.add(Calendar.MONTH, -1);
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.extract);
			typeList.add(UserMoneyDetailTypeEnum.extractNew);
			typeList.add(UserMoneyDetailTypeEnum.extractVerify);
			typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);
			typeList.add(UserMoneyDetailTypeEnum.extractReject);
			typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);
			vo.setMonthExtractMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs());



			if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			// 上月收入
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.fanli);
			typeList.add(UserMoneyDetailTypeEnum.fanliNew);
			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);
			typeList.add(UserMoneyDetailTypeEnum.share);
			typeList.add(UserMoneyDetailTypeEnum.shareNew);
			typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.invite);
			typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
			typeList.add(UserMoneyDetailTypeEnum.teamReward);
			typeList.add(UserMoneyDetailTypeEnum.weiQuan);
			typeList.add(UserMoneyDetailTypeEnum.hongbao);
			typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
			@@ -238,23 +245,26 @@

			vo.setLatestThreeMonthRecievedMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());


			// 本月到账
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.fanli);
			typeList.add(UserMoneyDetailTypeEnum.fanliNew);
			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);
			typeList.add(UserMoneyDetailTypeEnum.share);
			typeList.add(UserMoneyDetailTypeEnum.shareNew);
			typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.invite);
			typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
			typeList.add(UserMoneyDetailTypeEnum.teamReward);
			typeList.add(UserMoneyDetailTypeEnum.weiQuan);
			typeList.add(UserMoneyDetailTypeEnum.hongbao);
			typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
			vo.setMonthRecievedMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());



			minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM"));
			Calendar ca = Calendar.getInstance();
			ca.setTime(new Date(timeStamp));
			@@ -264,60 +274,71 @@
			// 本月未到账
			BigDecimal monthUnRecievedMoney = hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate);
			vo.setMonthUnRecievedMoney(monthUnRecievedMoney);


			// 全部未到账
			minDate = new Date(0);
			maxDate = new Date(timeStamp);
			vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));


			// 总的到账
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.fanli);
			typeList.add(UserMoneyDetailTypeEnum.fanliNew);
			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);
			typeList.add(UserMoneyDetailTypeEnum.orderReward);
			typeList.add(UserMoneyDetailTypeEnum.orderRewardNew);
			typeList.add(UserMoneyDetailTypeEnum.share);
			typeList.add(UserMoneyDetailTypeEnum.shareNew);
			typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.invite);
			typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
			typeList.add(UserMoneyDetailTypeEnum.teamReward);
			typeList.add(UserMoneyDetailTypeEnum.weiQuan);
			typeList.add(UserMoneyDetailTypeEnum.hongbao);
			typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
			typeList.add(UserMoneyDetailTypeEnum.subsidy);
			typeList.add(UserMoneyDetailTypeEnum.orderTeamDividents);
			typeList.add(UserMoneyDetailTypeEnum.teamReward);
			vo.setTotalRecievedMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
			}


			minDate = new Date(0L);
			maxDate = new Date(timeStamp);


			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			// 总的自购返利
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.fanli);
			typeList.add(UserMoneyDetailTypeEnum.fanliNew);
			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);
			typeList.add(UserMoneyDetailTypeEnum.orderReward);
			typeList.add(UserMoneyDetailTypeEnum.orderRewardNew);
			vo.setTotalFanLiMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());


			// 累计成功提现
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.extract);
			typeList.add(UserMoneyDetailTypeEnum.extractNew);
			typeList.add(UserMoneyDetailTypeEnum.extractVerify);
			typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);
			typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);
			typeList.add(UserMoneyDetailTypeEnum.extractReject);
			vo.setTotalExtractMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs());
			}


			// 总的分享赚
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.share);
			typeList.add(UserMoneyDetailTypeEnum.shareNew);
			typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
			vo.setTotalShareMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());


			// 总的邀请赚
			typeList.clear();
			typeList.add(UserMoneyDetailTypeEnum.invite);
			@@ -325,12 +346,12 @@
			typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			typeList.add(UserMoneyDetailTypeEnum.subsidy);
			typeList.add(UserMoneyDetailTypeEnum.orderTeamDividents);
			typeList.add(UserMoneyDetailTypeEnum.teamReward);
			}

			vo.setTotalInviteMoney(
			userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());



			GsonBuilder builder = new GsonBuilder();
			builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
			@Override
			@@ -344,38 +365,20 @@
			}
			}
			});


			// 获取提现中的信息
			BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
			if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
			vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2, RoundingMode.HALF_UP));

			if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()) && !VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

			if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())
			&& !VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			// 获取是否绑定了微信
			if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
			vo.setBindingWX(true);
			} else
			vo.setBindingWX(false);

			UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
			// 如果绑定了微信而且未开通自动提现就先开通自动提现
			if (extra.getAutoExtract() == null && !StringUtil.isNullOrEmpty(user.getWxUnionId())) {
			UserInfoExtra update = new UserInfoExtra();
			update.setId(extra.getId());
			update.setAutoExtract(true);
			try {
			userInfoExtraService.saveUserInfoExtra(update);// 设置自动提现开启
			extra.setAutoExtract(true);
			} catch (UserInfoExtraException e) {
			e.printStackTrace();
			}
			}

			if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)
			vo.setAutoExtract(true);
			else
			vo.setAutoExtract(false);

			vo.setAutoExtract(false);
			vo.setAutoExtractHelpUrl(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));
			vo.setOpenAutoExtractMsg("自动提现必须要微信授权，当账户中的余额≥2元时，系统在保障你资金安全的情况下，以微信红包的形式完成提现");
			vo.setCloseAutoExtractMsg("关闭自动提现后，60天以内将不自动提现，60天后系统将会自动开启，敬请知晓");
			@@ -393,58 +396,7 @@
			*/
			@RequestMapping("autoExtract")
			public void autoExtract(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {
			if (type == null) {
			out.print(JsonUtil.loadFalseResult("请上传type"));
			return;
			}
			if (uid == null) {
			out.print(JsonUtil.loadFalseResult("用戶未登录"));
			return;
			}

			UserInfoExtra userExtra = userInfoExtraService.getUserInfoExtra(uid);
			UserInfo user = userInfoService.selectByPKey(uid);
			if (user == null) {
			out.print(JsonUtil.loadFalseResult("用戶不存在"));
			return;
			}
			if (type == 1)// 开启
			{
			if (userExtra.getAutoExtract() == null \|\| userExtra.getAutoExtract() == false) {
			if (StringUtil.isNullOrEmpty(user.getWxUnionId()))// 尚未綁定微信
			{
			out.print(JsonUtil.loadFalseResult("未綁定微信"));
			return;
			}
			// 设置自动提现
			UserInfoExtra update = new UserInfoExtra();
			update.setId(userExtra.getId());
			update.setAutoExtract(true);
			try {
			userInfoExtraService.saveUserInfoExtra(update);
			} catch (UserInfoExtraException e) {
			e.printStackTrace();
			}
			out.print(JsonUtil.loadTrueResult(""));
			return;
			} else {
			out.print(JsonUtil.loadTrueResult(""));
			return;
			}
			} else {// 关闭
			UserInfoExtra update = new UserInfoExtra();
			update.setId(userExtra.getId());
			update.setAutoExtract(false);
			update.setCloseTimeExtract(new Date());
			try {
			userInfoExtraService.saveUserInfoExtra(update);
			} catch (UserInfoExtraException e) {
			e.printStackTrace();
			}
			out.print(JsonUtil.loadTrueResult(""));
			return;
			}

			out.print(JsonUtil.loadFalseResult("该功能已下架"));
			}

			}