上传图片返回格式调整

Administrator

2018-12-07 34390980b67c2549ec22a0e36db4d4b5210d004d

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -5,7 +5,6 @@
import java.util.ArrayList;

import java.util.Calendar;

import java.util.Collections;

import java.util.Date;

import java.util.List;

import java.util.Map;



@@ -41,17 +40,18 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;

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

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

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

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

import com.yeshi.fanli.entity.common.ImageInfo;

import com.yeshi.fanli.entity.common.JumpDetail;

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

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

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

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

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

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

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

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

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

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

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

@@ -60,6 +60,8 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;

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

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

import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.exception.goods.ScanHistoryException;

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

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

import com.yeshi.fanli.log.LogHelper;

@@ -68,10 +70,12 @@
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

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

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

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

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

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

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

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

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

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

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

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

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

@@ -87,10 +91,10 @@
import com.yeshi.fanli.service.inter.order.OrderService;

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

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

import com.yeshi.fanli.service.inter.user.ScanHistoryService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.ShareManageService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -130,7 +134,7 @@
   private OrderService orderService;



   @Resource

   private ScanHistoryService scanHistoryService;

   private ScanHistoryV2Service scanHistoryV2Service;



   @Resource

   private ShareManageService shareManageService;

@@ -160,7 +164,7 @@
   private HonestService honestService;



   @Resource

   private CollectionGoodsService collectionGoodsService;

   private CollectionGoodsV2Service collectionGoodsV2Service;



   @Resource

   private HongBaoManageMapper hongBaoManageMapper;

@@ -207,6 +211,12 @@
   @Resource

   private MonitorService monitorService;



   @Resource

   private CommonGoodsService commonGoodsService;

	
   @Resource

   private UserGoodsStorageService userGoodsStorageService;

 
   @RequestMapping(value = "getrecommendsection")

   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {



@@ -689,7 +699,7 @@
            taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());

         taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());

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

            CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),

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

                  Long.parseLong(id));

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

         }

@@ -734,16 +744,9 @@
         ThreadUtil.run(new Runnable() {

            public void run() {

               // 添加浏览记录



               ScanHistory sh = TaoBaoUtil.getScanHistory(tbb);

               sh.setDevice(acceptData.getDevice());

               sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));

               sh.setCreatetime(new Date());

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

                  sh.setUid(Long.parseLong(uid));

               }

               try {

                  scanHistoryService.addScanHistory(sh);

                  scanHistoryV2Service.addScanHistory(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),

                        acceptData.getDevice(), tbb);

               } catch (Exception e) {

                  e.printStackTrace();

               }

@@ -977,7 +980,7 @@


      // 判断收藏

      if (!StringUtil.isNullOrEmpty(uid)) {

         CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),

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

               Long.parseLong(id));

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

      } else

@@ -1046,25 +1049,17 @@
      ThreadUtil.run(new Runnable() {

         public void run() {

            // 添加浏览记录

            ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo);

            sh.setId(0);

            sh.setDevice(acceptData.getDevice());

            sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));

            sh.setCreatetime(new Date());

            if (!StringUtil.isNullOrEmpty(tempUid)) {

               sh.setUid(Long.parseLong(tempUid));

            }

            try {

               scanHistoryService.addScanHistory(sh);

            } catch (Exception e) {

               scanHistoryV2Service.addScanHistory(

                     StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),

                     goodsInfo);

            } catch (NumberFormatException e) {

               e.printStackTrace();

            } catch (CommonGoodsException e) {

               e.printStackTrace();

            } catch (ScanHistoryException e) {

               e.printStackTrace();

            }



            // try {

            // taoBaoGoodsBriefService.updateTBGoodsWithNewInfo(goodsInfo);

            // } catch (Exception e) {

            //

            // }

         }

      });

   }

@@ -1169,7 +1164,9 @@
         if (goods == null)// 商品下线

         {

            // 从我们的商品库搜索

            CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);

            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,

                  CommonGoods.GOODS_TYPE_TB);



            if (cgoods != null) {// 商品有本地缓存

               // 按名字搜索商品

               SearchFilter sf = new SearchFilter();

@@ -1289,13 +1286,10 @@
         out.print(JsonUtil.loadFalseResult(1, "不存在该系统"));

         return;

      }

      boolean b = NumberUtil.isNumeric(uid);

      long id = 0;

      if (b) {

         id = Long.parseLong(uid);

      }

      List<ScanHistory> list = scanHistoryService.getScanHistory(sys.getId(), acceptData.getDevice(), page, 20, id);

      long count = scanHistoryService.getScanHistoryCount(sys.getId(), acceptData.getDevice(), id);

      List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(

            StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20);

      long count = scanHistoryV2Service.getCountByDeviceOrUid(

            StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice());

      JSONObject data = new JSONObject();

      data.put("count", count);

      JSONArray array = new JSONArray();

@@ -1304,10 +1298,10 @@
         Map<String, String> map = hongBaoManageService.convertMap();

         String proportion = map.get("hongbao_goods_proportion");

         String fcRate = map.get("hongbao_fc_ratio");

         for (ScanHistory sh : list) {

            sh.setSalesCount(TaoBaoUtil.getSaleCount(sh.getBiz30day()));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.getTaoBaoGoodsBrief(sh),

                  proportion, fcRate, "")));

         for (ScanHistoryV2 sh : list) {

            TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());

            goods.setId(sh.getId());

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "")));

         }

      }

      data.put("data", array);

@@ -1324,18 +1318,16 @@
         return;

      }



      long id = 0;

      if (NumberUtil.isNumeric(uid)) {

         id = Long.parseLong(uid);

      }



      if ("0".equals(type)) {

         String[] idStr = ids.split(",");

         for (String auctionIdStr : idStr) {

            scanHistoryService.deleteScanHistory(acceptData.getDevice(), sys, Long.parseLong(auctionIdStr), id);

            scanHistoryV2Service.deleteByAuctionIdAndDeviceOrUid(

                  StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),

                  Long.parseLong(auctionIdStr));

         }

      } else {

         scanHistoryService.deleteScanHistory(acceptData.getDevice(), sys, id);

         scanHistoryV2Service.deleteByDeviceOrUid(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),

               acceptData.getDevice());

      }

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



@@ -1890,7 +1882,7 @@
      if (StringUtil.isNullOrEmpty(uid)) {

         data.put("collected", false);

      } else {

         CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),

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

               Long.parseLong(id));

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

      }

@@ -1972,6 +1964,13 @@
      // 分享路径

      String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());



      // 是否加入选品库：   0未加入 1 已加入

      boolean storageState = false;

      if (uid != null && uid.trim().length() > 0) {

         storageState = userGoodsStorageService.isExistStorage(Long.parseLong(uid), Long.parseLong(id));

      }

		
      data.put("storageState", storageState);

      data.put("shareUrl", shareUrl);

      data.put("goods", goods);

      data.put("shareUsers", listShareUser);

@@ -1984,16 +1983,10 @@
      ThreadUtil.run(new Runnable() {

         public void run() {

            // 添加浏览记录

            ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo);

            sh.setId(0);

            sh.setDevice(acceptData.getDevice());

            sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));

            sh.setCreatetime(new Date());

            if (!StringUtil.isNullOrEmpty(tempUid)) {

               sh.setUid(Long.parseLong(tempUid));

            }

            try {

               scanHistoryService.addScanHistory(sh);

               scanHistoryV2Service.addScanHistory(

                     StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),

                     goodsInfo);

            } catch (Exception e) {

               e.printStackTrace();

            }

@@ -2082,8 +2075,8 @@


         if (goods == null) {

            // 从我们的商品库搜索

            CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);



            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,

                  CommonGoods.GOODS_TYPE_TB);

            // 商品有本地缓存

            if (cgoods != null) {

               // 按名字搜索商品

@@ -2101,9 +2094,7 @@
                     }

                     goodsList.add(gds);

                  }



               }



            }

         }