修改uid为playerId ，修改bug， 整合后台

incubator-center/src/main/java/com/incubator/center/listener/CenterInnerListener.java

@@ -146,7 +146,7 @@ public class CenterInnerListener extends GameServerConnectionListener {
 //                conn.writeAndFlush(super.packMessage(msg));
 			}
 		} catch (Exception e) {
-			Log.info("发送心跳请求出错：{}, {}", conn.getUid(), e.getMessage());
+			Log.info("发送心跳请求出错：{}, {}", conn.getPlayerId(), e.getMessage());
 		}
 	}
 
@@ -158,7 +158,7 @@ public class CenterInnerListener extends GameServerConnectionListener {
 			data.put("currentTimeMillis", System.currentTimeMillis());
 			connection.writeAndFlush(new WSResponse(CommonProto.Cmd.HeartBeatRes, data).toBytes());
 		} catch (Exception e) {
-			Log.info("发送心跳回复出错：{}, {}", connection.getUid(), e.getMessage());
+			Log.info("发送心跳回复出错：{}, {}", connection.getPlayerId(), e.getMessage());
 		}
 	}
 }

incubator-game/src/main/java/com/incubator/game/data/po/MessagePO.java

@@ -2,6 +2,7 @@ package com.incubator.game.data.po;
 
 import cn.hutool.json.JSONArray;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -33,7 +34,20 @@ public class MessagePO {
     /**
      * 消息时间
      */
-    private Date autoDeleteTime;
+    private LocalDateTime autoDeleteTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
 
     /**
      * 消息状态
@@ -97,11 +111,11 @@ public class MessagePO {
         this.content = content;
     }
 
-    public Date getAutoDeleteTime() {
+    public LocalDateTime getAutoDeleteTime() {
         return autoDeleteTime;
     }
 
-    public void setAutoDeleteTime(Date autoDeleteTime) {
+    public void setAutoDeleteTime(LocalDateTime autoDeleteTime) {
         this.autoDeleteTime = autoDeleteTime;
     }
 

incubator-game/src/main/java/com/incubator/game/data/po/ZjProductPo.java

@@ -108,6 +108,20 @@ public class ZjProductPo {
      */
     private Integer updatePeople;
 
+    /**
+     * 商品售价
+     */
+    private Integer productSellPrice;
+
+
+    public Integer getProductSellPrice() {
+        return productSellPrice;
+    }
+
+    public void setProductSellPrice(Integer productSellPrice) {
+        this.productSellPrice = productSellPrice;
+    }
+
     public String getProductId() {
         return productId;
     }

incubator-game/src/main/java/com/incubator/game/handler/address/GetAddressList.java

@@ -30,7 +30,7 @@ public class GetAddressList extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetAddressListRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject userObject = JSONUtil.parseObj(userInfo);
         JSONArray userAddress = userObject.getJSONArray("userAddress");

incubator-game/src/main/java/com/incubator/game/handler/address/SaveAddress.java

@@ -34,10 +34,10 @@ public class SaveAddress extends NetHandler {
         String receiver = request.getDataValue("receiver", String.class, "");
         String mobile = request.getDataValue("mobile", String.class, "");
         String addr = request.getDataValue("addr", String.class, "");
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String status = request.getDataValue("status", String.class, "");
-        String commonAddr = request.getDataValue("commonAddr", String.class, "");
-        String addrId = request.getDataValue("addrId", String.class, "");
+        String commonAddr = request.getDataValue("commonAddr", String.class, null);
+        String addrId = request.getDataValue("addrId", String.class, null);
 
         ZjMemberAddrPO zjMemberAddrPO = new ZjMemberAddrPO();
         zjMemberAddrPO.setReceiver(receiver);

incubator-game/src/main/java/com/incubator/game/handler/backpack/BagInfo.java

@@ -33,7 +33,7 @@ public class BagInfo extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.BagInfoRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject userObject = JSONUtil.parseObj(userInfo);
         JSONArray userBackpack = userObject.getJSONArray("userBackpack");
@@ -42,19 +42,6 @@ public class BagInfo extends NetHandler {
                 .filter(item -> "N".equals(item.getIsEmploy()))
                 .collect(Collectors.toList());
         Map<String,Object> map = new HashMap<>();
-//        List<Map<String, Object>> newList  = new ArrayList<>();
-//        for (ZjBackpackPO zjBackpackPO : zjBackpackPOS) {
-//            Map<String, Object> backPO = new HashMap<>();
-//            backPO.put("backId", zjBackpackPO.getBackId());
-//            backPO.put("userId", zjBackpackPO.getUserId());
-//            backPO.put("goodsId", zjBackpackPO.getGoodsId());
-//            backPO.put("goodsNum", zjBackpackPO.getGoodsNum());
-//            backPO.put("goodsName", zjBackpackPO.getGoodsName());
-//            backPO.put("goodsDescription", zjBackpackPO.getGoodsDescription());
-//            backPO.put("goodsType", zjBackpackPO.getGoodsType());
-//            backPO.put("goodsImg", zjBackpackPO.getGoodsImg());
-//            newList.add(backPO);
-//        }
         List<Map<String, Object>> maps = ObjectMapperUtil.convertListToMapList(zjBackpackPOS);
         map.put("userBackpack",maps);
         response.setData(map);

incubator-game/src/main/java/com/incubator/game/handler/backpack/BagUse.java

@@ -56,7 +56,7 @@ public class BagUse extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.BagUseRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String backId = request.getDataValue("backId", String.class, "");
         String receiveId = request.getDataValue("receiveId", String.class, "");//接收者id
         String addressee = request.getDataValue("addressee", String.class, "");//收件人

incubator-game/src/main/java/com/incubator/game/handler/club/ApplyJoinClub.java

@@ -42,7 +42,7 @@ public class ApplyJoinClub extends NetHandler {
          *     "requestChannel":"123",申请渠道
          * }
          */
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String clubId = request.getDataValue("clubId", String.class, "");
         String memberStatus = request.getDataValue("memberStatus", String.class, "");
         String requestExplain = request.getDataValue("requestExplain", String.class, "");

incubator-game/src/main/java/com/incubator/game/handler/club/CreateClub.java

@@ -37,7 +37,7 @@ public class CreateClub extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.CreateClubRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject userObject = JSONUtil.parseObj(userInfo);
 //        int s = (int) userObject.get("sevenScore");

incubator-game/src/main/java/com/incubator/game/handler/club/CreateClubList.java

@@ -30,7 +30,7 @@ public class CreateClubList extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.CreateClubListRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String clubs = RedisUtil.get(RedisKeyConstant.CLUB_BASE);
         JSONObject clubListObject = JSONUtil.parseObj(clubs);
         JSONArray clubListArray = clubListObject.getJSONArray("clubList");

incubator-game/src/main/java/com/incubator/game/handler/club/GetApplyList.java

@@ -31,7 +31,7 @@ public class GetApplyList extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetApplyListRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
 
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject userObject = JSONUtil.parseObj(userInfo);

incubator-game/src/main/java/com/incubator/game/handler/club/GetClubListHandler.java

@@ -33,7 +33,7 @@ public class GetClubListHandler extends NetHandler {
         response.setCmd(CommonProto.Cmd.ClubInfoRes_VALUE);
 
         //提取我加入的俱乐部列表
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject Object = JSONUtil.parseObj(userInfo);
         JSONArray clubListArray = JSONUtil.parseObj(Object).getJSONArray("clubList");

incubator-game/src/main/java/com/incubator/game/handler/club/GetMyClub.java

@@ -36,7 +36,7 @@ public class GetMyClub extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.MyClubRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject userObject = JSONUtil.parseObj(userInfo);
         Object lobbyUserObj = userObject.get("lobbyUser");

incubator-game/src/main/java/com/incubator/game/handler/club/GetMyClubList.java

@@ -30,7 +30,7 @@ public class GetMyClubList extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetMyClubListRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject jsonObject = JSONUtil.parseObj(userInfo);
         Object lobbyUserObj = jsonObject.get("lobbyUser");

incubator-game/src/main/java/com/incubator/game/handler/club/QuitClub.java

@@ -36,7 +36,7 @@ public class QuitClub extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.QuitClubRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String clubId = request.getDataValue("clubId", String.class, "");
 
 

incubator-game/src/main/java/com/incubator/game/handler/club/SearchClub.java

@@ -36,7 +36,7 @@ public class SearchClub extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.SearchClubRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String type = request.getDataValue("type", String.class, "");
         String name = request.getDataValue("searchText", String.class, "");
         Map<String, Object> map = new HashMap<>();

incubator-game/src/main/java/com/incubator/game/handler/club/SetMainClub.java

@@ -26,7 +26,7 @@ public class SetMainClub extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.SetMainClubRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String clubId = request.getDataValue("clubId", String.class, "");
 
         // 根据token获取用户信息

incubator-game/src/main/java/com/incubator/game/handler/contest/GetClubCompetitionListHandler.java

@@ -37,7 +37,7 @@ public class GetClubCompetitionListHandler extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetClubCompetitionListRes_VALUE);
 
-        String uid = session.getUid();
+        String uid = session.getPlayerId();
         Player player = (Player) PlayerUtil.getOnlinePlayer(uid);
         Map<String, Object> map = new HashMap<>();
         // 俱乐部比赛信息列表

incubator-game/src/main/java/com/incubator/game/handler/contest/GetClubLeagueMatchListHandler.java

@@ -33,7 +33,7 @@ public class GetClubLeagueMatchListHandler extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetContestListRes_VALUE);
 
-        String uid = session.getUid();
+        String uid = session.getPlayerId();
         Map<String, Object> map = new HashMap<>();
         // 官方比赛信息列表
         List<Object> list = new ArrayList<>();

incubator-game/src/main/java/com/incubator/game/handler/contest/GetContestListHandler.java

@@ -1,24 +1,26 @@
 package com.incubator.game.handler.contest;
 
 import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.incubator.common.MessageHandler;
 import com.incubator.common.log4j.Log;
 import com.incubator.common.net.Connection;
 import com.incubator.core.net.ws.NetHandler;
 import com.incubator.core.net.ws.WSRequest;
 import com.incubator.core.net.ws.WSResponse;
+import com.incubator.game.constant.RedisKeyConstant;
 import com.incubator.game.contest.Contest;
 import com.incubator.game.contest.ContestService;
+import com.incubator.game.data.jedis.RedisUtil;
+import com.incubator.game.data.po.ZjBackpackPO;
 import com.incubator.game.player.Player;
 import com.incubator.game.util.JsonToMapUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.game.util.ProtoUtil;
 import com.incubator.message.proto.CommonProto;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Author:  xhb
@@ -31,7 +33,7 @@ public class GetContestListHandler extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetContestListRes_VALUE);
 
-        String uid = session.getUid();
+        String uid = session.getPlayerId();
         Player player = (Player) PlayerUtil.getOnlinePlayer(uid);
         Map<String, Object> map = new HashMap<>();
         // 官方比赛信息列表
@@ -78,6 +80,19 @@ public class GetContestListHandler extends NetHandler {
                     data.put("isSign", true);
                 }
             }
+            //查询背包是否有参赛卷
+            String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + uid);
+            JSONObject userObject = JSONUtil.parseObj(userInfo);
+            JSONArray userBackpack = userObject.getJSONArray("userBackpack");
+            List<ZjBackpackPO> zjBackpackPOS = userBackpack.toList(ZjBackpackPO.class);
+            Optional<ZjBackpackPO> first = zjBackpackPOS.stream()
+                    .filter(goods -> goods.getGoodsId().equals("402"))
+                    .findFirst();
+            if (first.isPresent()){
+                data.put("isTicket", true);
+            }else {
+                data.put("isTicket", false);
+            }
 //            }
         }
         return data;

incubator-game/src/main/java/com/incubator/game/handler/event/EventInfo.java

@@ -26,7 +26,7 @@ public class EventInfo extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.EventInfoRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String eventStr = RedisUtil.get(RedisKeyConstant.ZJ_USER_EVENT_KEY + userId);
         JSONArray objects = JSONUtil.parseArray(eventStr);
         Map<String, Object> map = new HashMap<>();

incubator-game/src/main/java/com/incubator/game/handler/event/GetReward.java

@@ -32,7 +32,7 @@ public class GetReward extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetRewardRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String eventId = request.getDataValue("eventId", String.class, "");//活动id
         String periodNum = request.getDataValue("dayX", String.class, "");//第几天
         String goodsId = request.getDataValue("itemId", String.class, "");//物品id

incubator-game/src/main/java/com/incubator/game/handler/mall/ShopBuy.java

@@ -15,6 +15,9 @@ import com.incubator.game.data.entity.ZjUser;
 import com.incubator.game.data.jedis.RedisUtil;
 import com.incubator.game.data.mq.RabbitMQUtil;
 import com.incubator.game.data.po.*;
+import com.incubator.game.player.GPlayer;
+import com.incubator.game.player.Player;
+import com.incubator.game.util.PlayerUtil;
 import com.incubator.game.util.UtilCore;
 import com.incubator.message.proto.CommonProto;
 
@@ -39,9 +42,36 @@ public class ShopBuy extends NetHandler {
         response.setCmd(CommonProto.Cmd.ShopBuyRes_VALUE);
 
 
-        String userId = session.getUid();
-        String productId = request.getDataValue("productId", String.class, "");//商品id
+        String userId = session.getPlayerId();
+        Player onlinePlayer = (Player)PlayerUtil.getOnlinePlayer(userId);
+        //查询自己的钱包
+        long foca = onlinePlayer.data.foca;//福卡
+        long gold = onlinePlayer.data.gold;//金蛋
+        long diamond = onlinePlayer.data.diamond;//钻石
 
+        String productId = request.getDataValue("productId", String.class, "");//商品id
+        long productSellPrice = Long.parseLong(request.getDataValue("productSellPrice", String.class, ""));//商品价格
+        String productUnit = request.getDataValue("productUnit", String.class, "");//商品单位(1人民币 2钻石 3福卡 4金蛋,
+        switch (productUnit){
+            case"2":
+                if (diamond<productSellPrice){
+                    response.setCmd(CommonProto.Code.PARAMETER_ERR_VALUE);
+                    response.setMessage("钻石不足");
+                    return;
+                }
+            case"3":
+                if (foca<productSellPrice){
+                    response.setCmd(CommonProto.Code.PARAMETER_ERR_VALUE);
+                    response.setMessage("福卡不足");
+                    return;
+                }
+            case"4":
+                if (gold<productSellPrice){
+                    response.setCmd(CommonProto.Code.PARAMETER_ERR_VALUE);
+                    response.setMessage("金蛋不足");
+                    return;
+                }
+        }
         JSONObject object = new JSONObject();
         object.put("type", "shopBuy");
         object.put("userId", userId);
@@ -51,134 +81,5 @@ public class ShopBuy extends NetHandler {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-
-//
-//        String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
-//        JSONObject userObject = JSONUtil.parseObj(userInfo);
-//        Object lobbyUserObj = userObject.get("lobbyUser");
-//        ZjUserLobbyPo lobbyUser = JSONUtil.toBean((JSONObject) lobbyUserObj, ZjUserLobbyPo.class);
-//
-//        JSONArray userBackpack = userObject.getJSONArray("userBackpack");
-//        JSONArray orderList = userObject.getJSONArray("orderList");
-//        List<ZjBackpackPO> zjBackpackPOS = userBackpack.toList(ZjBackpackPO.class);
-//
-//        List<ZjOrderPO> zjOrderPOS = orderList.toList(ZjOrderPO.class);
-//
-//        String malls = RedisUtil.get(RedisKeyConstant.MALL_BASE);
-//        JSONObject jsonObject = JSONUtil.parseObj(malls);
-//        JSONArray mallArray = jsonObject.getJSONArray("mallList");
-//        List<ZjProductPo> mallList = mallArray.toList(ZjProductPo.class);
-//        Optional<ZjProductPo> result = mallList.stream()
-//                .filter(product -> productId.equals(product.getProductId()))
-//                .findFirst();
-//
-//        if (result.isPresent()) {
-//            ZjProductPo product = result.get();
-//            String productList = product.getProductList();
-//
-//            // 新增背包
-//            // 解析商品集合json数组 添加到系统收支表
-//            com.alibaba.fastjson2.JSONArray jsonArray = com.alibaba.fastjson2.JSONArray.parseArray(productList);
-//            // 遍历 JSON 数组中的元素
-//            for (int i = 0; i < jsonArray.size(); i++) {
-//                com.alibaba.fastjson2.JSONObject json = jsonArray.getJSONObject(i);
-//                // 获取 JSON 对象中的属性值
-//                String gId = json.getString("goodsId");//物品id
-//                Integer gNum = json.getInteger("goodsNum");//数量
-//                String gType = json.getString("type");//类型 1:购买  2.赠送
-//                //添加到背包中，并更新背包中物品数量
-//                    switch (gId) {
-//                        case "1":
-//                            lobbyUser.setGoldCoin((lobbyUser.getGoldCoin() + gNum));
-//                            break;
-//                        case "2":
-//                            lobbyUser.setDiamond((lobbyUser.getDiamond() + gNum));
-//                            break;
-//                        case "3":
-//                            lobbyUser.setFoca( (lobbyUser.getFoca() + gNum));
-//                            break;
-//                    }
-//                // 提取gid为123的值
-//                Optional<ZjBackpackPO> optionalItem = zjBackpackPOS.stream()
-//                        .filter(item -> item.getGoodsId().equals(gId))
-//                        .findFirst();
-//                ZjBackpack zjBackpack = new ZjBackpack();
-//                if (optionalItem.isPresent()) {
-//                    ZjBackpackPO item = optionalItem.get();
-//                    item.setGoodsNum(gNum + item.getGoodsNum());
-//                    zjBackpack.setBackId(item.getBackId());
-//                    zjBackpack.setGoodsId(gId);
-//                    zjBackpack.setUserId(userId);
-//                    zjBackpack.setGoodsNum(item.getGoodsNum());
-//                    JSONObject object = new JSONObject();
-//                    object.put("type", "saveBack");
-//                    object.put("data", zjBackpack);
-//                    try {
-//                        RabbitMQUtil.sendMessage(object.toString());
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                }else {
-//                    ZjBackpackPO newItem = new ZjBackpackPO();
-//                    newItem.setBackId(UtilCore.getDateRandomId());
-//                    newItem.setGoodsId(gId);
-//                    newItem.setUserId(userId);
-//                    newItem.setGoodsNum(gNum);
-//                    zjBackpackPOS.add(newItem);
-//                    zjBackpack.setBackId(newItem.getBackId());
-//                    zjBackpack.setGoodsId(gId);
-//                    zjBackpack.setUserId(userId);
-//                    zjBackpack.setGoodsNum(newItem.getGoodsNum());
-//                    JSONObject object = new JSONObject();
-//                    object.put("type", "saveBack");
-//                    object.put("data", zjBackpack);
-//                    try {
-//                        RabbitMQUtil.sendMessage(object.toString());
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                }
-//                // 生成订单
-//                ZjOrderPO zjOrder = new ZjOrderPO();
-//                zjOrder.setOrderId(UtilCore.getDateRandomId());
-//                String orderNo = UtilCore.getDateRandomId();//订单号
-//                zjOrder.setOrderNo(orderNo);
-//                zjOrder.setProductName(product.getProductName());
-//                zjOrder.setOrderStatus("3");
-//                zjOrder.setPayType("1");
-//                zjOrder.setOrderType("1");
-//                LocalDateTime now = LocalDateTime.now();
-//                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-//                String dateString = now.format(formatter);
-//                zjOrder.setCreateTime(dateString);
-//                zjOrder.setMerchantInfo("武汉电子科技公司");
-//                zjOrderPOS.add(zjOrder);
-//
-//                ZjOrder zjOrder1 = new ZjOrder();
-//                zjOrder1.setOrderId(zjOrder.getOrderId());
-//                zjOrder1.setProductName(product.getProductName());
-//                zjOrder1.setMerchantInfo("武汉电子科技公司");
-//                zjOrder1.setUserId(userId);
-//                zjOrder1.setOrderNo(orderNo);
-//                zjOrder1.setOrderStatus("3");
-//                zjOrder1.setPayType("1");
-//                zjOrder1.setOrderType("1");
-//                zjOrder1.setCreateTime(dateString);
-//                JSONObject object = new JSONObject();
-//                object.put("type", "saveOrder");
-//                object.put("data", zjOrder1);
-//                try {
-//                    RabbitMQUtil.sendMessage(object.toString());
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            }
-            // 更新背包
-            //userObject.put("lobbyUser", lobbyUser);
-            //userObject.put("userBackpack", zjBackpackPOS);
-            //userObject.put("orderList", zjOrderPOS);
-            //RedisUtil.set(RedisKeyConstant.USER_BASE + userId,userObject.toString());
-//        }
     }
 }

incubator-game/src/main/java/com/incubator/game/handler/message/GetRewardMessage.java

@@ -27,7 +27,7 @@ public class GetRewardMessage extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetRewardMessageRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String id = request.getDataValue("id", String.class, "");//消息id
 
         String jsonStr = RedisUtil.get(RedisKeyConstant.ZJ_USER_MESSAGE + userId);

incubator-game/src/main/java/com/incubator/game/handler/message/MessageInfo.java

@@ -30,7 +30,7 @@ public class MessageInfo extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.MessageInfoRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String jsonStr = RedisUtil.get(RedisKeyConstant.ZJ_USER_MESSAGE + userId);
         if (jsonStr == null||jsonStr.equals("[]")) {
             return;

incubator-game/src/main/java/com/incubator/game/handler/message/ReadMessage.java

@@ -13,6 +13,7 @@ import com.incubator.game.data.jedis.RedisUtil;
 import com.incubator.game.data.po.MessagePO;
 import com.incubator.message.proto.CommonProto;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -26,9 +27,9 @@ public class ReadMessage extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.ReadMessageRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String id = request.getDataValue("id", String.class, "");//消息id
-        String status = request.getDataValue("status", String.class, "");//状态
+        String status = request.getDataValue("status", String.class, null);//状态
 
         String jsonStr = RedisUtil.get(RedisKeyConstant.ZJ_USER_MESSAGE + userId);
         if (jsonStr == null) {
@@ -39,13 +40,16 @@ public class ReadMessage extends NetHandler {
         for (MessagePO o : messagePOS) {
             if (o.getId().equals(id)) {
                 o.setRead(true);
-                if (status!=null&&!status.equals("")&&status.equals("-1")) {
+                if (status!=null&&status.equals("-1")) {
                     messagePOS.remove(o);
                 }
                 break;
             }
         }
         RedisUtil.set(RedisKeyConstant.ZJ_USER_MESSAGE + userId,JSONUtil.toJsonStr(messagePOS));
+        HashMap<String,Object> hashMap = new HashMap<>();
+        hashMap.put("id",id);
+        response.setData(hashMap);
     }
 
 }

incubator-game/src/main/java/com/incubator/game/handler/order/GetOrderList.java

@@ -30,7 +30,7 @@ public class GetOrderList extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetOrderListRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String date = request.getDataValue("date", String.class, "");
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject userObject = JSONUtil.parseObj(userInfo);

incubator-game/src/main/java/com/incubator/game/handler/user/AuthenticationHandler.java

@@ -20,7 +20,7 @@ public class AuthenticationHandler extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.AuthenticationRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String name = request.getDataValue("name", String.class, "");
         String certNo = request.getDataValue("certNo", String.class, "");
         JSONObject object = new JSONObject();

incubator-game/src/main/java/com/incubator/game/handler/user/GetAuthenticationHandler.java

@@ -24,7 +24,7 @@ public class GetAuthenticationHandler extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetAuthenticationRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject userObject = JSONUtil.parseObj(userInfo);
         JSONObject auth = (JSONObject)userObject.get("auth");

incubator-game/src/main/java/com/incubator/game/handler/user/GetUserYao.java

@@ -28,7 +28,7 @@ public class GetUserYao extends NetHandler {
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.GetUserYaoRes_VALUE);
 
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);
         JSONObject userObject = JSONUtil.parseObj(userInfo);
         Object userYao = userObject.get("userYao");

incubator-game/src/main/java/com/incubator/game/handler/user/UpdateAvatarUrlHandler.java

@@ -25,7 +25,7 @@ public class UpdateAvatarUrlHandler extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.UpdateAvatarUrlRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String avatarUrl = request.getDataValue("avatarUrl", String.class, "");
 
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);

incubator-game/src/main/java/com/incubator/game/handler/user/UpdateCharacterUrlHandler.java

@@ -25,7 +25,7 @@ public class UpdateCharacterUrlHandler extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.UpdateCharacterUrlRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String characterUrl = request.getDataValue("characterUrl", String.class, "");
 
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);

incubator-game/src/main/java/com/incubator/game/handler/user/UpdateNickNameHandler.java

@@ -25,7 +25,7 @@ public class UpdateNickNameHandler extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.UpdateNickNameRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String nickName = request.getDataValue("name", String.class, "");
 
         String userInfo = RedisUtil.get(RedisKeyConstant.USER_BASE + userId);

incubator-game/src/main/java/com/incubator/game/handler/user/UpdatePhoneHandler.java

@@ -26,7 +26,7 @@ public class UpdatePhoneHandler extends NetHandler {
     @Override
     public void onDate(Connection session, WSRequest request, WSResponse response) {
         response.setCmd(CommonProto.Cmd.UpdatePhoneRes_VALUE);
-        String userId = session.getUid();
+        String userId = session.getPlayerId();
         String name = request.getDataValue("name", String.class, "");
         String phone = request.getDataValue("phone", String.class, "");
 

incubator-game/src/main/java/com/incubator/game/listener/CenterClientListener.java

@@ -95,7 +95,7 @@ public class CenterClientListener extends GameClientConnectionListener {
 //            msg.setCode(ProtoCommon.Code.OK_VALUE);
 //            conn.writeAndFlush(super.packMessage(msg));
         } catch (Exception e) {
-			Log.info("发送心跳请求出错：" + conn.getUid() + e.getMessage());
+			Log.info("发送心跳请求出错：" + conn.getPlayerId() + e.getMessage());
         }
 
 //		conn.writeAndFlush(new TextWebSocketFrame(msg.toJson()));