wdy

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -224,6 +224,112 @@ class OrderInfoService extends ServiceBase {
     delete pobj.actionBody.deliveryData["nclones"];
     delete pobj.actionBody.deliveryData["nclones"];
     return system.getResultSuccess();
     return system.getResultSuccess();
   }
   }
+
+  async createICPOrder(pobj) {
+
+    var packagingICPResult = await this.packagingICPDeliveryData(pobj, pobj.actionBody);
+    if (packagingICPResult.status != 0) {
+      return packagingICPResult;
+    }
+    var self = this;
+    return await self.db.transaction(async function (t) {
+
+      var sql = "";
+      var orderNo = "";
+      if (pobj.actionBody.orderNo) {
+        orderNo = pobj.actionBody.orderNo;
+        sql = "update c_order_delivery set  deliveryContent='" + JSON.stringify(pobj.actionBody.deliveryData) + "' where sourceOrderNo='" +
+          orderNo + "'";
+      } else {
+        var orderNo = await self.getBusUid("icp" + pobj.appInfo.uapp_id);
+        var item = await self.createOrder(pobj, orderNo, t);
+        sql = "INSERT INTO  `c_order_delivery` (`sourceOrderNo`,`deliveryContent`) VALUE('" +
+          orderNo + "','" + JSON.stringify(pobj.actionBody.deliveryData) + "')";
+      }
+      self.customQuery(sql);
+
+      return system.getResultSuccess({
+        orderNo: orderNo,
+        channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || orderNo,
+        channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo || orderNo,
+        channelParams: pobj.actionBody.channelOrder.channelParams || ""
+      });
+    });
+  }
+
+  async packagingICPDeliveryData(pobj, actionBody) {//重新组装商标交付信息
+    if (actionBody.pageNum) {
+      return "表单参数错误";
+    }
+    if (Number(actionBody.totalSum) < 300) {
+      return "总价有误，总价不能小于300，20140";
+    }
+    var deliveryData = actionBody.deliveryData;
+    if (!deliveryData.nclones) {
+      return "商品/服务项不能为空，20150";
+    }
+    if (!deliveryData.tm) {
+      return "商标信息不能为空，20180";
+    }
+    if (!deliveryData.tm.tmName) {
+      return "商标名称不能为空，20180";
+    }
+    if (!deliveryData.tm.picUrl) {
+      return "商标图样不能为空，20210";
+    }
+    if (!deliveryData.apply) {
+      return "申请信息不能为空，20230";
+    }
+    if (!deliveryData.apply.code) {
+      return "申请统一社会信用代码不能为空，20250";
+    }
+    if (!deliveryData.apply.zipCode) {
+      return "申请邮编不能为空，20280";
+    }
+    if (!deliveryData.apply.customerType) {
+      return "申请人类型不能为空，20310";
+    }
+    if (deliveryData.apply.customerType != "ent" && deliveryData.apply.customerType == "person") {
+      return "申请人类型错误，20330";
+    }
+    var deliveryStatus = "dsccl";
+    var deliveryStatusName = "待上传材料";
+    if (deliveryData.apply.customerType == "ent") {
+      if (deliveryData.apply.businessLicensePdf && deliveryData.apply.gzwtsUrl) {
+        deliveryStatus = "dsh";
+        deliveryStatusName = "待审核";
+      }
+    } else {
+      if (deliveryData.apply.businessLicensePdf && deliveryData.apply.gzwtsUrl && deliveryData.apply.identityCardPdf) {
+        deliveryStatus = "dsh";
+        deliveryStatusName = "待审核";
+      }
+    }
+    var price_item = actionBody.product_info.price_item;
+    var self = this;
+    var nclList = [];
+    for (let index = 0; index < deliveryData.nclones.length; index++) {
+      var nclones = deliveryData.nclones[index];
+      var nclThree = nclones.nclThree;
+      var tempNclones = {
+        ncloneCode: nclones.code,
+        ncloneName: nclones.name,
+        nclThree: nclThree,
+        nclCount: nclThree.length,
+        nclPublicExpense: Number(price_item.price) * nclThree.length,
+        deliveryStatus: deliveryStatus,//商标交付状态
+        deliveryStatusName: deliveryStatusName,
+        submitTime: "",
+        deliveryType: pobj.appInfo.delivery_type,//应用数据操作类型：00独立，10全委托
+        tbCode: await self.getBusUid("tb" + pobj.appInfo.uapp_id)//提报号(自动生成)
+      }
+      nclList.push(tempNclones);
+    }
+    pobj.actionBody.deliveryData.nclList = nclList;
+    delete pobj.actionBody.deliveryData["nclones"];
+    return system.getResultSuccess();
+  }
+
   /**
   /**
    * 创建其他订单
    * 创建其他订单
    * @param {*} pobj  
    * @param {*} pobj  

center-order/app/base/service/impl/dbneed/needinfoSve.js

@@ -22,7 +22,7 @@ class NeedinfoService extends ServiceBase {
     };
     };
 
 
     var rc = system.getObject("util.aliyunClient");
     var rc = system.getObject("util.aliyunClient");
-    var rtn = await rc.post("https://yunfuapi-dev.gongsibao.com/crm/opportunity/submit", pobj);
+    var rtn = await rc.post("https://yunfuapi.gongsibao.com/crm/opportunity/submit", pobj);
     console.log(rtn)
     console.log(rtn)
     return system.getResultSuccess();
     return system.getResultSuccess();
     // var opResultstr = await this.execlient.execPost(pobj, "https://yunfuapi-dev.gongsibao.com/crm/opportunity/submit");
     // var opResultstr = await this.execlient.execPost(pobj, "https://yunfuapi-dev.gongsibao.com/crm/opportunity/submit");