修改提示判断

center-channel/app/base/service/app.base.js

@@ -195,11 +195,11 @@ class AppServiceBase {
     async disposePushResultFail(pobj, result, opTitleDesc, failType) {//处理失败的结果信息--内部使用
         var opType = pobj.opType || "";
         let pushNumber = pobj.pushNumber || 1;
-        if (pushNumber == 10) {
+        if (pushNumber >= 9) {
             pobj.actionBody.pushNumber = pushNumber;
             pobj.actionBody.pushStatus = 2;//推送状态0待推送2推送失败3已成功推送
             this.disposeOrderPush(pobj);
-            if (result.errorMsg && result.errorMsg == "订单产品查询出来产品与传递得产品数量不一致") {
+            if (result.errorMsg && result.errorMsg == "请与服务产品确认该产品是否上架") {
                 this.disposeOrderPushFailSendDing(pobj);
             }
         }

center-channel/app/base/service/impl/utilsSve/utilsFqAliyunSve.js

@@ -122,8 +122,8 @@ class UtilsFqAliyunService extends AppServiceBase {
                 return system.getResultSuccess(rtn.data, "推送成功");
             } else {
                 let errorMsg = "";
-                if (rtn.errorMessage && rtn.errorMessage.indexOf("订单产品查询出来产品与传递得产品数量不一致") >= 0) {
-                    errorMsg = "订单产品查询出来产品与传递得产品数量不一致";
+                if (rtn.errorMessage && rtn.errorMessage.indexOf("请与服务产品确认该产品是否上架") >= 0) {
+                    errorMsg = "请与服务产品确认该产品是否上架";
                 }
                 return system.getResultNewFail(-1, `推送失败，失败原因11：${JSON.stringify(rtn)}`, null, errorMsg);
             }
@@ -188,29 +188,34 @@ class UtilsFqAliyunService extends AppServiceBase {
     // async tttt(){
     //     let rtn={
     //         "requestId":null,
-    //         "code":"200",
-    //         "data":{
-    //             "_id":"261931196584429568",
-    //             "operator":"null",
-    //             "operator_name":null,
-    //             "customer":"261918243919368192"
-    //         },
-    //         "success":true,
-    //         "errorCode":"OK",
-    //         "errorMessage":"操作成功",
-    //         "timestamp":"2021-03-30T16:45:15.730+0800"
+    //         "code":"500",
+    //         "data":null,
+    //         "success":false,
+    //         "errorCode":"PARAMETER.ILLEGAL",
+    //         "errorMessage":"创建订单信息失败，下单失败，参数：{\"channelOrderNo\":[\"209314121310072\"],\"itemCreateRequest\":[{\"buyPrice\":2500,\"contactsId\":349905785792376832,\"createdBy\":124496450905186304,\"createdByName\":\"系统用户\",\"quantity\":1,\"serviceTypeChannelId\":0,\"serviceTypeChannelName\":\"阿里云商机\",\"serviceTypeId\":2,\"skuId\":232882795415017472}],\"orderInfoCreateRequest\":{\"businessCompanyCode\":\"C0000647942\",\"businessCompanyId\":349905787570761728,\"businessCompanyName\":\"广州市万合软件有限公司\",\"channelState\":3,\"contactsCode\":\"C0000647941\",\"contactsId\":349905785792376832,\"contactsMobile\":\"13829927400\",\"contactsName\":\"个人\",\"createdBy\":124496450905186304,\"createdByName\":\"系统用户\",\"customerCode\":\"C0000647942\",\"customerId\":349905787570761728,\"customerName\":\"广州市万合软件有限公司\",\"dealDescription\":\"公司经营范围：应用软件服务、基础软件服务；互联网信息服务；数据处理；计算机系统服务；计算机系统集成；技术开发；技术咨询；技术推广；技术转让；技术服务；\",\"employeeId\":124496450905186304,\"employeeName\":\"系统用户\",\"idempotentNo\":\"209314121310072\",\"payState\":1,\"payType\":1,\"price\":2500,\"scene\":5,\"serviceTypeChannelName\":\"阿里云商机\",\"sourceId\":100000000008068552,\"sourceName\":\"阿里云商机\",\"totalPrice\":2500}}，error：下单产品有误，请与服务产品确认该产品是否上架!",
+    //         "timestamp":"2021-05-30T14:00:11.100+0800"
     //     }
     //     if (rtn.success && rtn.code == 200) {
-    //         console.log(11111)
+    //         return system.getResultSuccess(rtn.data, "推送成功");
     //     } else {
-    //         console.log(22222)
+    //         let errorMsg = "";
+    //         if (rtn.errorMessage && rtn.errorMessage.indexOf("请与服务产品确认该产品是否上架") >= 0) {
+    //             console.log("11111111111111");
+    //             errorMsg = "请与服务产品确认该产品是否上架";
+    //         }
+    //         return system.getResultNewFail(-1, `推送失败，失败原因11：${JSON.stringify(rtn)}`, null, errorMsg);
     //     }
-    //
     // }
+    // async ddd(){
+    //     var pobj={opType:1,pushNumber:9,actionBody:{pushStatus:2}}
+    //     var result=await this.tttt();
+    //     await this.disposePushResult(pobj, result, "fq->pushOrderBusinessByProductCode2Fq->result", this.pushlogFailType.FQ);
+    // }
+
 }
 
 module.exports = UtilsFqAliyunService;
-
-
+//
+//
 // let tmp=new UtilsFqAliyunService();
-// tmp.tttt();
\ No newline at end of file
+// tmp.ddd();
\ No newline at end of file