fanli-server.git

			@@ -88,10 +88,10 @@

			@Resource
			private SwiperPictureService swiperPictureService;


			@Resource
			private UserSystemCouponService userSystemCouponService;


			@Resource
			private RedPackForbidService redPackForbidService;

			@@ -118,7 +118,8 @@
			BigDecimal yesterdayUse = zero;
			BigDecimal thisMonthUse = zero;
			BigDecimal lastMonthUse = zero;
			BigDecimal balance = redPackBalanceService.getBalance(uid);;
			BigDecimal balance = redPackBalanceService.getBalance(uid);
			;
			if (balance == null) {
			balance = zero;
			} else {
			@@ -191,12 +192,9 @@
			*
			* @param acceptData
			* @param uid
			* @param index
			* List最末的主键ID
			* @param year
			* 年份
			* @param month
			* 月份
			* @param index List最末的主键ID
			* @param year 年份
			* @param month 月份
			* @param out
			*/
			@RequestMapping(value = "getMoneyDetails")
			@@ -379,7 +377,7 @@
			@RequestMapping(value = "getBasicInfo")
			public void getBasicInfo(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
			if (uid == null \|\| uid <= 0) {
			out.print(JsonUtil.loadFalseResult(1, "用户未登录"));
			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "用户未登录"));
			return;
			}

			@@ -389,25 +387,26 @@
			data.put("shareLink", UserInviteUtil.getShareUrl(uid));
			data.put("redPackLock", redPackForbidService.verifyForbid(uid));

			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
			if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
			data.put("inviteCode", userInfoExtra.getInviteCode());
			String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
			if ( !StringUtil.isNullOrEmpty(inviteCode)) {
			data.put("inviteCode", inviteCode);
			} else {
			data.put("inviteCode", "");
			}

			//
			long freeCouponCount= userSystemCouponService.countUsableFreeCouponForBuy(uid);
			long rewardCouponCount= userSystemCouponService.countUsableRewardCoupon(uid);

			data.put("freeCouponCount", freeCouponCount);
			data.put("rewardCouponCount", rewardCouponCount);
			// 赠送免单券
			long freeCouponCount = userSystemCouponService.countGiveFreeCoupon(uid);
			// 奖励券
			long rewardCouponCount = userSystemCouponService.countUsableRewardCoupon(uid);

			data.put("freeCouponCount", freeCouponCount);
			data.put("rewardCouponCount", rewardCouponCount);

			if (!StringUtil.isNullOrEmpty(callback)) {
			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
			} else
			} else {
			out.print(JsonUtil.loadTrueResult(data));
			}
			}


			}