发圈处理

yj

2020-03-06 207dc8655711cddac2653e18b51e58a88dba2084

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java

@@ -19,6 +19,7 @@
import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;

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

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

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.system.SystemCoupon;

import com.yeshi.fanli.exception.user.UserLotteryRecordException;

import com.yeshi.fanli.exception.user.UserSystemCouponException;

@@ -104,7 +105,7 @@
         // 福利中心图片

         String topPicture = null;

         if (page == 1) {

            List<SwiperPicture> listswiper = swiperPictureService.getByBannerCard("welfare_top");

            List<SwiperPicture> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

            if (listswiper != null && listswiper.size() > 0) {

               topPicture = listswiper.get(0).getSrc();

            }

@@ -184,11 +185,11 @@
         }



         JSONObject dataTip = new JSONObject();

         dataTip.put("content", configService.get("free_coupon_tip"));

         dataTip.put("content", configService.get(ConfigKeyEnum.freeCouponTip.getKey()));

         dataTip.put("fontColor", "#F14242");



         JSONObject data = new JSONObject();

         data.put("helpLink", configService.get("free_coupon_help"));

         data.put("helpLink", configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));

         data.put("tip", dataTip);

         data.put("count", resultList.size());

         data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));

@@ -257,7 +258,7 @@
         }



         JSONObject data = new JSONObject();

         data.put("helpLink", configService.get("reward_coupon_help"));

         data.put("helpLink", configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));

         data.put("count", resultList.size());

         data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));



@@ -402,7 +403,7 @@
            count = count - list.size();

         }

         // 抽奖规则

         String lotteryRule = configService.get("lottery_rule_newbies");

         String lotteryRule = configService.get(ConfigKeyEnum.lotteryRuleNewbies.getKey());

         

         JSONObject data = new JSONObject();

         data.put("count", count);