d

1832c65f · 蒋勇 · b581d7d1 · 1832c65f · 1832c65f · 1832c65f
Commit 1832c65f authored Aug 26, 2020 by 蒋勇
Show whitespace changes
Inline Side-by-side

Showing with 86 additions and 21 deletions

center-manage/app/config/localsettings.js
+32 -0

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+22 -21

icp-deliver/app/config/localsettings.js
+32 -0

No files found.
--- a/center-manage/app/config/localsettings.js
+++ b/center-manage/app/config/localsettings.js
+var settings = {
+  redis: {
+    host: "192.168.4.119",
+    port: 6379,
+    password: "Gongsibao2018",
+    db: 9,
+  },
+  database: {
+    dbname: "gsbcenter_manage",
+    user: "write",
+    password: "write",
+    config: {
+      host: '43.247.184.35',
+      port: 8899,
+      dialect: 'mysql',
+      operatorsAliases: false,
+      pool: {
+        max: 5,
+        min: 0,
+        acquire: 90000000,
+        idle: 1000000
+      },
+      debug: false,
+      dialectOptions: {
+        requestTimeout: 999999,
+        // instanceName:'DEV'
+      }  //è®¾ç½®MSSQLè¶…æ—¶æ—¶é—´
+    }
+  },
+  kongurl: 'http://192.168.4.119:8001/',
+};
+module.exports = settings;
--- a/ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+++ b/ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
@@ -21,7 +21,7 @@ class DeliverybillCtl extends CtlBase {
  }
  /*根据用户id获取商机信息，分页获取*/
-  async findAndCountAll(pobj, qobj, req) {
+  async findAndCountAll (pobj, qobj, req) {
    try {
      //TODO 根据业务员id获取该业务员所有交付单列表
      if (pobj.search && pobj.search.dateType) {
@@ -38,6 +38,7 @@ class DeliverybillCtl extends CtlBase {
      results.forEach(element => {
        let robj = {};
        robj.id = element.id;//数据的id
+        robj.company_name = element.company_name
        robj.deliverNumber = element.delivery_code;//交付单编号
        robj.delivery_code = element.delivery_code;//交付单编号-shousuo
        robj.businessName = element.product_name;//产品名称
@@ -108,7 +109,7 @@ class DeliverybillCtl extends CtlBase {
  }
  /*根据交付单编号获取交付单xinxi*/
-  async findInfoByDeliverCode(mobj, qobj, req) {
+  async findInfoByDeliverCode (mobj, qobj, req) {
    var pobj = mobj.d;
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
      try {
@@ -130,7 +131,7 @@ class DeliverybillCtl extends CtlBase {
  }
  /*根据交付单编号获取交付单详情和材料详情*/
-  async dealInfo(mobj, qobj, req) {
+  async dealInfo (mobj, qobj, req) {
    var pobj = mobj.d;
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
      try {
@@ -256,7 +257,7 @@ class DeliverybillCtl extends CtlBase {
    }
  }
-  async updateFileAndStatusByDelivertCode(mobj, qobj, red) {//阿里更新状态和盖章文件
+  async updateFileAndStatusByDelivertCode (mobj, qobj, red) {//阿里更新状态和盖章文件
    var pobj = mobj.d;
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
      try {
@@ -289,7 +290,7 @@ class DeliverybillCtl extends CtlBase {
  }
-  async updatestartTimeByDeliverCode(mobj, qobj, red) {//根据交付单编号更新开始计费时间
+  async updatestartTimeByDeliverCode (mobj, qobj, red) {//根据交付单编号更新开始计费时间
    var pobj = mobj.d;
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.baseInfo.startTime && pobj.baseInfo.startTime != 'undefined') {
      try {
@@ -362,7 +363,7 @@ class DeliverybillCtl extends CtlBase {
    }
  }
  /*根据交付单编号更新交付单状态*/
-  async updateStatusByDeliverCode(mobj, qobj, req) {
+  async updateStatusByDeliverCode (mobj, qobj, req) {
    var pobj = mobj.d;
    console.log("--------------------" + JSON.stringify(pobj));
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.deliverStatus && pobj.deliverStatus != 'undefined') {
@@ -438,7 +439,7 @@ class DeliverybillCtl extends CtlBase {
    }
  }
-  async UpdateofficialSealByDeliverCode(mobj, qobj, req) {//更新营业执照扫描件和公章扫描件
+  async UpdateofficialSealByDeliverCode (mobj, qobj, req) {//更新营业执照扫描件和公章扫描件
    var pobj = mobj.d;
    if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))) {
      try {
@@ -500,7 +501,7 @@ class DeliverybillCtl extends CtlBase {
    }
  }
-  async updateExpressInfoByDeliverCode(mobj, qobj, req) {//更新邮寄信息
+  async updateExpressInfoByDeliverCode (mobj, qobj, req) {//更新邮寄信息
    var pobj = mobj.d;
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined') {
      try {
@@ -551,7 +552,7 @@ class DeliverybillCtl extends CtlBase {
  }
  /*更新业务员/交付员信息*/
-  async updateUsermanInfoByDeliverCode(mobj, qobj, req) {
+  async updateUsermanInfoByDeliverCode (mobj, qobj, req) {
    var pobj = mobj.d;
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
      try {
@@ -609,7 +610,7 @@ class DeliverybillCtl extends CtlBase {
  }
  /*根据交付单编号更新交付单详情*/
-  async updateInfoByDeliverCode(mobj, qobj, req) {//
+  async updateInfoByDeliverCode (mobj, qobj, req) {//
    var pobj = mobj.d;
    console.log("根据交付单编号更新交付单详情-------------------------" + JSON.stringify(pobj));
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
@@ -684,14 +685,14 @@ class DeliverybillCtl extends CtlBase {
  }
-  async settleApplyForTacent(p, q, req) {
+  async settleApplyForTacent (p, q, req) {
    let ids = p.ids
    let spname = p.spname
    let spid = p.spid
    let rtn = await this.service.settleApplyForTacent(ids, p.userid, p.username, spname, spid)
    return system.getResult({})
  }
-  async settleApply(p, q, req) {
+  async settleApply (p, q, req) {
    let ids = p.ids
    let spname = p.spname
    let spid = p.spid
@@ -699,7 +700,7 @@ class DeliverybillCtl extends CtlBase {
    return system.getResult({})
  }
-  async dealAliDeliveryInfo(nobj, qobj, req) {//插入交付单信息-阿里用
+  async dealAliDeliveryInfo (nobj, qobj, req) {//插入交付单信息-阿里用
    var pobj = nobj.d;
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
      try {
@@ -732,7 +733,7 @@ class DeliverybillCtl extends CtlBase {
  }
  /*根据商机编号插入交付单信息*/
-  async insertInfo(nobj, qobj, req) {//队列的时候用
+  async insertInfo (nobj, qobj, req) {//队列的时候用
    var pobj = nobj.d;
    console.log("根据交付单编号更新交付单详情-------------------------" + JSON.stringify(pobj));
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
@@ -913,7 +914,7 @@ class DeliverybillCtl extends CtlBase {
    }
  }
  /*获取压缩文件的信息 */
-  async findZipUrlByDeliverCode(mobj, qobj, req) {//
+  async findZipUrlByDeliverCode (mobj, qobj, req) {//
    var pobj = mobj.d;
    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
      try {
@@ -962,14 +963,14 @@ class DeliverybillCtl extends CtlBase {
    }
  }
-  timeFormat(date) {
+  timeFormat (date) {
    let localTime = moment.utc(date).toDate();
    localTime = moment(localTime).format("YYYY-MM-DD");
    return localTime;
  }
  //元转分 - 解决精度问题 yuan:要转换的钱，单位元； digit：转换倍数
-  YuanToFen(yuan, digit) {
+  YuanToFen (yuan, digit) {
    var m = 0,
      s1 = yuan.toString(),
      s2 = digit.toString();
@@ -978,7 +979,7 @@ class DeliverybillCtl extends CtlBase {
    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
  }
-  FenToYuan(fen) {
+  FenToYuan (fen) {
    var num = fen;
    num = fen * 0.01;
    num += '';
@@ -988,7 +989,7 @@ class DeliverybillCtl extends CtlBase {
    return num;
  }
-  toDecimal2(x) {
+  toDecimal2 (x) {
    var f = parseFloat(x);
    if (isNaN(f)) {
      return false;
@@ -1007,7 +1008,7 @@ class DeliverybillCtl extends CtlBase {
  }
  //time时间n年后的的前一天
-  oneYearPast(time, n) {
+  oneYearPast (time, n) {
    //var time=new Date();
    try {
      var year = time.getFullYear() + n;
@@ -1023,7 +1024,7 @@ class DeliverybillCtl extends CtlBase {
  }
  //计算俩日期相差多少天
-  diffDays(time1, time2) {
+  diffDays (time1, time2) {
    try {
      var m1 = moment(time1);
      var m2 = moment(time2);

--- a/icp-deliver/app/config/localsettings.js
+++ b/icp-deliver/app/config/localsettings.js
+var settings = {
+  redis: {
+    host: "192.168.4.119",
+    port: 6379,
+    password: "Gongsibao2018",
+    db: 9,
+  },
+  database: {
+    dbname: "ent_deliver",
+    user: "write",
+    password: "write",
+    config: {
+      host: '43.247.184.35',
+      port: 8899,
+      dialect: 'mysql',
+      operatorsAliases: false,
+      pool: {
+        max: 5,
+        min: 0,
+        acquire: 90000000,
+        idle: 1000000
+      },
+      debug: false,
+      dialectOptions: {
+        requestTimeout: 999999,
+        // instanceName:'DEV'
+      }  //è®¾ç½®MSSQLè¶…æ—¶æ—¶é—´
+    }
+  },
+  kongurl: 'http://192.168.4.119:8001/',
+};
+module.exports = settings;