gyq

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

@@ -134,6 +134,7 @@ class DeliverybillCtl extends CtlBase {
           rarr.id = rs.id;//数据的id
           rarr.id = rs.id;//数据的id
           rarr.baseInfo.deliverNumber = rs.delivery_code;//交付单编号
           rarr.baseInfo.deliverNumber = rs.delivery_code;//交付单编号
           rarr.baseInfo.businessName = rs.product_name;//产品名称
           rarr.baseInfo.businessName = rs.product_name;//产品名称
+          rarr.baseInfo.businessMode = rs.demand_code;//shangjibianhao
           rarr.baseInfo.businessType = rs.product_code;//产品编码
           rarr.baseInfo.businessType = rs.product_code;//产品编码
           rarr.baseInfo.channelSource = rs.source_name;//渠道名称
           rarr.baseInfo.channelSource = rs.source_name;//渠道名称
           rarr.baseInfo.channelNumber = rs.source_number;//渠道编码
           rarr.baseInfo.channelNumber = rs.source_number;//渠道编码
@@ -695,6 +696,13 @@ class DeliverybillCtl extends CtlBase {
         if (pobj.baseInfo.contactsPhone && pobj.baseInfo.contactsPhone != 'undefined') {
         if (pobj.baseInfo.contactsPhone && pobj.baseInfo.contactsPhone != 'undefined') {
           pobj.cacheInfo.cmpContactInfo.contactsPhone = pobj.baseInfo.contactsPhone;
           pobj.cacheInfo.cmpContactInfo.contactsPhone = pobj.baseInfo.contactsPhone;
         }
         }
+        if (pobj.baseInfo.virtualPrice && pobj.baseInfo.virtualPrice != 'undefined'){//虚拟地址价格
+          pobj.cacheInfo.virtualPrice = pobj.baseInfo.virtualPrice;
+        }
+
+        if ((pobj.deliverNumber != pobj.txOrderNum) && (pobj.businessType == "sealSevCase" || pobj.businessType == "agentCase")){
+          pobj.companyInfo = {};
+        }
 
 
         //更新状态给庄冰
         //更新状态给庄冰
         var rc = system.getObject("util.execClient");
         var rc = system.getObject("util.execClient");

ic-deliver/app/config/settings.js

@@ -28,21 +28,21 @@ var settings = {
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "http://192.168.1.140:4011/api/receive/entService/springBoard";
       return "http://192.168.1.140:4011/api/receive/entService/springBoard";
     } else {
     } else {
-      return "";
+      return "http://brguser.brg.tencentyun.com";
     }
     }
   },
   },
   queueUrl: function () {
   queueUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
       return "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
     } else {
     } else {
-      return "";
+      return "http://queue.brg.tencentyun.com";
     }
     }
   },
   },
   wdyUrl: function () {
   wdyUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "http://192.168.1.113:4011/api/action/order/springBoard";
       return "http://192.168.1.113:4011/api/action/order/springBoard";
     } else {
     } else {
-      return "";
+      return "http://brguser.brg.tencentyun.com";
     }
     }
   },
   },
   pmappid: 1,
   pmappid: 1,