品牌缓存生效

yujian

2019-11-25 aa552facf6d833acab0d3e3e29bda2a0fb826ffe

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

@@ -41,14 +41,17 @@
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;

import com.yeshi.fanli.util.UserInviteUtil;

import com.yeshi.fanli.vo.redpack.RedPackDetailVO;

import com.yeshi.fanli.vo.redpack.RedPackWinDetailVO;

import com.yeshi.fanli.vo.redpack.RedPackWinInviteVO;

@@ -76,8 +79,8 @@


   @Resource

   private RedPackWinInviteService redPackWinInviteService;

	
   @Resource	


   @Resource

   private RedPackWinNewUserService redPackWinNewUserService;



   @Resource

@@ -85,12 +88,18 @@


   @Resource

   private UserInfoExtraService userInfoExtraService;

	


   @Resource

   private JumpDetailV2Service jumpDetailV2Service;

	


   @Resource

   private SwiperPictureService swiperPictureService;

	
   @Resource

   private UserSystemCouponService userSystemCouponService;

	
   @Resource

   private RedPackForbidService redPackForbidService;



   /**

    * 统计

@@ -115,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 {

@@ -379,25 +388,36 @@
         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }



      JSONObject data = new JSONObject();

      data.put("balance", redPackBalanceService.getBalance(uid));

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

      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());

      } 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)));

      } else

         out.print(JsonUtil.loadTrueResult(data));

   }

	
	


   /**

    * 新人红包详情

    * 
    * @param acceptData

    * @param uid

    * @param out

@@ -408,7 +428,7 @@
         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

		


      try {

         RedPackWinDetailVO winDetail = redPackWinNewUserService.receiveReward(uid);

         if (winDetail == null) {

@@ -417,7 +437,7 @@
         }

         winDetail.setLogo(Constant.systemCommonConfig.getDefaultPortrait());

         winDetail.setLogoLight(Constant.systemCommonConfig.getDefaultPortrait());

			


         JSONObject params = new JSONObject();

         params.put("url", redPackConfigService.getValueByKey("goods_shop_link_h5"));

         winDetail.setParams(params.toString());

@@ -430,11 +450,11 @@
         List<SwiperPicture> topPicList = new ArrayList<>();

         if (oldtopPicList != null && oldtopPicList.size() > 0)

            topPicList.addAll(oldtopPicList);

			


         JSONObject data = new JSONObject();

         data.put("detail", JsonUtil.getApiCommonGson().toJson(winDetail));

         data.put("banner", JsonUtil.getApiCommonGson().toJson(topPicList));

          out.print(JsonUtil.loadTrueResult(data));		
         out.print(JsonUtil.loadTrueResult(data));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult(1, "红包已被抢光啦"));

      }