返利配置文件加入系统区分

admin

2020-07-07 c9cbad5f5d18c6b2ac5a063e41007933d7028329

 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.web;



import java.io.PrintWriter;

import java.security.AccessControlContext;

import java.util.ArrayList;

import java.util.List;



@@ -18,17 +19,20 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

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

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

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

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

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

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

import com.yeshi.fanli.log.LogManager;

import com.yeshi.fanli.log.LogType;

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

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

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

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -82,7 +86,8 @@
   @RequestMapping(value = "getRecommenBanner", method = RequestMethod.GET)

   public void getRecommendBanner(AcceptData acceptData, String callback, PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

      BusinessSystem system = businessSystemService.getBusinessSystem("WEB",

            Constant.systemCommonConfig.getH5PackageName(),acceptData.getSystem());

      JSONObject json = new JSONObject();

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));

@@ -123,7 +128,6 @@
      return;

   }





   /**

    * 

    * 方法说明: 获取商品详情

@@ -136,18 +140,15 @@
    */



   @RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)

   public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, String callback,

         PrintWriter out) {

   public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, Integer goodsType,

         String callback, PrintWriter out) {

	
      long begin = java.lang.System.currentTimeMillis();

      if (StringUtil.isNullOrEmpty(id)) {

         out.print(JsonUtil.loadFalseResult(1, "请上传id"));

         return;

      }

      BusinessSystem system = webControllerUtil.getSystem(acceptData);

      // 淘特价

      if (system.getId() == 7) {

         system = businessSystemService.getBusinessSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());

      }



      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));

@@ -175,20 +176,20 @@
         else

            type = 2;

         List<TaoBaoUnionConfig> config = taoBaoUnionConfigService.getConfigByTypeCache(type);

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, config.get(0));

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, config.get(0),acceptData.getSystem());

         if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)

            taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());



         if (uid != null && !"".equals(uid.trim())) {

            CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),

                  Long.parseLong(id));

                  Long.parseLong(id), goodsType);

            data.put("collection", collectionGoods != null ? true : false);

         }

         taoBaoGoodsBriefExtra.setAuctionUrl(null);

         data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));

         String info = configService.get("detail_prompt");

         String info = configService.getValue(ConfigKeyEnum.detailPrompt.getKey(), acceptData.getSystem());

         data.put("info", info);

         String onlyInfo = configService.get("only_info");

         String onlyInfo = configService.getValue(ConfigKeyEnum.onlyInfo.getKey(), acceptData.getSystem());

         data.put("only", onlyInfo);

         int showType = taoBaoGoodsBriefExtra.getShowType();

         String price = "";

@@ -203,18 +204,18 @@
         data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());

         data.put("shareContent", "¥" + price + "元");

         data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());

         String html = configService.get("downAPP");

         String html = configService.getValue(ConfigKeyEnum.downAPP.getKey(), acceptData.getSystem());

         data.put("downAPP", html);

         String shareSinaContent = configService.get("shareSinaContent");

         String shareSinaContent = configService.getValue("shareSinaContent", acceptData.getSystem());

         data.put("shareSina",

               "¥" + price + "元      送" + appName + "红包¥"

                     + taoBaoGoodsBriefExtra.getTaoBaoHongBaoInfo().getHongbao() + "元    "

                     + taoBaoGoodsBriefExtra.getTitle() + shareSinaContent);



         data.put("sharemoney", "分享奖金 ¥" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb) + "元");

         data.put("sharemoney", "分享奖金 ¥" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb,acceptData.getSystem()) + "元");

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



         final TaoBaoGoodsBrief tbb=tb;

         final TaoBaoGoodsBrief tbb = tb;



      } else {

         out.print(JsonUtil.loadFalseResult(2, "商品已下架"));