1

doc/AAMarket.py

@@ -300,8 +300,11 @@ class AAMarket(object):
                 ],
                 'response': [
                     _common.RspHead(),
+                    ['nickname', '', '昵称'],
+                    ['email', '', 'email'],
                     ['contribution_point', 0, '贡献点'],
-                    ['gold', 0, '金币数'],
+                    ['gold', '', '金币数'],
+                    ['diamond', '', '钻石数'],
                 ]
             },
             {
@@ -333,6 +336,23 @@ class AAMarket(object):
                     ], '数据'],
                 ]
             },
+            {
+                'method': 'GET',
+                'name': '/api/activity/diamond/history/:account_address',
+                'desc': '钻石-充值/消费记录',
+                'group': '!AAMarket',
+                'url': '/api/activity/diamond/history/:account_address',
+                'params': [
+                ],
+                'response': [
+                    _common.RspHead(),
+                    ['!rows', [
+                        ['type', 0, '0:充值 1:消费'],
+                        ['date', 0, 'utc时间'],
+                        ['amount', '', '数量'],
+                    ], '数据'],
+                ]
+            },
             {
                 'method': 'GET',
                 'name': '/api/chain/txhash/:net_id/:txhash',

sql/bcnftdb.sql

@@ -320,6 +320,7 @@ DROP TABLE IF EXISTS `t_recharge_order`;
 CREATE TABLE `t_recharge_order` (
   `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
   `order_id` varchar(255) COMMENT '订单号',
+  `short_order_id` varchar(60) COMMENT '短订单号-客户端显示用',
   `account_address` varchar(60) NOT NULL COMMENT '钱包地址',
   `currency_address` varchar(60) NOT NULL DEFAULT '' COMMENT '货币地址',
   `currency_name` varchar(60) NOT NULL DEFAULT '' COMMENT '货币名称',
@@ -330,7 +331,8 @@ CREATE TABLE `t_recharge_order` (
   `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
   `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
   PRIMARY KEY (`idx`),
-  UNIQUE KEY `order_id` (`order_id`)
+  UNIQUE KEY `order_id` (`order_id`),
+  UNIQUE KEY `short_order_id` (`short_order_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!40101 SET character_set_client = @saved_cs_client */;