fgx

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

@@ -143,7 +143,6 @@ class DeliverybillCtl extends CtlBase {
 
   // 创建服务实例
   async insertInfo(pobj, qobj, req) {
-    // console.log(pobj);
     // 检验各项必传参数
     if (pobj.requestId && pobj.requestId != 'undefined' &&
       pobj.bizId && pobj.bizId != 'undefined' &&
@@ -160,30 +159,54 @@ class DeliverybillCtl extends CtlBase {
       pobj.delivery_status && pobj.delivery_status != 'undefined' &&
       pobj.facilitator_id && pobj.facilitator_id != 'undefined') {
       try {
-        // console.log(pobj);
         var buInfo = await this.service.insertInfo(pobj);
-        var logInfo = {
-          "flowType": "DELIVERY",
-          "flowId": buInfo.id,
-          "statusCode": buInfo.delivery_status,
-          "status_reason": ""
-        }
-        await this.logService.insertInfo(logInfo);//插入状态日至表
         return system.getResult(buInfo);
       } catch (error) {
-        // console.log(error);
         return system.getResultError(error);
       }
     } else {
       return system.getResultError("参数错误!");
     }
   }
+
+  async updateServer(pobj, qobj, req) {
+    try {
+      if (!pobj.requestId || pobj.requestId == 'undefined') {
+        throw new Error("requestId 不能为空");
+      }
+      if (!pobj.bizId || pobj.bizId == 'undefined') {
+        throw new Error("bizId 不能为空");
+      }
+      if (!pobj.orderId || pobj.orderId == 'undefined') {
+        throw new Error("orderId 不能为空");
+      }
+      if (!pobj.topOrgCode || pobj.topOrgCode == 'undefined') {
+        throw new Error("topOrgCode 不能为空");
+      }
+      if (!pobj.companyName || pobj.companyName == 'undefined') {
+        throw new Error("companyName 不能为空");
+      }
+      if (!pobj.contactName || pobj.contactName == 'undefined') {
+        throw new Error("contactName 不能为空");
+      }
+      if (!pobj.companyBizType || pobj.companyBizType == 'undefined') {
+        throw new Error("companyBizType 不能为空");
+      }
+      if (!pobj.uscc || pobj.uscc == 'undefined') {
+        throw new Error("uscc 不能为空");
+      }
+      const rs = await this.service.updateServer(pobj);
+      return system.getResult(rs);
+    } catch (err) {
+      return system.getResult(null, err.message)
+    }
+  }
 }
 module.exports = DeliverybillCtl;
 
 // var task = new DeliverybillCtl();
 // var obj = {
-//   "orderId": "341184456620455_book",
+//   "orderId": "241284456620422",
 //   "source_number": "tx",
 //   "demand_code": "demand_code",
 //   "sku_code": "sku_code",
@@ -196,14 +219,18 @@ module.exports = DeliverybillCtl;
 //   "facilitator_name": "公司宝",
 //   "source_name": "tencentCloud",
 //   "requestId": "282da0a74432-738f-4bed-b48d-d51aa433",
-//   "bizId": "1292748632",
+//   "bizId": "1292748623",
 //   "contactsPhone": "18510669321",
 //   "userId": "10973452443103156",
 //   "areaType": "city",
 //   "area": "100010",
 //   "topOrgCode": "rong_yi_suan",
-//   "taxpayerType": 1
+//   "taxpayerType": "generalTaxpayer",
+//   "companyName": "汉唐信通",
+//   "contactName": "王麻子",
+//   "companyBizType": "1",
+//   "uscc": "企业社会统一信用代码"
 // };
-// task.insertInfo(obj, {}, {}).then(d => {
+// task.updateServer(obj, {}, {}).then(d => {
 //   console.log(JSON.stringify(d));
 // })
\ No newline at end of file

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

@@ -69,8 +69,6 @@ class DeliverybillDao extends Dao {
   }
 
   async insertInfo(qobj, t) {
-    // console.log("dao层qobj===>");
-    // console.log(qobj);
     var obj = {
       "delivery_code": qobj.orderId,
       "product_code": qobj.product_code,
@@ -182,9 +180,16 @@ class DeliverybillDao extends Dao {
     delete qobj.delivery_status;
     delete qobj.facilitator_id;
     obj.delivery_info = qobj;
-    // console.log("dao层obj===>");
-    // console.log(obj);
     return await this.create(obj, t);
   }
+
+  async updateServer(qobj, whereobj, t) {
+    return await this.updateByWhere(qobj, whereobj, t);
+  }
+
+  async findOneByDeliveryCodeAndBizId(qobj) {
+    var qcwhere = { "delivery_code": qobj.orderId, "biz_id": qobj.bizId };
+    return await this.findOne(qcwhere);
+  }
 }
 module.exports = DeliverybillDao;

tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js

@@ -240,5 +240,140 @@ class DeliverybillService extends ServiceBase {
       return await self.dao.insertInfo(qobj, t);
     });
   }
+
+  async updateServer(qobj) {
+    var self = this;
+    var bill = await self.dao.findOneByDeliveryCodeAndBizId(qobj);
+    var obj = {};
+    var whereobj = {
+      "delivery_code": qobj.orderId,
+      "biz_id": qobj.bizId
+    };
+    // source_number
+    if (qobj.source_number && qobj.source_number != 'undefined') {
+      obj.source_number = qobj.source_number;
+      delete qobj.source_number;
+    }
+    // demand_code
+    if (qobj.demand_code && qobj.demand_code != 'undefined') {
+      obj.demand_code = qobj.demand_code;
+      delete qobj.demand_code;
+    }
+    // sku_code
+    if (qobj.sku_code && qobj.sku_code != 'undefined') {
+      obj.sku_code = qobj.sku_code;
+      delete qobj.sku_code;
+    }
+    // scheme_number
+    if (qobj.solutionBizId && qobj.solutionBizId != 'undefined') {
+      obj.scheme_number = qobj.solutionBizId;
+      delete qobj.solutionBizId;
+    }
+    // product_code
+    if (qobj.product_code && qobj.product_code != 'undefined') {
+      obj.product_code = qobj.product_code;
+      delete qobj.product_code;
+    }
+    // product_name
+    if (qobj.product_name && qobj.product_name != 'undefined') {
+      obj.product_name = qobj.product_name;
+      delete qobj.product_name;
+    }
+    // service_address
+    if (qobj.service_address && qobj.service_address != 'undefined') {
+      obj.service_address = qobj.service_address;
+      delete qobj.service_address;
+    }
+    // delivery_status
+    if (qobj.delivery_status && qobj.delivery_status != 'undefined') {
+      obj.delivery_status = qobj.delivery_status;
+      delete qobj.delivery_status;
+    }
+    // selling_price
+    if (qobj.selling_price && qobj.selling_price != 'undefined') {
+      obj.selling_price = qobj.selling_price;
+      delete qobj.selling_price;
+    }
+    // cost_price
+    if (qobj.cost_price && qobj.cost_price != 'undefined') {
+      obj.cost_price = qobj.cost_price;
+      delete qobj.cost_price;
+    }
+    // close_reason
+    if (qobj.close_reason && qobj.close_reason != 'undefined') {
+      obj.close_reason = qobj.close_reason;
+      delete qobj.close_reason;
+    }
+    // facilitator_id
+    if (qobj.facilitator_id && qobj.facilitator_id != 'undefined') {
+      obj.facilitator_id = qobj.facilitator_id;
+      delete qobj.facilitator_id;
+    }
+    // facilitator_name
+    if (qobj.facilitator_name && qobj.facilitator_name != 'undefined') {
+      obj.facilitator_name = qobj.facilitator_name;
+      delete qobj.facilitator_name;
+    }
+    // salesman_opcode
+    if (qobj.salesman_opcode && qobj.salesman_opcode != 'undefined') {
+      obj.salesman_opcode = qobj.salesman_opcode;
+      delete qobj.salesman_opcode;
+    }
+    // salesman_id
+    if (qobj.salesman_id && qobj.salesman_id != 'undefined') {
+      obj.salesman_id = qobj.salesman_id;
+      delete qobj.salesman_id;
+    }
+    // salesman_name
+    if (qobj.salesman_name && qobj.salesman_name != 'undefined') {
+      obj.salesman_name = qobj.salesman_name;
+      delete qobj.salesman_name;
+    }
+    // salesman_phone
+    if (qobj.salesman_phone && qobj.salesman_phone != 'undefined') {
+      obj.salesman_phone = qobj.salesman_phone;
+      delete qobj.salesman_phone;
+    }
+    // source_name
+    if (qobj.source_name && qobj.source_name != 'undefined') {
+      obj.source_name = qobj.source_name;
+      delete qobj.source_name;
+    }
+    // master_source_number
+    if (qobj.master_source_number && qobj.master_source_number != 'undefined') {
+      obj.master_source_number = qobj.master_source_number;
+      delete qobj.master_source_number;
+    }
+    // settle_status
+    if (qobj.settle_status && qobj.settle_status != 'undefined') {
+      obj.settle_status = qobj.settle_status;
+      delete qobj.settle_status;
+    }
+    // settlebill_id
+    if (qobj.settlebill_id && qobj.settlebill_id != 'undefined') {
+      obj.settlebill_id = qobj.settlebill_id;
+      delete qobj.settlebill_id;
+    }
+    // delivery_man_id
+    if (qobj.delivery_man_id && qobj.delivery_man_id != 'undefined') {
+      obj.delivery_man_id = qobj.delivery_man_id;
+      delete qobj.delivery_man_id;
+    }
+    // delivery_man_name
+    if (qobj.delivery_man_name && qobj.delivery_man_name != 'undefined') {
+      obj.delivery_man_name = qobj.delivery_man_name;
+      delete qobj.delivery_man_name;
+    }
+    // delivery_man_opcode
+    if (qobj.delivery_man_opcode && qobj.delivery_man_opcode != 'undefined') {
+      obj.delivery_man_opcode = qobj.delivery_man_opcode;
+      delete qobj.delivery_man_opcode;
+    }
+    delete qobj.orderId;
+    obj.delivery_info = JSON.parse((JSON.stringify(bill.delivery_info) + JSON.stringify(qobj)).replace(/}{/, ','));
+    return self.db.transaction(async function (t) {
+      return await self.dao.updateServer(obj, whereobj, t);
+    });
+  }
 }
 module.exports = DeliverybillService;
\ No newline at end of file