diff --git a/docs/ShopAndMarket.txt b/docs/ShopAndMarket.txt new file mode 100644 index 0000000..2c2ba05 --- /dev/null +++ b/docs/ShopAndMarket.txt @@ -0,0 +1,55 @@ +商城和交易所交接文档: + + +商城: + +ShopController.class.php + 主要功能接口: getGoodsList 获取商品列表 + buyGoodsNormal 购买商品的主要接口 + buyDiamond 用ceg购买钻石 + buyGoodsDS 每日精选购买接口 + buyBlindBox 开宝箱,十连抽接口 + buyGoodsDirect 充值回调,未来将移到 ShopBuyGoodsDirect + inappPurchaseDiamonds 内购回调, 未来将移到 ShopInappPurchaseDiamonds + beginFirstTupop 检测并开始首充奖励 + + 涉及到的相关表格 + shopGoods.xlsx 商城主配置表 + Shopchest.xlsx 宝箱,十连抽配置表 + Dailyselection.xlsx 每日精选配置表 + + 相关数据库表 + t_shop_buy_order + t_shop_buy_record 限制购买,日限,周限,总数限制 + t_shop_dailyselection 每日精选,每日可刷新商品记录,每人专属 + t_shop_free_record 每日免费商品,每日免费开宝箱记录 + +首充奖励: +FirstTopupController.class.php + info 查询首充领取状态 + get 领取,每日领取一个包裹,3天领完 +配置表: + FirstTopup.xlsx + +相关数据库表 + t_first_topup + +交易所: + +MarketController.class.php + listSellNfts 上架出售的商品列表 + listMyNfts 我的nft以及我出售的nft列表,目前也支持我出售的金币 + sell 中心化出售金币 + sellCancel 中心化下架金币 + sellUpdatePrice 中心化修改出售金币价格 + buy 中心化购买金币 + +链上交易相关回调: + MarketSellOrderOK.php + MarketCancelOrderOk.php + MarketPriceUpdateOrderOk.php + MarketBuyOrderOk.php + +相关数据库表 + t_market_store + t_market_transaction_record diff --git a/game-server/app/servers/friend/handler/friendHandler.js b/game-server/app/servers/friend/handler/friendHandler.js index c228919..d5aeb3f 100644 --- a/game-server/app/servers/friend/handler/friendHandler.js +++ b/game-server/app/servers/friend/handler/friendHandler.js @@ -300,33 +300,6 @@ class FriendHandler { * "msg": "Failed to get pending friend requests." * } */ - { - "idx":10003, - "account_id":"6516_2006_0xef59f6cc4d190a0ae576c46d4583e92b61174340", - "name":"iij", - "sex":0, - "head_id":50006, - "head_frame":60000, - "level":1, - "bceg":0, - "gold":18588, - "diamond":10000, - "rank":1, - "ring_id":0, - "last_login_time":1670490960, - "online":1, - "guildInfo":{ - "idx":22, - "gname":"Guild2", - "logo":null, - "gowner":"6516_2006_0xef59f6cc4d190a0ae576c46d4583e92b61174340", - "gownername":"iij", - "gmaxmember":100, - "announce":null, - "countmember":1 - } - } - async getPendingFriendRequests(msg, { uid }, next) { try { const friendRequests = await this.friendService.getPendingFriendRequests(