消息返回修改

admin

2019-02-28 4e938ce8cf18ebb12c102e7c18c1ca16fe1b15a8

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

@@ -1,10 +1,12 @@
package com.yeshi.fanli.controller.client;



import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Collections;

import java.util.Date;

import java.util.List;

import java.util.Map;



@@ -21,6 +23,10 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.Special;

@@ -40,6 +46,7 @@
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.bus.user.UserInfoExtra;

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

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

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

@@ -62,6 +69,7 @@
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.exception.user.UserCustomSettingsException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

@@ -87,12 +95,15 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

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

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

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.UserCustomSettingsService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -105,6 +116,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

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

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

import com.yeshi.fanli.vo.user.UserSettingsVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -217,6 +229,16 @@


   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   @Resource

   private UserCustomSettingsService userCustomSettingsService;



   @Resource

   private ShareGoodsActivityOrderService shareGoodsActivityOrderService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;




   @RequestMapping(value = "getrecommendsection")

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

@@ -703,7 +725,15 @@
         data.put("tbPidInfo", clientTBPid);



         JSONObject taobaoJson = JSONObject.fromObject(gson.toJson(taoBaoGoodsBriefExtra));

         if (taoBaoGoodsBriefExtra.getImgList() != null)

            taoBaoGoodsBriefExtra.getImgList().add(0, taoBaoGoodsBriefExtra.getPictUrl());

         taobaoJson.put("imgList", taoBaoGoodsBriefExtra.getImgList());

         taobaoJson.put("saleCount", taoBaoGoodsBriefExtra.getSalesCount());// 销量（和salesCount一致，此处处理兼容）

         if (taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)

            taobaoJson.put("coupon", true);

         else

            taobaoJson.put("coupon", false);



         // taoBaoGoodsBriefExtra.setAuctionUrl(null);

         data.put("taobao", taobaoJson);

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

@@ -1289,14 +1319,30 @@
      JSONObject data = new JSONObject();

      data.put("count", count);

      JSONArray array = new JSONArray();

      Gson gson = JsonUtil.getApiCommonGson();



      GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());

      gsonBuilder.excludeFieldsWithoutExposeAnnotation();

      gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {

         @Override

         public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {

            if (value == null) {

               return new JsonPrimitive("");

            } else {

               return new JsonPrimitive(value.getTime() + "");

            }

         }

      });



      Gson gson = gsonBuilder.create();



      if (list != null) {

         Map<String, String> map = hongBaoManageService.convertMap();

         BigDecimal proportion = manageService.getFanLiRate();

         for (ScanHistoryV2 sh : list) {

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

            goods.setId(sh.getId());

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

            TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");

            extra.setCreatetime(sh.getCreateTime());

            array.add(gson.toJson(extra));

         }

      }

      data.put("data", array);

@@ -1575,7 +1621,8 @@
    * @param out

    */

   @RequestMapping(value = "getNewRecommendInfo")

   public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {

   public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,

         PrintWriter out) {



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

      if (system == null) {

@@ -1686,7 +1733,16 @@
         if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)

               || ("ios".equalsIgnoreCase(acceptData.getPlatform())

                     && Integer.parseInt(acceptData.getVersion()) > 37)) {

            root.put("invite", invite);

            if (uid != null) {

               try {

                  UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

                  if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0)// 没有关闭邀请

                     root.put("invite", invite);

               } catch (UserCustomSettingsException e) {

                  e.printStackTrace();

               }

            } else

               root.put("invite", invite);

         }

      }



@@ -1700,10 +1756,11 @@
    * @param acceptData

    * @param id

    * @param uid

    * @param pageSource 页面来源

    * @param out

    */

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

   public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) {

   public void getGoodsInfo(AcceptData acceptData, String id, String uid, String from, PrintWriter out) {



      if ("0".equalsIgnoreCase(uid)) {

         uid = "";

@@ -1870,7 +1927,7 @@


      List<String> finalImgList = new ArrayList<>();

      for (String img : tb.getImgList()) {

         finalImgList.add(img);

         finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));

      }



      JSONObject goods = new JSONObject();

@@ -1881,10 +1938,6 @@
      goods.put("price", tb.getReservePrice().toString());

      goods.put("zkPrice", tb.getZkPrice().toString());



      // 红包

      BigDecimal proportion = manageService.getFanLiRate();

      String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      goods.put("hongBao", hongBao);

      // 30天销量

      goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));



@@ -1924,13 +1977,21 @@


      // 领券人列表

      List<ShamUser> listCouponUser = new ArrayList<ShamUser>();



		
      String hongBao = null;

		
      // 获取券信息

      if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {

         BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);

         JSONObject couponInfo = new JSONObject();

         couponInfo.put("couponPrice", quanPrice.toString());



			
         if (from != null && from.equals("miandan")) {

            // 免单商品

            hongBao = quanPrice.toString();

         }

			
			
         // 服务端转链

         if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {

            couponInfo.put("couponUrl", tb.getCouponLink());

@@ -1949,7 +2010,14 @@
            listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);

         }

      }



		
      // 红包

      if (hongBao == null) {

         BigDecimal proportion = manageService.getFanLiRate();

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      }

      goods.put("hongBao", hongBao);

		
      data.put("tbPidInfo", clientTBPid);



      String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId();

@@ -1994,6 +2062,17 @@
      data.put("goods", goods);

      data.put("shareUsers", listShareUser);

      data.put("couponUsers", listCouponUser);

      data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);



      JSONObject shareActivity = new JSONObject();

      shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

            new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

      shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");



      if (!StringUtil.isNullOrEmpty(uid)

            && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {

      } else

         data.put("shareActivity", shareActivity);



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



@@ -2078,62 +2157,9 @@
      }



      List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);



      // 重新做推荐

      if (goodsList == null || goodsList.size() == 0) {



         goodsList = new ArrayList<>();



         TaoBaoGoodsBrief goods = null;



         try {

            goods = redisManager.getTaoBaoGoodsBrief(id);

         } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

         }



         if (goods == null) {

            // 从我们的商品库搜索

            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,

                  CommonGoods.GOODS_TYPE_TB);

            // 商品有本地缓存

            if (cgoods != null) {

               // 按名字搜索商品

               SearchFilter sf = new SearchFilter();

               sf.setKey(cgoods.getTitle().substring(0, cgoods.getTitle().length() / 2));



               TaoBaoSearchResult result = TaoBaoUtil.search(sf);



               if (result != null && result.getTaoBaoGoodsBriefs() != null

                     && result.getTaoBaoGoodsBriefs().size() > 0) {



                  for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) {

                     if (goodsList.size() == 10) {

                        break;

                     }

                     goodsList.add(gds);

                  }

               }

            }

         }



         // 需要另做推荐

         if (goodsList.size() < 2) {

            try {

               List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);

               if (list != null) {

                  for (int i = 0; i < list.size(); i++) {

                     if (i == 10) {

                        break;

                     }

                     goodsList.add(list.get(i).getTaoBaoGoodsBrief());

                  }

               }

            } catch (Exception e2) {

               e2.printStackTrace();

            }



         }

      // 初始化

      if (goodsList == null) {

         goodsList = new ArrayList<TaoBaoGoodsBrief>();

      }



      BigDecimal proportion = manageService.getFanLiRate();

@@ -2206,4 +2232,64 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



   /**

    * 活动列表

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getSpecialActivities")

   public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {



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

      if (system == null) {

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

         return;

      }



      try {

         // 专题活动

         String specialCard = "special_activities";



         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,

               system.getId());



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

            for (Special special : listSpecial) {

               special.setCreatetime(null);

               special.setUpdatetime(null);

               special.setState(null);

               special.setRemark(null);

               special.setCard(null);

               special.setCardId(null);



               JumpDetailV2 jumpDetail = special.getJumpDetail();

               if (jumpDetail != null) {

                  jumpDetail.setId(null);

                  jumpDetail.setName(null);

               }

               // 邀请登陆验证

               if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()

                     && uid != null) {

						
                  UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

                  if (userInfoExtra != null && userInfoExtra.getInviteCode() != null

                        && userInfoExtra.getInviteCode().trim().length() > 0) {

							
                     JSONObject params = new JSONObject();

                     params.put("url", configService.get("invite_activation_success_url"));

                     special.setParams(params.toString());

                  }

               }

            }

         }



         JSONObject root = new JSONObject();

         root.put("special", listSpecial);



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

      } catch (Exception e) {

         e.printStackTrace();

      }

   }

}