From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 13 三月 2019 12:02:16 +0800 Subject: [PATCH] 正式数据库修改 --- fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 324 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 190 insertions(+), 134 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java index 02218ce..b31554e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java +++ b/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; @@ -160,8 +172,6 @@ @Resource private SystemConfigService systemConfigService; - - @Resource private CollectionGoodsV2Service collectionGoodsV2Service; @@ -219,6 +229,15 @@ @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) { @@ -306,7 +325,7 @@ @RequestMapping(value = "getHonestList") public void getHonestList(AcceptData acceptData, PrintWriter out) { System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages()); - List<Honest> honestList =null; + List<Honest> honestList = null; List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID); if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform())) || ("ios".equalsIgnoreCase(acceptData.getPlatform()) @@ -620,49 +639,42 @@ return; } System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages()); - // 娣樼壒浠� - if (system.getId() == 7) { - system = systemService.getSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName()); - } if (system == null) { out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�")); return; } - // 鑾峰彇娣樺鍙傛暟 - 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 simpleGoods = null; + try { + simpleGoods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id)); + } catch (NumberFormatException e2) { + e2.printStackTrace(); + } catch (TaobaoGoodsDownException e2) { + e2.printStackTrace(); } + if (simpleGoods == null) { + out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�")); + return; + } + + // 鑾峰彇娣樺鍙傛暟 + ClientTBPid clientTBPid = null; + if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) { + String pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT; + clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET, + pid.split("_")[2], pid.split("_")[3]); + } else { + if (acceptData.getPlatform().equalsIgnoreCase("android")) { + clientTBPid = tbPidService.getAndroidDefault(); + } else { + clientTBPid = tbPidService.getIOSDefault(); + } + } + TaoBaoGoodsBrief tb = null; try { TaoKeAppInfo app = new TaoKeAppInfo(); @@ -704,8 +716,18 @@ 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());// 閿�閲忥紙鍜宻alesCount涓�鑷达紝姝ゅ澶勭悊鍏煎锛� + if (taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null) + taobaoJson.put("coupon", true); + else + taobaoJson.put("coupon", false); + // taoBaoGoodsBriefExtra.setAuctionUrl(null); - data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra)); + data.put("taobao", taobaoJson); String info = configService.get("detail_prompt"); data.put("info", info); String onlyInfo = configService.get("only_info"); @@ -1244,7 +1266,7 @@ String[] orderArr = order.split(","); for (String tbOrder : orderArr) { Order or = new Order(); - or.setBeizhu("绯荤粺娣诲姞"); + or.setBeizhu("鎺ュ彛娣诲姞"); or.setCreatetime(java.lang.System.currentTimeMillis()); or.setDrawbackTime(0L); or.setOrderId(tbOrder.trim()); @@ -1289,14 +1311,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); @@ -1355,16 +1393,18 @@ /** * 闃叉璇锋眰棰戠巼杩囬珮 + * */ - String key = "linkParse-" + acceptData.getDevice() + "-" + id; + if (Constant.IS_OUTNET) { + String key = "linkParse-" + acceptData.getDevice() + "-" + id; - String value = redisManager.getCommonString(key); - if (!StringUtil.isNullOrEmpty(value)) { - out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗")); - return; + String value = redisManager.getCommonString(key); + if (!StringUtil.isNullOrEmpty(value)) { + out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗")); + return; + } + redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧 } - redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧 - TaoBaoGoodsBrief goods = null; try { goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id)); @@ -1573,7 +1613,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) { @@ -1587,14 +1628,8 @@ listswiper = swiperPictureService.getByBannerCard(swiperCard); - if (listswiper != null && listswiper.size() > 0) { - for (SwiperPicture swiperPicture : listswiper) { - swiperPicture.setBannerId(null); - swiperPicture.setCreatetime(null); - swiperPicture.setUpdatetime(null); - swiperPicture.setState(null); - swiperPicture.setRemark(null); - } + if (listswiper == null) { + listswiper = new ArrayList<SwiperPicture>(); } } catch (Exception e) { @@ -1612,12 +1647,6 @@ 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); if ("闄愭椂绉掓潃".equals(special.getName())) { miaoShaSpecial = special; @@ -1631,6 +1660,7 @@ // 鍏朵粬涓撻 specialList.add(special); } + } } @@ -1664,16 +1694,17 @@ } JSONObject root = new JSONObject(); - root.put("banner", listswiper); - root.put("honest", honestList); - root.put("special", specialList); + + root.put("banner", JsonUtil.getApiCommonGson().toJson(listswiper)); + root.put("honest", JsonUtil.getApiCommonGson().toJson(honestList)); + root.put("special", JsonUtil.getApiCommonGson().toJson(specialList)); root.put("miaoSha", msJSON); // 澧炲姞閭�璇锋湁濂� JSONObject invite = new JSONObject(); JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite"); invite.put("jumpDetail", jumpDetail); - invite.put("picture", "http://ec-1255749512.file.myqcloud.com/resource/weex/img/invite_input_img.png"); + invite.put("picture", configService.get("home_invite_banner")); if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) { @@ -1684,7 +1715,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); } } @@ -1698,10 +1738,12 @@ * @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 = ""; @@ -1796,7 +1838,7 @@ // 鍟嗗搧涓嬫灦 ThreadUtil.run(new Runnable() { public void run() { - taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id)); + taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id)); } }); @@ -1823,7 +1865,11 @@ } catch (NumberFormatException e) { e.printStackTrace(); } catch (TaobaoGoodsDownException e) { - e.printStackTrace(); + ThreadUtil.run(new Runnable() { + public void run() { + taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id)); + } + }); } } @@ -1864,7 +1910,7 @@ List<String> finalImgList = new ArrayList<>(); for (String img : tb.getImgList()) { - finalImgList.add(img); + finalImgList.add(TbImgUtil.getTBSizeImg(img, 600)); } JSONObject goods = new JSONObject(); @@ -1875,10 +1921,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())); @@ -1919,11 +1961,18 @@ // 棰嗗埜浜哄垪琛� 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())) { @@ -1943,6 +1992,13 @@ 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); @@ -1988,6 +2044,25 @@ 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); + + // 鍙栨秷鍒嗕韩娲诲姩 + // if (!StringUtil.isNullOrEmpty(uid) + // && + // shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) + // > 0) { + // } else if(!"miandan".equals(from)) { + // // 闈炲厤鍗曞晢鍝� + // 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"); + // + // data.put("shareActivity", shareActivity); + // } out.print(JsonUtil.loadTrueResult(data)); @@ -2072,62 +2147,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(); @@ -2200,4 +2222,38 @@ 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 = new ArrayList<Special>(); + } + + JSONObject root = new JSONObject(); + root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial)); + out.print(JsonUtil.loadTrueResult(root)); + + } catch (Exception e) { + e.printStackTrace(); + } + } } -- Gitblit v1.8.0