fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java
@@ -22,6 +22,7 @@ import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService; import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.VersionUtil; import net.sf.json.JSONObject; @@ -72,13 +73,26 @@ // 获取设备定义性别 int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice()); List<HomeNavbar> listNavbar = homeNavbarUserService.listEffectiveNavbar(uid, acceptData.getDevice(), deviceSex); if (listNavbar == null) { listNavbar = new ArrayList<HomeNavbar>(); List<HomeNavbar> list = new ArrayList<HomeNavbar>(); if (listNavbar != null) { list.addAll(listNavbar); } if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) { for (int i = 0; i < list.size(); i ++) { NavbarTypeEnum type = list.get(i).getType(); if (type == NavbarTypeEnum.commonTemplate) { list.remove(i); i--; } } } JSONObject data = new JSONObject(); data.put("sex", deviceSex); data.put("count", listNavbar.size()); data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(listNavbar)); data.put("count", list.size()); data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(list)); out.print(JsonUtil.loadTrueResult(data)); }
@@ -52,6 +52,7 @@ import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.account.UserUtil; import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory; import com.yeshi.fanli.util.factory.goods.CommonOrderFactory; import com.yeshi.fanli.util.jd.JDApiUtil; @@ -502,11 +503,11 @@ hongBaoMap.put("fontColor", hongbaoInfoFontColor); order.setHongBaoInfo(hongBaoMap); Integer sourceType = order.getSourceType(); // 非自购的订单 不显示返利、免单详情 if (HongBaoV2.TYPE_ZIGOU != hongBaoType) { order.setSignList(signList); } else { Integer sourceType = order.getSourceType(); // 奖励订单、免单 使用记录 if (sourceType == null) { setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList); @@ -519,17 +520,11 @@ } } // 邀请 隐藏订单号 if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) { String orderNo = order.getOrderNo(); orderNo = orderNo.substring(0, orderNo.length() - 6); order.setOrderNo(orderNo + "******"); } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType // 分享、邀请 隐藏订单号 if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) { String orderNo = order.getOrderNo(); orderNo = orderNo.substring(0, orderNo.length() - 6); order.setOrderNo(orderNo + "******"); order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo())); } } } fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java
@@ -182,8 +182,8 @@ public static String filterOrderId(String orderId) { if (orderId == null || orderId.length() <= 6) return orderId; if (orderId.length() <= 16) {// 隐藏3位 return orderId.substring(0, orderId.length() - 3) + "***"; if (orderId.length() <= 16) {// 隐藏2位 return orderId.substring(0, orderId.length() - 3) + "**"; } else {// 隐藏6位 return orderId.substring(0, orderId.length() - 6) + "******"; } fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -93,10 +93,13 @@ goodsInfo.setBaoyou(true); } List<ClientTextStyleVO> labels = goodsInfo.getLabels(); // 自营 String owner = otherDTO.getOwner(); if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) { List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>(); if (labels == null) { labels = new ArrayList<ClientTextStyleVO>(); } ClientTextStyleVO textStyleVO = new ClientTextStyleVO(); textStyleVO.setContent("京东自营"); textStyleVO.setColor("#E42219"); @@ -108,6 +111,15 @@ if (pinGouInfo != null) { goods.setPrice(pinGouInfo.getPingouPrice()); goodsInfo.setPriceName("拼购价"); if (labels == null) { labels = new ArrayList<ClientTextStyleVO>(); } ClientTextStyleVO textStyleVO = new ClientTextStyleVO(); textStyleVO.setContent("拼购"); textStyleVO.setColor("#FF9600"); labels.add(textStyleVO); goodsInfo.setLabels(labels); } else { goodsInfo.setPriceName("京东价"); } @@ -382,14 +394,6 @@ } goodsInfo.setSalesCount(salesCountMidea); JDPingouInfo pinGouInfo = goods.getPinGouInfo(); if (pinGouInfo != null) { goodsInfo.setZkPrice(pinGouInfo.getPingouPrice()); goodsInfo.setPriceName("拼购价"); } else { goodsInfo.setZkPrice(goods.getPrice()); goodsInfo.setPriceName("京东价"); } // 资金信息 MoneyInfoVO moneyInfoVO = new MoneyInfoVO(); @@ -423,10 +427,13 @@ goodsInfo.setCouponInfo(coupon); } List<ClientTextStyleVO> labels = goodsInfo.getLabels(); // 京东自营标签 String owner = goods.getOwner(); if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) { List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>(); if (labels == null) { labels = new ArrayList<ClientTextStyleVO>(); } ClientTextStyleVO textStyleVO = new ClientTextStyleVO(); textStyleVO.setContent("京东自营"); textStyleVO.setColor("#E42219"); @@ -437,6 +444,25 @@ goodsInfo.setShopType(20); // 京东 } JDPingouInfo pinGouInfo = goods.getPinGouInfo(); if (pinGouInfo != null) { goodsInfo.setZkPrice(pinGouInfo.getPingouPrice()); goodsInfo.setPriceName("拼购价"); if (labels == null) { labels = new ArrayList<ClientTextStyleVO>(); } ClientTextStyleVO textStyleVO = new ClientTextStyleVO(); textStyleVO.setContent("拼购"); textStyleVO.setColor("#FF9600"); labels.add(textStyleVO); goodsInfo.setLabels(labels); } else { goodsInfo.setZkPrice(goods.getPrice()); goodsInfo.setPriceName("京东价"); } // 店铺信息 JDShopInfo shopInfo = goods.getShopInfo(); if (shopInfo != null && !StringUtil.isNullOrEmpty(shopInfo.getShopName())) {
