tj

dff4ebe0 · 宋毅 · 16a16160 · dff4ebe0 · dff4ebe0 · dff4ebe0
Commit dff4ebe0 authored Dec 02, 2019 by 宋毅
5 changed files
--- a/igirl-channel/app/base/db/models/dbcorder/childorders.js
+++ b/igirl-channel/app/base/db/models/dbcorder/childorders.js
@@ -21,6 +21,16 @@ module.exports = (db, DataTypes) => {
    pfSettleProfit      :DataTypes.INTEGER,//  平台结算渠道利润,0否，1是                                                                                                                                                                                                 
    invoiceApplyStatus  :DataTypes.STRING(10),//  发票状态:00: 未申请, 10: 已申请,20:已开票
    opPayType  :DataTypes.STRING(10),//  操作付款类型:00: 收款, 10: 退款
+    accountType: {
+      //帐户类型（ 支付类型）:"cash": "现金", "bank": "银行" ,"wx":"微信","alipay":"支付宝","other":"其它"
+      type: DataTypes.STRING,
+    },
+    accountTypeName: {//帐户类型名称
+      type: DataTypes.STRING,
+    },
+    wxPayOrderCode: DataTypes.STRING(50),//业务微信支付订单号
+    aliPayOrderCode: DataTypes.STRING(50),//业务支付宝支付订单号
+    busPayOrderCode: DataTypes.STRING(50),//业务支付订单号
    notes               :DataTypes.STRING,//  备注   
  }, {
      paranoid: false,//假的删除

--- a/igirl-channel/app/base/db/models/dbcpay/expensevoucher.js
+++ b/igirl-channel/app/base/db/models/dbcpay/expensevoucher.js
@@ -2,8 +2,10 @@ const system = require("../../system");
 const settings = require("../../../config/settings");
 const uiconfig = system.getUiConfig2(settings.wxconfig.appId);
 module.exports = (db, DataTypes) => {//费用单：
-  var base = require("../basemodel/voucherbase")(db, DataTypes);
+  return db.define("expensevoucher", {
-  return db.define("expensevoucher", Object.assign({
+    uapp_id: DataTypes.INTEGER,      //  
+    sourceOrderNo: DataTypes.STRING(64),   // 来源单号 
    // //费用表引用帐户信息
    // this.db.models.expensevoucher.belongsTo(this.db.models.moneyaccount, { constraints: false, });
    // //费用表引用用户信息
@@ -36,7 +38,7 @@ module.exports = (db, DataTypes) => {//费用单：
    },
    totalSum: DataTypes.DECIMAL(12, 3),//总额
    notes: DataTypes.STRING,//备注    
-  }, base), {
+  }, {
      paranoid: true,//假的删除
      underscored: true,
      version: true,

--- a/igirl-channel/app/base/db/models/dbcpay/moneyjourney.js
+++ b/igirl-channel/app/base/db/models/dbcpay/moneyjourney.js
@@ -2,8 +2,10 @@ const system = require("../../system");
 const settings = require("../../../config/settings");
 const uiconfig = system.getUiConfig2(settings.wxconfig.appId);
 module.exports = (db, DataTypes) => {
-  var base = require("../basemodel/codenamebase")(db, DataTypes);
+  return db.define("moneyjourney", {
-  return db.define("moneyjourney", Object.assign({
+    uapp_id: DataTypes.INTEGER,      //  
+    sourceOrderNo: DataTypes.STRING(64),   // 来源单号 
    // //订单流程表引用用户信息
    // this.db.models.moneyjourney.belongsTo(this.db.models.user, { as: 'createuser', constraints: false, });
    // this.db.models.moneyjourney.belongsTo(this.db.models.company, { as: 'createcompany', constraints: false, });//创建收款单的公司
@@ -66,7 +68,7 @@ module.exports = (db, DataTypes) => {
    buyerOpenId: DataTypes.STRING,//用户在商户appid下的唯一标识或买家在支付宝的用户id
    passTradeNo: DataTypes.STRING,//通道的统一订单号
    buyerAliLogonId: DataTypes.STRING,//买家支付宝账号
-  }, base), {
+  }, {
      paranoid: true,//假的删除
      underscored: true,
      version: true,

--- a/igirl-channel/app/base/db/models/dbcpay/orderreceiptvoucher.js
+++ b/igirl-channel/app/base/db/models/dbcpay/orderreceiptvoucher.js
@@ -2,21 +2,12 @@ const system = require("../../../system");
 const settings = require("../../../../config/settings");
 const uiconfig = system.getUiConfig2(settings.appKey);
 module.exports = (db, DataTypes) => {
-  var base = require("../../basemodel/voucherbase")(db, DataTypes);
+  return db.define("orderreceiptvoucher", {//收款单：
-  return db.define("orderreceiptvoucher", Object.assign({//收款单：
+    uapp_id: DataTypes.INTEGER,      //  
-    //基类 code: 收款单号（自动生成）
+    sourceOrderNo: DataTypes.STRING(64),   // 来源单号 
-    //基类 creator: 创建者
-    //基类 updator:/更新者
-    //基类 auditor: 审核者
-    //基类 opNotes: 操作备注
-    //基类 auditStatusName: //审核状态名称
-    //基类 auditStatus: //审核状态:ENUM=audit_status，"dsh": "待审核", "btg": "不通过", "tg": "通过"
-    //基类 sourceTypeName: //来源类型名称
-    //基类 sourceType: //来源类型:ENUM=source_type，"order": "订单","expensevoucher": "费用单","receiptvoucher": "收款单","refundvoucher": "退款单", "trademark": "商标单"
-    //基类 sourceOrderNo: DataTypes.STRING,//来源单号（如：订单号等）
-    //基类 channelServiceNo //渠道服务单号
-    createapp_id: DataTypes.INTEGER,//
-    payuser_id: DataTypes.INTEGER,// 
    busPayOrderCode: DataTypes.STRING(100),//业务支付订单号
    payOrderNo: DataTypes.STRING, //支付凭证流水单号，如：微信支付凭证单号
    receiptTypeName: DataTypes.STRING,
@@ -51,7 +42,7 @@ module.exports = (db, DataTypes) => {
    buyerOpenId: DataTypes.STRING,//用户在商户appid下的唯一标识或买家在支付宝的用户id
    passTradeNo: DataTypes.STRING,//通道的统一订单号
    buyerAliLogonId: DataTypes.STRING,//买家支付宝账号
-  }, base), {
+  }, {
      paranoid: true,//假的删除
      underscored: true,
      version: true,

--- a/igirl-channel/app/base/db/models/dbcpay/orderrefundvoucher.js
+++ b/igirl-channel/app/base/db/models/dbcpay/orderrefundvoucher.js
@@ -2,8 +2,10 @@ const system = require("../../../system");
 const settings = require("../../../../config/settings");
 const uiconfig = system.getUiConfig2(settings.appKey);
 module.exports = (db, DataTypes) => {
-  var base = require("../../basemodel/voucherbase")(db, DataTypes);
+  return db.define("orderrefundvoucher", {//退款单：
-  return db.define("orderrefundvoucher", Object.assign({//退款单：
+    uapp_id: DataTypes.INTEGER,      //  
+    sourceOrderNo: DataTypes.STRING(64),   // 来源单号 
    //基类 code: 退款单号（自动生成）
    //基类 creator: 创建者
    //基类 updator:/更新者
@@ -50,7 +52,7 @@ module.exports = (db, DataTypes) => {
    buyerOpenId: DataTypes.STRING,//用户在商户appid下的唯一标识或买家在支付宝的用户id
    passTradeNo: DataTypes.STRING,//通道的统一订单号
    buyerAliLogonId: DataTypes.STRING,//买家支付宝账号
-  }, base), {
+  }, {
      paranoid: true,//假的删除
      underscored: true,
      version: true,