奖励券使用优化类型

yujian

2019-07-19 8222e8b237c5dfb0affcdc03335bfadc06403bf8

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

@@ -190,8 +190,12 @@
         List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);

         count = msgOrderDetailService.countMsgOrderDetail(uid);

         if (detailList != null)

            for (MsgOrderDetail detail : detailList)

               list.add(UserMsgVOFactory.create(detail));

            for (MsgOrderDetail detail : detailList) {

               JSONObject params = new JSONObject();

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

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

                     params));

            }

         break;

      case MSG_TYPE_MONEY:

         userMsgReadStateService.readMoneyMsg(uid);

@@ -293,6 +297,12 @@
               data.put("totalCount", 0);

            }

         } catch (UserCustomSettingsException e) {

         }



         if (VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())) {

            int totalCount = msgDeviceReadStateService.getUnReadCount(acceptData.getDevice(),

                  "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2, MsgDeviceReadState.TYPE_KEFU);

            data.put("totalCount", totalCount);

         }



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

@@ -604,8 +614,8 @@


      } else

         vo.setRead(true);

		
      if(StringUtil.isNullOrEmpty(vo.getLatestMsg()))



      if (StringUtil.isNullOrEmpty(vo.getLatestMsg()))

         vo.setLatestMsg("[点击打开人工客服]");



      return vo;

@@ -727,7 +737,10 @@
         List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);

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

            for (MsgOrderDetail detail : detailList) {

               UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);

               JSONObject params = new JSONObject();

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

               UserMsgVO userMsgVO = UserMsgVOFactory.create(detail,

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

               userMsgVO.setType(MSG_TYPE_ORDER);

               list.add(userMsgVO);

            }