淘口令格式兼容

admin

2020-09-24 ca1ad791b7b7b04e57db6bd4fb93f0c1066a9f99

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

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

import com.yeshi.fanli.entity.jd.JDGoods;

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

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

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

import com.yeshi.fanli.service.inter.config.ConfigService;

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