品牌缓存生效

yujian

2019-11-25 aa552facf6d833acab0d3e3e29bda2a0fb826ffe

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java

@@ -29,7 +29,6 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

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

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

import com.yeshi.fanli.entity.redpack.RedPackBalance;

import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;

import com.yeshi.fanli.entity.redpack.RedPackExchange;

import com.yeshi.fanli.entity.redpack.RedPackWinInvite;

@@ -42,11 +41,13 @@
import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;

import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;

import com.yeshi.fanli.service.inter.redpack.RedPackExchangeService;

import com.yeshi.fanli.service.inter.redpack.RedPackForbidService;

import com.yeshi.fanli.service.inter.redpack.RedPackGiveRecordService;

import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;

import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -93,6 +94,12 @@


   @Resource

   private SwiperPictureService swiperPictureService;

	
   @Resource

   private UserSystemCouponService userSystemCouponService;

	
   @Resource

   private RedPackForbidService redPackForbidService;



   /**

    * 统计

@@ -117,7 +124,7 @@
      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 {

@@ -386,13 +393,7 @@
      data.put("balance", redPackBalanceService.getBalance(uid));

      data.put("ruleLink", redPackConfigService.getValueByKey("invite_reward_rule_link"));

      data.put("shareLink", UserInviteUtil.getShareUrl(uid));



      RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);

      if (redPackBalance != null && redPackBalance.getState() == RedPackBalance.STATE_LOCKED) {

         data.put("redPackLock", true);

      } else {

         data.put("redPackLock", false);

      }

      data.put("redPackLock", redPackForbidService.verifyForbid(uid));



      UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

      if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {

@@ -400,6 +401,13 @@
      } else {

         data.put("inviteCode", "");

      }

		
      //

     long freeCouponCount=   userSystemCouponService.countUsableFreeCouponForBuy(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)));