支付宝绑定提示语修改

admin

2018-12-07 9e1adbbbf0992ac0cb3c6a3d2d70f7f63db08c70

 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;



@@ -20,7 +19,7 @@
import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.google.gson.Gson;

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

@@ -197,17 +201,22 @@


   @Resource

   private ShamUserService shamUserService;




   @Resource

   private SpecialService specialService;

	


   @Resource

   private SwiperPictureService swiperPictureService;

	


   @Resource

   private MonitorService monitorService;



   @Resource

   private CommonGoodsService commonGoodsService;

	
   @Resource

   private UserGoodsStorageService userGoodsStorageService;

 
   @RequestMapping(value = "getrecommendsection")

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



@@ -622,18 +631,58 @@
         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

      }

      // TaoBaoGoodsBrief alimama = TaoBaoUtil.isAlimama(id);

      // 获取淘客参数

      ClientTBPid clientTBPid = null;

      // 用户已经登录

      if (!StringUtil.isNullOrEmpty(uid) && Long.parseLong(uid) > 0) {

         TBPid tbPid = null;

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {

            tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);

            if (tbPid != null) {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            } else {

               clientTBPid = tbPidService.getAndroidDefault();

            }



         } else {

            tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);

            if (tbPid != null) {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            } else {

               clientTBPid = tbPidService.getIOSDefault();

            }

         }

      } else {

         if (acceptData.getPlatform().equalsIgnoreCase("android"))

            clientTBPid = tbPidService.getAndroidDefault();

         else

            clientTBPid = tbPidService.getIOSDefault();

      }



      TaoBaoGoodsBrief tb = null;

      try {

         tb = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));

         TaoKeAppInfo app = new TaoKeAppInfo();

         TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(clientTBPid.getSiteId());

         app.setAdzoneId(clientTBPid.getAdZoneId());

         app.setAppKey(clientTBPid.getAppKey());

         app.setAppSecret(config.getAppSecret());

         app.setPid(clientTBPid.getPid());

         tb = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);

      } catch (NumberFormatException e1) {

         e1.printStackTrace();

      } catch (TaobaoGoodsDownException e1) {

         e1.printStackTrace();

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

         return;

      }



      if (tb != null) {

         tb.setAuctionUrl(null);

         // tb.setAuctionUrl(null);

         tb.setId(null);

         int type = 0;

         if ("android".equalsIgnoreCase(acceptData.getPlatform()))

@@ -646,56 +695,18 @@
         Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();

         JSONObject data = new JSONObject();

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



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

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

         }



         // 获取淘客参数

         ClientTBPid clientTBPid = null;

         // 用户已经登录

         if (!StringUtil.isNullOrEmpty(uid) && Long.parseLong(uid) > 0) {

            TBPid tbPid = null;

            if (acceptData.getPlatform().equalsIgnoreCase("android")) {

               tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);

               if (tbPid != null) {

                  String siteId = tbPid.getPid().split("_")[2];

                  String adzoneId = tbPid.getPid().split("_")[3];

                  TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                  clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

               } else {

                  clientTBPid = tbPidService.getAndroidDefault();

               }



            } else {

               tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);

               if (tbPid != null) {



                  String siteId = tbPid.getPid().split("_")[2];

                  String adzoneId = tbPid.getPid().split("_")[3];

                  TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                  clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

               } else {

                  clientTBPid = tbPidService.getIOSDefault();

               }

            }



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

               taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(TaoBaoCouponUtil

                     .getCoupleUrl(tb.getCouponActivityId(), tbPid.getPid(), tb.getAuctionId() + ""));



         } else {

            if (acceptData.getPlatform().equalsIgnoreCase("android"))

               clientTBPid = tbPidService.getAndroidDefault();

            else

               clientTBPid = tbPidService.getIOSDefault();

         }



         data.put("tbPidInfo", clientTBPid);



         taoBaoGoodsBriefExtra.setAuctionUrl(null);

         // taoBaoGoodsBriefExtra.setAuctionUrl(null);

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

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

         data.put("info", info);

@@ -733,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();

               }

@@ -976,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

@@ -1045,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) {

            //

            // }

         }

      });

   }

@@ -1168,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();

@@ -1288,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();

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

@@ -1323,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(""));



@@ -1481,7 +1474,7 @@
    */

   @RequestMapping(value = "getRecommendInfo")

   public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {

		


      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

@@ -1579,7 +1572,6 @@
      out.print(JsonUtil.loadTrueResult(root));

   }




   /**

    * 新版推荐专题管理(1.4.0)

    * 

@@ -1594,15 +1586,15 @@
         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

      }

		
      List<SwiperPicture> listswiper =  null;



      List<SwiperPicture> listswiper = null;

      if (!StringUtil.isNullOrEmpty(specialCard)) {

         try {

				


            listswiper = swiperPictureService.getByBannerCard(swiperCard);

				


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

               for (SwiperPicture swiperPicture: listswiper) {

               for (SwiperPicture swiperPicture : listswiper) {

                  swiperPicture.setBannerId(null);

                  swiperPicture.setCreatetime(null);

                  swiperPicture.setUpdatetime(null);

@@ -1610,34 +1602,34 @@
                  swiperPicture.setRemark(null);

               }

            }

				


         } catch (Exception e) {

            e.printStackTrace();

         }

      }

		


      Special miaoShaSpecial = null;

      List<Special> honestList =  new ArrayList<Special>();

      List<Special> honestList = new ArrayList<Special>();

      List<Special> specialList = new ArrayList<Special>();



      if (!StringUtil.isNullOrEmpty(specialCard)) {

         try {

            List<Special> listSpecial = specialService.listBySystemAndCard(specialCard, system.getId());

				


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

               for (Special special: listSpecial) {

               for (Special special : listSpecial) {

                  special.setCreatetime(null);

                  special.setUpdatetime(null);

                  special.setState(null);

                  special.setRemark(null);

                  special.setCard(null);

                  special.setCardId(null);

						


                  if ("限时秒杀".equals(special.getName())) {

                     miaoShaSpecial = special;

                     continue;

                  }

						


                  if ("arc".equals(special.getShowType())) {

                     // 同一行专题

                     honestList.add(special);

@@ -1647,11 +1639,11 @@
                  }

               }

            }

				


         } catch (Exception e) {

            e.printStackTrace();

         }

			


      }



      /* 限时秒杀 - 时间处理 */

@@ -1669,7 +1661,7 @@
               break;

            }

         }

			


         if (hour < 0)

            hour = 24;

         long time = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calendar.getTimeInMillis(), "yyyy-MM-dd"),

@@ -1684,11 +1676,9 @@
      root.put("miaoSha", msJSON);



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

		


   }

	
	
	


   /**

    * 商品基本详情 (1.4.0)

    * 

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

      }

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

@@ -1986,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();

            }

@@ -2084,8 +2075,8 @@


         if (goods == null) {

            // 从我们的商品库搜索

            CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);



            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,

                  CommonGoods.GOODS_TYPE_TB);

            // 商品有本地缓存

            if (cgoods != null) {

               // 按名字搜索商品

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

                     goodsList.add(gds);

                  }



               }



            }

         }