品牌排序

yujian

2019-11-26 2d3afb55aed07f9780ab46aefbdc7d520cdff576

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

@@ -29,12 +29,10 @@
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;

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

import com.yeshi.fanli.exception.redpack.RedPackBalanceException;

import com.yeshi.fanli.exception.redpack.RedPackExchangeException;

import com.yeshi.fanli.exception.redpack.RedPackGiveRecordException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

@@ -43,6 +41,7 @@
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;

@@ -98,6 +97,9 @@
   

   @Resource

   private UserSystemCouponService userSystemCouponService;

	
   @Resource

   private RedPackForbidService redPackForbidService;



   /**

    * 统计

@@ -122,14 +124,7 @@
      BigDecimal yesterdayUse = zero;

      BigDecimal thisMonthUse = zero;

      BigDecimal lastMonthUse = zero;

      BigDecimal balance = null;

      try {

         balance = redPackBalanceService.getBalance(uid);

      } catch (RedPackBalanceException e) {

         out.print(JsonUtil.loadFalseResult(1, e.getMsg()));

         return;

      }

		
      BigDecimal balance = redPackBalanceService.getBalance(uid);;

      if (balance == null) {

         balance = zero;

      } else {

@@ -395,21 +390,10 @@
      }



      JSONObject data = new JSONObject();

      try {

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

      } catch (RedPackBalanceException e) {

         out.print(JsonUtil.loadFalseResult(1, e.getMsg()));

         return;

      }

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