分享订单号 取消隐藏

yujian

2020-04-29 bdce38de757cc606fbdc58d66dd604de8fd74efa

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java

@@ -76,6 +76,7 @@
import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -201,8 +202,7 @@
            for (MsgOrderDetail detail : detailList) {

               JSONObject params = new JSONObject();

               params.put("orderNo", detail.getOrderId());

               if (detail.getType() == MsgTypeOrderTypeEnum.share

                     || detail.getType() == MsgTypeOrderTypeEnum.invite)

               if (detail.getType() == MsgTypeOrderTypeEnum.invite   || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)

                  params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));

               list.add(UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search"),

                     params));

@@ -403,7 +403,7 @@
   }



   private void addRecommendGoods(Long uid, String device, String imei, String idfa) {

      TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa);

      TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa,"");

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

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

            if (result.getTaoBaoGoodsBriefs().get(i).getCouponAmount() == null

@@ -519,7 +519,7 @@
         }



         // String key = "recommend-goods-user-" + uid;

         String key = "recommend-goods-user-" + device;

         String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.recommendGoodsUser, device);

         if (Constant.IS_OUTNET) {

            if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {

               if (Constant.IS_OUTNET)

@@ -775,8 +775,7 @@
            for (MsgOrderDetail detail : detailList) {

               JSONObject params = new JSONObject();

               params.put("orderNo", detail.getOrderId());

               if (detail.getType() == MsgTypeOrderTypeEnum.share

                     || detail.getType() == MsgTypeOrderTypeEnum.invite)

               if (detail.getType() == MsgTypeOrderTypeEnum.invite   || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)

                  params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));

               UserMsgVO userMsgVO = UserMsgVOFactory.create(detail,

                     jumpDetailV2Service.getByTypeCache("order_search"), params);