Merge branch 'gsb-ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-ic-deliver

8c98b68a · v_vjyjiang · 6db70c0c · ffb80cc9 · 8c98b68a · 8c98b68a
Commit 8c98b68a authored Aug 13, 2020 by v_vjyjiang
6 changed files
--- a/ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
+++ b/ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
@@ -37,19 +37,19 @@ class BizOptCtl extends CtlBase {
        robj.id = element.id;//数据的id
        robj.demand_code = element.demand_code;//商机编号
        robj.source = element.source_name;//商机来源
-       // robj.source_name = element.source_name;//商机来源-jiansuo
+        // robj.source_name = element.source_name;//商机来源-jiansuo
        robj.business_type = element.business_type;//商机类型
        robj.business_info_person = element.business_info.contactsName;//联系人
        robj.v_coname = element.v_coname;//联系人-shousuo
-        robj.business_info_phone = system.decryptStr(element.business_info.contactsPhone);//联系电话
+        robj.business_info_phone = element.business_info.contactsPhone;//联系电话
-        robj.v_cophone = system.decryptStr(element.v_cophone);//联系电话-shousuo
+        robj.v_cophone = element.v_cophone;//联系电话-shousuo
        robj.business_status = element.business_status;//商机当前状态
-        if (element.business_info.serviceName && element.business_info.serviceName != 'undefined'){
+        if (element.business_info.serviceName && element.business_info.serviceName != 'undefined') {
          robj.serviceName = element.business_info.serviceName;//服务地区
        }
-       else{
+        else {
-        robj.serviceName = "";
+          robj.serviceName = "";
-       }
+        }
        robj.updated_at = this.timeFormat(element.updated_at);//商机当前状态日期
        robj.servicerName = element.facilitator_name;
@@ -57,8 +57,8 @@ class BizOptCtl extends CtlBase {
        robj.sourceName = element.source_name;//渠道来源
        robj.source_name = element.source_name;//渠道来源--前端服务
-        robj.salesman_name=element.salesman_name
+        robj.salesman_name = element.salesman_name
-        robj.salesman_phone=element.salesman_phone
+        robj.salesman_phone = element.salesman_phone
        rarr.push(robj);
      });
@@ -97,7 +97,7 @@ class BizOptCtl extends CtlBase {
          businessInfo.statusReason = rs.close_reason;//商机关闭原因
          businessInfo.memoInfo = rs.business_info.memoInfo;//备注信息
          businessInfo.contactsName = rs.business_info.contactsName;//联系人名称
-          businessInfo.contactsPhone = system.decryptStr(rs.business_info.contactsPhone);//联系人联系方式
+          businessInfo.contactsPhone = rs.business_info.contactsPhone;//联系人联系方式
          businessInfo.createdTime = this.timeFormat(rs.created_at);//商机创建时间
          rarr.statusInfo = statusInfo;
          rarr.businessInfo = businessInfo;
@@ -128,18 +128,18 @@ class BizOptCtl extends CtlBase {
    }
  }
-   /*更新业务员信息*/
+  /*更新业务员信息*/
-  async updateSalesmanInfoByDemandCode(mobj, qobj, req){
+  async updateSalesmanInfoByDemandCode(mobj, qobj, req) {
    var pobj = mobj.d;
-    if (pobj.businessMode && pobj.businessMode != 'undefined'){
+    if (pobj.businessMode && pobj.businessMode != 'undefined') {
-      try{
+      try {
        var res = await this.service.findInfoByDemandCode(pobj);
-        if (res){
+        if (res) {
          var sInfo = {
            "flowType": "BIZ",
            "flowId": res.id,
-            "flowCode":pobj.businessMode,
+            "flowCode": pobj.businessMode,
-            "salesmanInfo":{
+            "salesmanInfo": {
              "oldOpcode": res.salesman_opcode,
              "oldClerkName": res.salesman_name,
              "oldClerkId": res.salesman_id,
@@ -158,16 +158,16 @@ class BizOptCtl extends CtlBase {
          await this.service.updateSalesmanInfoByDemandCode(pobj);//更新业务员信息
          return system.getResult("操作成功！");
        }
-        else{
+        else {
          return system.getResultError("未找到相关数据");
        }
      }
-      catch(error){
+      catch (error) {
        return system.getResultError(error);
      }
    }
-    else{
+    else {
      return system.getResultError("参数错误!");
    }
  }
@@ -233,25 +233,35 @@ class BizOptCtl extends CtlBase {
    var pobj = nobj.d;
    if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.businessType && pobj.businessType != 'undefined') {
      try {
-        //pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
+        const businessData = await this.service.findOne({ demand_code: pobj.businessMode });
-        // pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
+        if (businessData) {
-        // pobj.sourceNumber = "1111111";
+          return {
-        pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
+            "status": 1,    //1代表成功，否则失败
-        var buInfo = await this.service.insertInfo(pobj);
+            "msg": "已处理成功!",
-        var logInfo = {
+            "data": "",
-          "flowType": "BIZ",
+            "requestId": ""
-          "flowId": buInfo.id,
+          }
-          "statusCode": pobj.currentStatus,
+        } else {
-          "clerkName": pobj.clerkName,
+          //pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
-          "clerkId": pobj.salesmanId
+          // pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
+          // pobj.sourceNumber = "1111111";
+          pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
+          var buInfo = await this.service.insertInfo(pobj);
+          var logInfo = {
+            "flowType": "BIZ",
+            "flowId": buInfo.id,
+            "statusCode": pobj.currentStatus,
+            "clerkName": pobj.clerkName,
+            "clerkId": pobj.salesmanId
+          }
+          await this.logService.insertInfo(logInfo);//插入状态日至表
+          return {
+            "status": 1,   //1代表成功，否则失败
+            "message": "操作成功",
+            "data": "",
+            "requestId": ""
+          };
        }
-        await this.logService.insertInfo(logInfo);//插入状态日至表
-        return {
-          "status": 1,   //1代表成功，否则失败
-          "message": "操作成功",
-          "data": "",
-          "requestId": ""
-        };
      }
      catch (error) {
        console.log("TTTTTTTTTTTTTTTTTTTTTTT");

--- a/ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+++ b/ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
@@ -89,9 +89,9 @@ class DeliverybillCtl extends CtlBase {
        robj.deliverStatus = element.delivery_status;//交付单状态
        robj.delivery_status = element.delivery_status;//交付单状态-shousuo
        robj.contactsName = robj.baseInfo.contactsName;//联系人
-        robj.contactsPhone = system.decryptStr(robj.baseInfo.contactsPhone);//联系电话
+        robj.contactsPhone = robj.baseInfo.contactsPhone;//联系电话
        robj.v_coname = element.v_coname;//联系人-shousuo
-        robj.v_cophone = system.decryptStr(element.v_cophone);//联系电话-shousuo
+        robj.v_cophone = element.v_cophone;//联系电话-shousuo
        robj.clerkName = element.salesman_name;//业务员名称
        robj.clerkPhone = element.salesman_phone;//业务员电话
        robj.deliveryName = element.delivery_man_name;//交付人员名称
@@ -179,7 +179,7 @@ class DeliverybillCtl extends CtlBase {
            rarr.baseInfo.contactsName = rs.delivery_info.contactsName;//联系人信息
          }
          if (rs.delivery_info.contactsPhone && rs.delivery_info.contactsPhone != 'undefined') {
-            rarr.contactsInfo.contactsPhone = system.decryptStr(rs.delivery_info.contactsPhone);//联系电话信息
+            rarr.contactsInfo.contactsPhone = rs.delivery_info.contactsPhone;//联系电话信息
            rarr.baseInfo.contactsPhone = rarr.contactsInfo.contactsPhone;//联系电话信息
          }
@@ -614,7 +614,7 @@ class DeliverybillCtl extends CtlBase {
          baseInfo.contactsName = pobj.contactsInfo.contactsName;
        }
        if (pobj.contactsInfo.contactsPhone && pobj.contactsInfo.contactsPhone != 'undefined') {
-          baseInfo.contactsPhone = system.encryptStr(pobj.contactsInfo.contactsPhone);
+          baseInfo.contactsPhone = pobj.contactsInfo.contactsPhone;
        }
        var parms = {
          "deliverNumber": pobj.deliverNumber
@@ -699,7 +699,9 @@ class DeliverybillCtl extends CtlBase {
      try {
        var res = await this.service.findInfoByDeliverCode(pobj);
        if (res) {
-          pobj.deliverStatus = "userConfirmationReject";//状态改成驳回
+          if (res.delivery_status != 'received' && res.delivery_status != 'userUploadWait') {//如果数据库中状态是已接单、待用户上传，说明是第一次提交文件，状态为传过了的状态；如果不是已接单、待用户上传，说明是客户驳回后重新提交的文件，状态改为已驳回
+            pobj.deliverStatus = "userConfirmationReject";//状态改成驳回,
+          }
          await this.service.updateInfoByDeliverCode(pobj);
          return system.getResultSuccess();
          //return await this.service.updateInfoByDeliverCode(pobj);
@@ -835,7 +837,7 @@ class DeliverybillCtl extends CtlBase {
        }
        if (pobj.baseInfo.contactsPhone && pobj.baseInfo.contactsPhone != 'undefined') {
-          pobj.baseInfo.contactsPhone = system.encryptStr(pobj.baseInfo.contactsPhone);
+          pobj.baseInfo.contactsPhone = pobj.baseInfo.contactsPhone;
          pobj.cacheInfo.cmpContactInfo.contactsPhone = pobj.baseInfo.contactsPhone;
        }
        if (pobj.baseInfo.virtualPrice && pobj.baseInfo.virtualPrice != 'undefined') {//虚拟地址价格

--- a/ic-deliver/app/base/db/impl/bizchance/bizoptDao.js
+++ b/ic-deliver/app/base/db/impl/bizchance/bizoptDao.js
@@ -53,7 +53,7 @@ class BizoptDao extends Dao {
  }
  /*更新业务员信息*/
-  async updateSalesmanInfoByDemandCode(qobj,t){
+  async updateSalesmanInfoByDemandCode(qobj, t) {
    var setobj = {};
    if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
      setobj.salesman_id = qobj.salesmanId;
@@ -104,7 +104,7 @@ class BizoptDao extends Dao {
      obj.business_info.contactsName = qobj.contactsName;
    }
    if (qobj.contactsPhone && qobj.contactsPhone != 'undefined') {
-      obj.business_info.contactsPhone = system.encryptStr(qobj.contactsPhone);
+      obj.business_info.contactsPhone = qobj.contactsPhone;
    }
    if (qobj.serviceName && qobj.serviceName != 'undefined') {
      obj.business_info.serviceName = qobj.serviceName;

--- a/ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
+++ b/ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
@@ -89,24 +89,24 @@ class DeliverybillDao extends Dao {
    var setobj = {};
    if(qobj.type == "salesman") {
      if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
-        setobj.delivery_man_id = qobj.salesmanId;
+        setobj.salesman_id = qobj.salesmanId;
      };
      if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
-        setobj.delivery_man_name = qobj.salesmanName;
+        setobj.salesman_name = qobj.salesmanName;
      };
      if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
-        setobj.delivery_man_opcode = qobj.salesmanOpcode;
+        setobj.salesman_opcode = qobj.salesmanOpcode;
      };
    }
    if(qobj.type == "deliverman") {
      if (qobj.deliverymanId && qobj.deliverymanId != 'undefined') {
-        setobj.salesman_id = qobj.deliverymanId;
+        setobj.delivery_man_id = qobj.deliverymanId;
      };
      if (qobj.deliverymanName && qobj.deliverymanName != 'undefined') {
-        setobj.salesman_name = qobj.deliverymanName;
+        setobj.delivery_man_name = qobj.deliverymanName;
      };
      if (qobj.deliverymanOpcode && qobj.deliverymanOpcode != 'undefined') {
-        setobj.salesman_opcode = qobj.deliverymanOpcode;
+        setobj.delivery_man_opcode = qobj.deliverymanOpcode;
      };
    }
    // if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {

--- a/ic-deliver/app/base/db/models/delivery/business_opportunity.js
+++ b/ic-deliver/app/base/db/models/delivery/business_opportunity.js
@@ -39,7 +39,7 @@ module.exports = (db, DataTypes) => {
      type: DataTypes.STRING
    },
    service_address: { // 区域地址
-      allowNull: false,
+      allowNull: true,
      type: DataTypes.STRING
    },
    close_reason: { // 关闭理由

--- a/ic-deliver/app/config/settings.js
+++ b/ic-deliver/app/config/settings.js
@@ -56,7 +56,7 @@ var settings = {
    if (this.env == "dev") {
      return "http://43.247.184.94:7200/api/queueAction/producer/springBoard";
    } else {
-      return "http://logs-sytxpublic-msgq-service/api/queueAction/producer/springBoard";
+      return "http://logs-sytxpublic-msgq-service.chaolai/api/queueAction/producer/springBoard";
    }
  },
  pmappid: 1,