gyq

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

@@ -121,7 +121,7 @@ class DeliverybillCtl extends CtlBase {
     if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.deliverStatus && pobj.deliverStatus != 'undefined'){
       try{
         var res = await this.service.updateInfoByDeliverCode(pobj);
-        //调商城接口，回传状态信息，后加
+        //调商城接口，回传状态信息，放队列
 
         return system.getResult("更新成功！");
       }
@@ -134,8 +134,9 @@ class DeliverybillCtl extends CtlBase {
     }
   }
 
-  async UpdateofficialSealByDeliverCode(pobj,qobj,req){//
+  async UpdateofficialSealByDeliverCode(pobj,qobj,req){//更新营业执照扫描件和公章扫描件
     if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))){
+     try{
       var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
       if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined'){
         rs.delivery_info.officialSeal = pobj.baseInfo.officialSeal;
@@ -149,7 +150,28 @@ class DeliverybillCtl extends CtlBase {
         "baseInfo":rs.delivery_info
       };
       await this.service.updateInfoByDeliverCode(uarr);
+      //回传信息给庄冰，放队列
       return system.getResult("更新成功");
+     }
+     catch(error){
+      return system.getResultError(error);
+     }
+    }
+    else{
+      return system.getResultError("参数错误！");
+    }
+  }
+
+  async updateExpressInfoByDeliverCode(pobj,qobj,req){//更新邮寄信息
+    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined'){
+      try{
+        await this.materialService.updateInfoByDeliverNumber(pobj);
+        //回传庄冰，放队列
+        return system.getResult("更新成功");
+      }
+      catch{
+        return system.getResultError(error);
+      }
     }
     else{
       return system.getResultError("参数错误！");
@@ -170,27 +192,27 @@ class DeliverybillCtl extends CtlBase {
         };
         //更新状态
         await this.service.updateStatusByDeliverCode(statusInfo);
-
-        //传给庄冰
-        pobj.baseInfo = deliveryInfo;
-        var rc = system.getObject("util.execClient");
-        var requrl = this.receiveUrl;
-        var params =  {
-          "actionType":"updateOrderStatus",
-          "actionBody":{
-            "orderNum": pobj.deliverNumber,//订单编码
-            "status":appconfig.pdict.ddyDict["collecting"],
-            "deliverContent":pobj
-          }
-        }   
-        var rtn = await rc.execPost(params, requrl);
-        var j = JSON.parse(rtn.stdout);
-        if (j.status == 1){
-          return system.getResult("操作成功！");
-        }
-        else{
-          return system.getResultError("更新交付单状态出错！");
-        }
+        return system.getResult("操作成功！");
+        //传给庄冰，放队列
+        // pobj.baseInfo = deliveryInfo;
+        // var rc = system.getObject("util.execClient");
+        // var requrl = this.receiveUrl;
+        // var params =  {
+        //   "actionType":"updateOrderStatus",
+        //   "actionBody":{
+        //     "orderNum": pobj.deliverNumber,//订单编码
+        //     "status":appconfig.pdict.ddyDict["collecting"],
+        //     "deliverContent":pobj
+        //   }
+        // }   
+        // var rtn = await rc.execPost(params, requrl);
+        // var j = JSON.parse(rtn.stdout);
+        // if (j.status == 1){
+        //   return system.getResult("操作成功！");
+        // }
+        // else{
+        //   return system.getResultError("更新交付单状态出错！");
+        // }
       }
       catch(error){
         return system.getResultError(error);

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

@@ -15,7 +15,7 @@ class MaterialDao extends Dao {
   async updateInfoByDeliverNumber(qobj,t){
     var whereobj = {"delivery_code":qobj.deliverNumber};
     var setobj = {};
-    if (qobj.companyInfo && qobj.company_info != 'undefined'){
+    if (qobj.companyInfo && qobj.companyInfo != 'undefined'){
       setobj.company_info = qobj.companyInfo;
     }
     if (qobj.registeredInfo && qobj.registeredInfo != 'undefined'){