订单补贴消息修改

admin

2019-12-12 d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0

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

@@ -34,14 +34,18 @@
import com.yeshi.fanli.entity.redpack.RedPackWinInvite.RedPackWinInviteTypeEnum;

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

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

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

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

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

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.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;

@@ -79,6 +83,18 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   @Resource

   private SwiperPictureService swiperPictureService;



   @Resource

   private UserSystemCouponService userSystemCouponService;



   @Resource

   private RedPackForbidService redPackForbidService;



   /**

    * 统计

    * 

@@ -103,6 +119,7 @@
      BigDecimal thisMonthUse = zero;

      BigDecimal lastMonthUse = zero;

      BigDecimal balance = redPackBalanceService.getBalance(uid);

      ;

      if (balance == null) {

         balance = zero;

      } else {

@@ -175,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")

@@ -343,12 +357,14 @@
      }



      JSONObject data = new JSONObject();

      data.put("winMoney", redPackWinInviteService.getRewardMoney(uid).setScale(2));

      data.put("count", redPackWinInviteService.countRewardRecord(uid));

      data.put("list", JsonUtil.getApiCommonGson().toJson(list));

      if (!StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

      } else

      } else {

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

      }

   }



   /**

@@ -361,24 +377,36 @@
   @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;

      }



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

      String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);

      if ( !StringUtil.isNullOrEmpty(inviteCode)) {

         data.put("inviteCode", inviteCode);

      } else {

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

      }

		
      // 赠送免单券

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

      }

   }



}