gyq

ic-deliver/app/base/controller/impl/bizchance/cacheinfoCtl.js

@@ -45,16 +45,19 @@ class CacheInfoCtl extends CtlBase {
   /*根据交付单id更新缓存信息*/
   async updateInfoByDeliverId(mobj,qobj,req){
     var pobj = mobj.d;
+    console.log("cache---------------------------------------" + JSON.stringify(pobj));
     if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.cacheInfo && pobj.cacheInfo != 'undefined'){
       try{
         var res = await this.service.updateInfoByDeliverId(pobj);
         return system.getResult("更新成功！");
       }
       catch (error){
+        console.log("error----------------------------" + error);
         return system.getResultError(error);
       }
     }
     else{
+      console.log("-----------------------------------------参数错误");
       return system.getResultError("参数错误!");
     }
   }

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

@@ -484,17 +484,17 @@ class DeliverybillCtl extends CtlBase {
           else if (pobj.businessName == "云上园区注册"){
             pobj.companyInfo.companyProperties = appconfig.pdict.registeredTypeDictT[pobj.companyInfo.companyPropertiesName];
           }
-          pobj.deliveryInfo.companyProperties = pobj.companyInfo.companyProperties;
+          pobj.baseInfo.companyProperties = pobj.companyInfo.companyProperties;
           pobj.companyInfo.companyType = pobj.companyInfo.companyProperties;
-          pobj.deliveryInfo.companyType = pobj.companyInfo.companyProperties;
+          pobj.baseInfo.companyType = pobj.companyInfo.companyProperties;
         }
         if (pobj.companyInfo.engagedIndName && pobj.companyInfo.engagedIndName != 'undefined') {
           pobj.companyInfo.engagedIndustry = appconfig.pdict.engagedIndustryDictT[pobj.companyInfo.engagedIndName];
         }
-        if (pobj.deliveryInfo.taxpayerName && pobj.deliveryInfo.taxpayerName != 'undefined') {
-          pobj.deliveryInfo.taxpayerType = appconfig.pdict.TaxpayerTypeDictT[pobj.deliveryInfo.taxpayerName];
+        if (pobj.baseInfo.taxpayerName && pobj.baseInfo.taxpayerName != 'undefined') {
+          pobj.baseInfo.taxpayerType = appconfig.pdict.TaxpayerTypeDictT[pobj.baseInfo.taxpayerName];
           if (pobj.businessName == "公司注册" || pobj.businessName == "云上园区注册"){
-            pobj.companyInfo.taxpayerType = pobj.deliveryInfo.taxpayerType;
+            pobj.companyInfo.taxpayerType = pobj.baseInfo.taxpayerType;
           } 
         }
         pobj.schemeNumber = "";
@@ -523,36 +523,39 @@ class DeliverybillCtl extends CtlBase {
         }
         console.log("---------------------------------------------------------------------------------------------------------------------------------------");
 
-        if (pobj.deliveryInfo.memoInfo && pobj.deliveryInfo.memoInfo != 'undefined') {
-          pobj.cacheInfo.cmpDeliverInfo.memoInfo = pobj.deliveryInfo.memoInfo;
+        if (pobj.baseInfo.memoInfo && pobj.baseInfo.memoInfo != 'undefined') {
+          pobj.cacheInfo.cmpDeliverInfo.memoInfo = pobj.baseInfo.memoInfo;
         }
 
-        if (pobj.deliveryInfo.isWhether && pobj.deliveryInfo.isWhether != 'undefined') {
-          pobj.cacheInfo.cmpDeliverInfo.isWhether = pobj.deliveryInfo.isWhether;
+        if (pobj.baseInfo.isWhether && pobj.baseInfo.isWhether != 'undefined') {
+          pobj.cacheInfo.cmpDeliverInfo.isWhether = pobj.baseInfo.isWhether;
+        }
+        if (pobj.baseInfo.financial && pobj.baseInfo.financial != 'undefined'){
+          pobj.cacheInfo.financial = pobj.baseInfo.financial;
         }
 
-        if (pobj.deliveryInfo.addressType && pobj.deliveryInfo.addressType != 'undefined') {
-          pobj.cacheInfo.cmpDeliverInfo.addressType = pobj.deliveryInfo.addressType;
+        if (pobj.baseInfo.addressType && pobj.baseInfo.addressType != 'undefined') {
+          pobj.cacheInfo.cmpDeliverInfo.addressType = pobj.baseInfo.addressType;
         }
 
-        if (pobj.deliveryInfo.companyName && pobj.deliveryInfo.companyName != 'undefined') {
-          pobj.cacheInfo.cmpDeliverInfo.companyName = pobj.deliveryInfo.companyName;
+        if (pobj.baseInfo.companyName && pobj.baseInfo.companyName != 'undefined') {
+          pobj.cacheInfo.cmpDeliverInfo.companyName = pobj.baseInfo.companyName;
         }
         if (pobj.serviceCode && pobj.serviceCode != 'undefined') {
           pobj.cacheInfo.cmpDeliverInfo.serviceArea = pobj.serviceCode;
         }
         if (pobj.serviceName && pobj.serviceName != 'undefined') {
           pobj.cacheInfo.cmpDeliverInfo.serviceAreaName = pobj.serviceName;
-          pobj.deliveryInfo.serviceName = pobj.serviceName;
+          pobj.baseInfo.serviceName = pobj.serviceName;
         }
         if (pobj.companyInfo.businessScope && pobj.companyInfo.businessScope != 'undefined') {
           pobj.cacheInfo.cmpDeliverInfo.businessScope = pobj.companyInfo.businessScope;
         }
-        if (pobj.deliveryInfo.taxpayerType && pobj.deliveryInfo.taxpayerType != 'undefined') {
-          pobj.cacheInfo.cmpDeliverInfo.taxpayerType = pobj.deliveryInfo.taxpayerType;
+        if (pobj.baseInfo.taxpayerType && pobj.baseInfo.taxpayerType != 'undefined') {
+          pobj.cacheInfo.cmpDeliverInfo.taxpayerType = pobj.baseInfo.taxpayerType;
         }
-        if (pobj.deliveryInfo.taxpayerName && pobj.deliveryInfo.taxpayerName != 'undefined') {
-          pobj.cacheInfo.cmpDeliverInfo.taxpayerName = pobj.deliveryInfo.taxpayerName;
+        if (pobj.baseInfo.taxpayerName && pobj.baseInfo.taxpayerName != 'undefined') {
+          pobj.cacheInfo.cmpDeliverInfo.taxpayerName = pobj.baseInfo.taxpayerName;
         }
         if (pobj.companyInfo.engagedIndustry && pobj.companyInfo.engagedIndustry != 'undefined') {
           pobj.cacheInfo.cmpDeliverInfo.engagedIndustry = pobj.companyInfo.engagedIndustry;
@@ -564,12 +567,12 @@ class DeliverybillCtl extends CtlBase {
           pobj.cacheInfo.cmpDeliverInfo.fullAddress = pobj.companyInfo.fullAddress;
           pobj.cacheInfo.cmpDeliverInfo.residenceAddress = pobj.companyInfo.fullAddress;
         }
-        if (pobj.deliveryInfo.contactsName && pobj.deliveryInfo.contactsName != 'undefined'){
-          pobj.cacheInfo.cmpContactInfo.contactsName = pobj.deliveryInfo.contactsName;
+        if (pobj.baseInfo.contactsName && pobj.baseInfo.contactsName != 'undefined'){
+          pobj.cacheInfo.cmpContactInfo.contactsName = pobj.baseInfo.contactsName;
         }
 
-        if (pobj.deliveryInfo.contactsPhone && pobj.deliveryInfo.contactsPhone != 'undefined'){
-          pobj.cacheInfo.cmpContactInfo.contactsPhone = pobj.deliveryInfo.contactsPhone;
+        if (pobj.baseInfo.contactsPhone && pobj.baseInfo.contactsPhone != 'undefined'){
+          pobj.cacheInfo.cmpContactInfo.contactsPhone = pobj.baseInfo.contactsPhone;
         }
 
         //更新状态给庄冰
@@ -582,7 +585,7 @@ class DeliverybillCtl extends CtlBase {
             "actionType": "updateOrderStatus",
             "identifyCode": "ic-manage",
             "messageBody": {
-              "orderNum": pobj.businessMode,//订单编码
+              "orderNum": pobj.deliverNumber,//订单编码
               "status": 20,//已接单
               "deliverContent": pobj
             }

ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js

@@ -213,6 +213,7 @@ class SchemeCtl extends CtlBase {
                 pobj.baseInfo.isWhether = pobj.baseInfo.psSealSevCase
             }
 
+
             //纳税人类型
             if (pobj.baseInfo.psTaxpayerType && pobj.baseInfo.psTaxpayerType != 'undefined'){
                 pobj.baseInfo.taxpayerType = pobj.baseInfo.psTaxpayerType;
@@ -272,10 +273,11 @@ class SchemeCtl extends CtlBase {
             }
 
             //goumaisichang
-            if (pobj.baseInfo.buyDuration && pobj.baseInfo.buyDuration != 'undefined'){
-                pobj.baseInfo.buyDuration = appconfig.pdict.buyDurationDict[pobj.baseInfo.buyDuration];
-            }
-            if (pobj.baseInfo.isRenew ){
+            // if (pobj.baseInfo.buyDuration && pobj.baseInfo.buyDuration != 'undefined'){
+            //     pobj.baseInfo.buyDuration = appconfig.pdict.buyDurationDict[pobj.baseInfo.buyDuration];
+            // }
+
+            if (pobj.baseInfo.hasOwnProperty("isRenew")){
                 pobj.baseInfo.isRenew = appconfig.pdict.isRenewDict[pobj.baseInfo.isRenew];
             }
             else{
@@ -372,6 +374,7 @@ class SchemeCtl extends CtlBase {
                 pobj.clerkId = businessInfo.salesman_id;//业务员id
                 pobj.clerkName = businessInfo.salesman_name;//业务员名称
                 pobj.clerkPhone = businessInfo.salesman_phone;//业务员联系电话
+                //pobj.baseInfo.userName = businessInfo.business_info.userName;//
                 //pobj.currentStatus = appconfig.pdict.businessStatus[businessInfo.business_status];//商机状态即为方案状态
                 //pobj.statusReason = businessInfo.close_reason;//状态原因
             }

ic-deliver/app/base/db/impl/bizchance/bizoptDao.js

@@ -87,6 +87,9 @@ class BizoptDao extends Dao {
     if (qobj.businessName && qobj.businessName != 'undefined'){
       obj.business_info.businessName = qobj.businessName;
     }
+    if (qobj.UserName && qobj.UserName != 'undefined'){
+      obj.business_info.userName = qobj.UserNames;
+    }
     if (qobj.companyName && qobj.companyName != 'undefined'){
       obj.business_info.companyName = qobj.companyName;
     }

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js

@@ -100,7 +100,7 @@ class DeliverybillDao extends Dao {
     var obj = {
       "delivery_code": qobj.deliverNumber,
       "delivery_status": qobj.deliverStatus,
-      "delivery_info":qobj.deliveryInfo
+      "delivery_info":qobj.baseInfo
     };
     if (qobj.businessMode && qobj.businessMode != 'undefined'){
       obj.demand_code = qobj.businessMode;