Merge branch 'master' of http://git.ycjcjy.com/niucai/db into master

niucai.pdman.json

             }
           ],
           "chnname": "店铺广告"
+        },
+        {
+          "title": "ta_shopkeeper_third",
+          "fields": [
+            {
+              "name": "serial_no",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "序号",
+              "pk": true,
+              "notNull": true,
+              "autoIncrement": true
+            },
+            {
+              "name": "third_part_type",
+              "type": "DefaultString",
+              "remark": "wx微信,ali支付宝",
+              "chnname": "第三方类型",
+              "notNull": true
+            },
+            {
+              "name": "third_part_id",
+              "type": "LongKey",
+              "remark": "",
+              "chnname": "第三方ID",
+              "notNull": true
+            },
+            {
+              "name": "keeper_id",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "店主ID",
+              "notNull": true
+            },
+            {
+              "name": "nick_name",
+              "type": "Name",
+              "remark": "",
+              "chnname": "昵称"
+            },
+            {
+              "name": "avatar",
+              "type": "LongText",
+              "remark": "",
+              "chnname": "头像"
+            },
+            {
+              "name": "sex",
+              "type": "TINYINT",
+              "remark": "1男2女9未知",
+              "chnname": "性别",
+              "notNull": true,
+              "defaultValue": "9"
+            },
+            {
+              "name": "create_date",
+              "type": "DateTime",
+              "remark": "",
+              "chnname": "创建时间",
+              "notNull": true,
+              "defaultValue": "CURRENT_TIMESTAMP"
+            },
+            {
+              "name": "status",
+              "type": "ENUM",
+              "remark": "",
+              "chnname": "状态",
+              "notNull": true,
+              "defaultValue": "1"
+            }
+          ],
+          "indexs": [],
+          "headers": [
+            {
+              "fieldName": "chnname",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "name",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "type",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "dataType",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "remark",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "pk",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "notNull",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "autoIncrement",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "defaultValue",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "relationNoShow",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "uiHint",
+              "relationNoShow": true
+            }
+          ],
+          "chnname": "店主的第三方账号"
         }
       ],
       "graphCanvas": {
               "notNull": true,
               "autoIncrement": false
             },
+            {
+              "name": "pay_client",
+              "type": "DefaultString",
+              "remark": "wxpay微信支付,alipay支付宝支付",
+              "chnname": "支付客户端"
+            },
             {
               "name": "trade_no",
               "type": "MiddleString",
               "chnname": "支付平台流水"
             },
             {
-              "name": "customer_id",
-              "type": "Integer",
+              "name": "payee",
+              "type": "ShortString",
               "remark": "",
-              "chnname": "收款人"
+              "chnname": "付款方"
             },
             {
-              "name": "customer_name",
+              "name": "payee_name",
               "type": "Name",
               "remark": "",
-              "chnname": "收款人姓名"
+              "chnname": "付款方姓名"
             },
             {
-              "name": "beneficiary_account",
-              "type": "MiddleString",
+              "name": "remitter",
+              "type": "ShortString",
               "remark": "",
-              "chnname": "收款账户"
+              "chnname": "收款方账户"
             },
             {
-              "name": "beneficiary_client",
-              "type": "ShortString",
+              "name": "remitter_name",
+              "type": "Name",
               "remark": "",
-              "chnname": "收款客户端"
+              "chnname": "收款方姓名"
+            },
+            {
+              "name": "trade_type",
+              "type": "DefaultString",
+              "remark": "b2b,b2c,c2b等;付款在前,b2c代表商家付款给客户",
+              "chnname": "交易对象类型"
+            },
+            {
+              "name": "pay_fee",
+              "type": "Integer",
+              "remark": "单位分",
+              "chnname": "付款金额"
             },
             {
               "name": "pay_reason",
               "notNull": true,
               "defaultValue": "CURRENT_TIMESTAMP"
             },
+            {
+              "name": "pay_time",
+              "type": "DateTime",
+              "remark": "",
+              "chnname": "付款时间"
+            },
             {
               "name": "status",
-              "type": "ENUM",
+              "type": "TINYINT",
               "remark": "",
               "chnname": "状态",
               "notNull": true,
               "defaultValue": "1"
             },
+            {
+              "name": "pay_result",
+              "type": "DefaultString",
+              "remark": "",
+              "chnname": "支付结果"
+            },
             {
               "name": "fail_reason",
               "type": "MiddleString",