From ba99ae3e897411ae8b96421212f3f37fcc5a5e85 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 28 Jul 2023 15:18:27 +0800
Subject: [PATCH] 1

---
 doc/BlockChain.py | 16 ++++++++++++++++
 doc/Shop.py       | 33 ++++++++++-----------------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/doc/BlockChain.py b/doc/BlockChain.py
index 610fe762..1d971e6a 100644
--- a/doc/BlockChain.py
+++ b/doc/BlockChain.py
@@ -73,4 +73,20 @@ class BlockChain(object):
                     ['!params', [''], '合约参数列表'],
                 ]
             },
+            {
+                'name': 'buyDiamond',
+                'desc': '购买钻石',
+                'group': 'BlockChain',
+                'url': 'webapp/index.php?c=BlockChain&a=buyDiamond',
+                'params': [
+                    _common.ReqHead(),
+                    ['token_type', '', "选用币种 目前只支持ceg"],
+                    ['num', 0, '购买数量'],
+                ],
+                'response': [
+                    _common.RspHead(),
+                    ['trans_id', '', '事务id'],
+                    ['!params', [''], '合约参数列表'],
+                ]
+            },
         ]
diff --git a/doc/Shop.py b/doc/Shop.py
index aa96e194..6c16c214 100644
--- a/doc/Shop.py
+++ b/doc/Shop.py
@@ -40,28 +40,13 @@ class Shop(object):
                 ]
             },
             {
-                'name': 'buyDiamond',
-                'desc': '购买钻石',
+                'name': 'startOutappPurchase',
+                'desc': '发起一个第三方支付(购买钻石)',
                 'group': 'Shop',
-                'url': 'webapp/index.php?c=Shop&a=buyDiamond',
-                'params': [
-                    _common.ReqHead(),
-                    ['num', 0, '购买数量'],
-                ],
-                'response': [
-                    _common.RspHead(),
-                    ['block_chain', _common.ShopTrans(), '链上购买订单信息'],
-                ]
-            },
-            {
-                'name': 'startGoodsDirect',
-                'desc': '发起一个 直接购买(充值,gold)',
-                'group': 'Shop',
-                'url': 'webapp/index.php?c=Shop&a=startGoodsDirect',
+                'url': 'webapp/index.php?c=Shop&a=startOutappPurchase',
                 'params': [
                     _common.ReqHead(),
                     ['goods_uuid', '', '商品唯一id'],
-                    ['token_type', '', "选用币种"],
                     ['goods_num', 0, '商品数量'],
                 ],
                 'response': [
@@ -70,16 +55,18 @@ class Shop(object):
                 ]
             },
             {
-                'name': 'statusGoodsDirect',
-                'desc': '查询 直接购买(充值,gold) 状态',
+                'name': 'queryOutappPurchase',
+                'desc': '查询第三方支付(购买钻石)状态',
                 'group': 'Shop',
-                'url': 'webapp/index.php?c=Shop&a=statusGoodsDirect',
+                'url': 'webapp/index.php?c=Shop&a=queryOutappPurchase',
                 'params': [
                     _common.ReqHead(),
                     ['order_id', '', '订单id'],
                 ],
                 'response': [
                     _common.RspHead(),
+                    ['item_id', '', '商品id'],
+                    ['item_num', 0, '商品数量'],
                     ['status', 0, '订单状态 0:未支付 1:已支付 2:支付失败'],
                 ]
             },
@@ -99,10 +86,10 @@ class Shop(object):
                 ]
             },
             {
-                'name': 'statusInappPurchase',
+                'name': 'queryInappPurchase',
                 'desc': '查询内购(购买钻石)状态',
                 'group': 'Shop',
-                'url': 'webapp/index.php?c=Shop&a=statusInappPurchase',
+                'url': 'webapp/index.php?c=Shop&a=queryInappPurchase',
                 'params': [
                     _common.ReqHead(),
                     ['order_id', '', '订单id'],