admin
2020-07-03 651a15c78f668bef3859d9ed1bb7ad0b669d3600
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
@@ -124,7 +124,7 @@
         // 福利中心图片
         String topPicture = null;
         if (page == 1) {
            List<BannerVO> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
            List<BannerVO> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
            if (listswiper != null && listswiper.size() > 0) {
               topPicture = listswiper.get(0).getSrc();
            }
@@ -203,11 +203,11 @@
         }
         JSONObject dataTip = new JSONObject();
         dataTip.put("content", configService.get(ConfigKeyEnum.freeCouponTip.getKey()));
         dataTip.put("content", configService.getValue(ConfigKeyEnum.freeCouponTip.getKey(),acceptData.getSystem()));
         dataTip.put("fontColor", "#F14242");
         JSONObject data = new JSONObject();
         data.put("helpLink", configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
         data.put("helpLink", configService.getValue(ConfigKeyEnum.freeCouponHelp.getKey(),acceptData.getSystem()));
         data.put("tip", dataTip);
         data.put("count", resultList.size());
         data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
@@ -227,7 +227,6 @@
    * 免单券使用记录 以及状态修改
    * 
    * @param acceptData
    * @param page
    * @param uid
    * @param out
    */
@@ -277,7 +276,7 @@
         }
         JSONObject data = new JSONObject();
         data.put("helpLink", configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
         data.put("helpLink", configService.getValue(ConfigKeyEnum.rewardCouponHelp.getKey(),acceptData.getSystem()));
         data.put("count", resultList.size());
         data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
@@ -437,11 +436,11 @@
      }
      JSONObject dataTip = new JSONObject();
      dataTip.put("content", configService.get(ConfigKeyEnum.freeCouponTip.getKey()));
      dataTip.put("content", configService.getValue(ConfigKeyEnum.freeCouponTip.getKey(),acceptData.getSystem()));
      dataTip.put("fontColor", "#F14242");
      
      JSONObject data = new JSONObject();
      data.put("helpLink", configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
      data.put("helpLink", configService.getValue(ConfigKeyEnum.freeCouponHelp.getKey(),acceptData.getSystem()));
      data.put("tip", dataTip);
      data.put("count", list.size());
      data.put("list", JsonUtil.getApiCommonGson().toJson(list));