合并

yujian

2019-05-14 bbe1a381f99d957d003f48b68dfd5bf0e401f5f0

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

@@ -31,6 +31,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

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

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



@@ -97,7 +98,7 @@
            out.print(JsonUtil.loadFalseResult("店铺id为空"));

            return;

         }

         taoBaoShopHistoryService.addHistory(sid, uid, acceptData.getDevice());

			
         out.print(JsonUtil.loadTrueResult("记录成功"));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("记录失败"));

@@ -137,6 +138,15 @@
   @RequestMapping(value = "getHistory", method = RequestMethod.POST)

   public void getHistory(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {

      try {

         if (type == null) {

            out.print(JsonUtil.loadFalseResult("类型不正确"));

            return;

         }



         if (page == null || page < 1) {

            page = 1;

         }

			
         int pageSize;

         if (type == 1) {

            pageSize = 4;

@@ -164,13 +174,29 @@
            for (TaoBaoShopHistory history : listHistory) {

               TaoBaoShop taoBaoShop = history.getTaoBaoShop();

               if (taoBaoShop != null) {

						
                  String shopLink = taoBaoShop.getShopLink();

                  if (StringUtil.isNullOrEmpty(shopLink)) {

                     taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));

                  }

						
                  String shopNameCustom = taoBaoShop.getShopNameCustom();

                  if (!StringUtil.isNullOrEmpty(shopNameCustom)) {

                     taoBaoShop.setShopName(shopNameCustom);

                  }

						
                  String shopIconCustom = taoBaoShop.getShopIconCustom();

                  if (!StringUtil.isNullOrEmpty(shopIconCustom)) {

                     taoBaoShop.setShopIcon(shopIconCustom);

                  }

						
                  list.add(taoBaoShop);

               }

            }

         }



         JSONObject data = new JSONObject();

         data.put("count", list.size());

         data.put("count", count);

         data.put("list", JsonUtil.getApiCommonGson().toJson(list));



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

@@ -207,16 +233,44 @@
    * @param out

    */

   @RequestMapping(value = "getShopInfo", method = RequestMethod.POST)

   public void getShopInfo(AcceptData acceptData, Integer page, Long sid, PrintWriter out) {

   public void getShopInfo(AcceptData acceptData, Integer page, Long sid, Long uid, PrintWriter out) {

      try {

         if (sid == null) {

            out.print(JsonUtil.loadFalseResult("缺失店铺id"));

            return;

         }

			
         JSONObject data = new JSONObject();

         if (page == 1) {

            TaoBaoShop taoBaoShop = taoBaoShopService.selectByPrimaryKey(sid);

            if (taoBaoShop == null) {

               out.print(JsonUtil.loadFalseResult("店铺信息获取失败"));

               return;

            }

            taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));

            data.put("shop", taoBaoShop);

            String shopLink = taoBaoShop.getShopLink();

            if (StringUtil.isNullOrEmpty(shopLink)) {

               taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));

            }

				
            String shopNameCustom = taoBaoShop.getShopNameCustom();

            if (!StringUtil.isNullOrEmpty(shopNameCustom)) {

               taoBaoShop.setShopName(shopNameCustom);

            }

				
            String shopIconCustom = taoBaoShop.getShopIconCustom();

            if (!StringUtil.isNullOrEmpty(shopIconCustom)) {

               taoBaoShop.setShopIcon(shopIconCustom);

            }

            data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));

				
				
            ThreadUtil.run(new Runnable() {

               public void run() {

                  // 添加足迹

                  taoBaoShopHistoryService.addHistory(sid, uid, acceptData.getDevice());

               }

            });

				
         }



         int pageSize = Constant.PAGE_SIZE;