支付宝绑定提示语修改

admin

2018-12-07 9e1adbbbf0992ac0cb3c6a3d2d70f7f63db08c70

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

@@ -5,12 +5,14 @@
import java.util.ArrayList;

import java.util.Calendar;

import java.util.Collections;

import java.util.Date;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -45,11 +47,11 @@
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;

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

@@ -71,6 +75,7 @@
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;

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

@@ -102,9 +107,6 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/v1/user")

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



   @Resource

   private ScanHistoryService scanHistoryService;

   private ScanHistoryV2Service scanHistoryV2Service;



   @Resource

   private ShareManageService shareManageService;

@@ -211,7 +213,10 @@


   @Resource

   private CommonGoodsService commonGoodsService;



	
   @Resource

   private UserGoodsStorageService userGoodsStorageService;

 
   @RequestMapping(value = "getrecommendsection")

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



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

               }

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

            //

            // }

         }

      });

   }

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

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

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



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

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

            }