Merge branch 'tx-fi-tax' of gitlab.gongsibao.com:jiangyong/zhichan into tx-fi-tax

tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -294,10 +294,13 @@ class DeliverybillCtl extends CtlBase {
           pobj.taxpayerName = "小规模纳税人";
           pobj.taxpayerName = "小规模纳税人";
         }
         }
         var obj = {
         var obj = {
-          "delivery_code": pobj.orderId + "_book",
+          //"delivery_code": pobj.orderId + "_book",
           "delivery_info": pobj,
           "delivery_info": pobj,
           "biz_id": pobj.bizId
           "biz_id": pobj.bizId
         };
         };
+        if (pobj.orderId && pobj.orderId != 'undefined'){
+          obj.delivery_code = pobj.orderId + "_book";
+        }
         const rs = await this.service.updateServer(obj);
         const rs = await this.service.updateServer(obj);
         console.log("更新融易算服务返回结果--------------------------", JSON.stringify(rs));
         console.log("更新融易算服务返回结果--------------------------", JSON.stringify(rs));
         if (rs) {
         if (rs) {

tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js

@@ -137,12 +137,18 @@ class DeliverybillDao extends Dao {
 
 
   async updateServer(qobj, t) {
   async updateServer(qobj, t) {
     var setobj = { "delivery_info": qobj.delivery_info };
     var setobj = { "delivery_info": qobj.delivery_info };
-    var whereobj = { "delivery_code": qobj.delivery_code, "biz_id": qobj.biz_id };
+    var whereobj = { "biz_id": qobj.biz_id };
+    if (qobj.delivery_code && qobj.delivery_code != 'undefined'){
+      whereobj.delivery_code =  qobj.delivery_code; 
+    } 
     return await this.updateByWhere(setobj, whereobj, t);
     return await this.updateByWhere(setobj, whereobj, t);
   }
   }
 
 
   async findOneByDeliveryCodeAndBizId(qobj) {
   async findOneByDeliveryCodeAndBizId(qobj) {
-    var qcwhere = { "delivery_code": qobj.delivery_code, "biz_id": qobj.biz_id };
+    var qcwhere = { "biz_id": qobj.biz_id };
+    if (qobj.delivery_code && qobj.delivery_code != 'undefined'){
+      qcwhere.delivery_code =  qobj.delivery_code; 
+    } 
     return await this.findOne(qcwhere);
     return await this.findOne(qcwhere);
   }
   }
   /**
   /**