自动提现处理

admin

2019-09-08 2db0485ab8aa814499adf49112c5aa9e4c9e78b2

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

@@ -39,9 +39,11 @@
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;

import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;

import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;

import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

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

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.RecommendUserGoods;

@@ -71,12 +73,15 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.PushGoodsService;

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

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;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.util.factory.CommonGoodsFactory;

import com.yeshi.fanli.util.factory.msg.UserMsgVOFactory;

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

@@ -152,6 +157,9 @@
   @Resource

   private MsgDeviceReadStateService msgDeviceReadStateService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   // 消息的类型

   final static String MSG_TYPE_ORDER = "order";

   final static String MSG_TYPE_MONEY = "money";

@@ -193,6 +201,9 @@
            for (MsgOrderDetail detail : detailList) {

               JSONObject params = new JSONObject();

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

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

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

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

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

                     params));

            }

@@ -256,6 +267,7 @@
    * @param uid

    * @param out

    */

   @RequestSerializableByKey(key = "#acceptData.device")

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

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

      GsonBuilder androidBuilder = new GsonBuilder().registerTypeAdapter(Integer.class,

@@ -304,7 +316,7 @@
                  "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2, MsgDeviceReadState.TYPE_KEFU);

            data.put("totalCount", totalCount);

         }



         data.put("mineCount", 0);

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

         return;

      }

@@ -326,6 +338,18 @@
         data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));

      }

      data.put("totalCount", totalCount);

      // "我的"选项角标

      int welfareCenterNews = 0;

      if (uid != null) {

         UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

         if (userInfoExtra != null) {

            if (userInfoExtra.getCouponNews() != null) {

               welfareCenterNews = userInfoExtra.getCouponNews();

            }

         }

      }



      data.put("mineCount", welfareCenterNews);



      try {

         UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

@@ -468,6 +492,9 @@
   public void getHomeMsgList(AcceptData acceptData, Long uid, int page, HttpSession session, PrintWriter out) {

      if (uid != null && uid == 0)

         uid = null;

      if (uid != null)

         userSystemMsgService.syncSystemZNX(uid);



      String device = acceptData.getDevice();

      if (device == null || device.trim().length() == 0) {

         out.print(JsonUtil.loadFalseResult("设备号不能为空"));

@@ -630,10 +657,14 @@
    * @param type

    * @param out

    */

   @RequestSerializableByKey(key = "#acceptData.device")

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

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

      if (uid != null && uid == 0)

         uid = null;

      if (uid != null) {

         userSystemMsgService.syncSystemZNX(uid);

      }



      List<UserMsgCenter> listCenter = new ArrayList<>();



@@ -739,6 +770,9 @@
            for (MsgOrderDetail detail : detailList) {

               JSONObject params = new JSONObject();

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

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

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

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

               UserMsgVO userMsgVO = UserMsgVOFactory.create(detail,

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

               userMsgVO.setType(MSG_TYPE_ORDER);