jdtm2qft

center-order/app/base/api/impl/action/order.js

@@ -118,6 +118,9 @@ class OrderAPI extends APIBase {
             case "receiveAliTmOrder"://接收阿里商标订单
             case "receiveAliTmOrder"://接收阿里商标订单
                 opResult = await this.orderinfoSve.receiveAliTmOrder(pobj);
                 opResult = await this.orderinfoSve.receiveAliTmOrder(pobj);
                 break;
                 break;
+            case "receiveFqbossTmOrder"://接收fqboss商标订单
+                opResult = await this.orderinfoSve.receiveFqbossTmOrder(pobj);
+                break;
             case "receiveAliTmStatus"://接收阿里商标状态
             case "receiveAliTmStatus"://接收阿里商标状态
                 opResult = await this.orderinfoSve.receiveAliTmStatus(pobj);
                 opResult = await this.orderinfoSve.receiveAliTmStatus(pobj);
                 break;
                 break;

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

@@ -2543,6 +2543,15 @@ class OrderInfoService extends ServiceBase {
      * @param {*} pobj
      * @param {*} pobj
      */
      */
     async receiveAliTmOrder(pobj) {
     async receiveAliTmOrder(pobj) {
+        var res = await this.receiveFqbossTmOrder(pobj);
+        return res;
+    }
+
+    /**
+     * 接收fqboss商标订单信息
+     * @param {*} pobj
+     */
+    async receiveFqbossTmOrder(pobj) {
         var res = await this.checkAndPackageAliTmOrderParams(pobj);
         var res = await this.checkAndPackageAliTmOrderParams(pobj);
         if (!res || res.status != 0) {
         if (!res || res.status != 0) {
             return res;
             return res;
@@ -2606,16 +2615,16 @@ class OrderInfoService extends ServiceBase {
             return system.getResult(null, "未知用户信息，100500");
             return system.getResult(null, "未知用户信息，100500");
         }
         }
         if (!pobj.actionBody.channelOrderNo) {
         if (!pobj.actionBody.channelOrderNo) {
-            return system.getResult(null, "阿里订单号不能为空，100110");
+            return system.getResult(null, "渠道方订单号不能为空，100110");
         }
         }
-        if (!pobj.actionBody.serviceOrderNo) {
+        if (!pobj.actionBody.serviceOrderNo && pobj.appInfo.uapp_id!=31 ) {
             return system.getResult(null, "蜂擎订单号不能为空，100120");
             return system.getResult(null, "蜂擎订单号不能为空，100120");
         }
         }
         if (!pobj.actionBody.serviceNo) {
         if (!pobj.actionBody.serviceNo) {
             return system.getResult(null, "服务单号不能为空，100130");
             return system.getResult(null, "服务单号不能为空，100130");
         }
         }
-        if (!pobj.actionBody.needNo) {
-            return system.getResult(null, "阿里需求号不能为空，100110");
+        if (!pobj.actionBody.needNo && pobj.appInfo.uapp_id!=31) {
+            return system.getResult(null, "渠道方需求号不能为空，100110");
         }
         }
         if (!pobj.actionBody.created_at) {
         if (!pobj.actionBody.created_at) {
             return system.getResult(null, "商标创建时间不能为空，100190");
             return system.getResult(null, "商标创建时间不能为空，100190");