pushOrder

igirl-web/app/base/service/impl/orderSve.js

@@ -2489,15 +2489,20 @@ class OrderService extends ServiceBase {
   //---------------------------------icp业务----end-----------------------------------------------------------------------
   //---------------------------------icp业务----end-----------------------------------------------------------------------
   //订单信息推送任务======================================================================================
   //订单信息推送任务======================================================================================
   async pushOrderInfo2Fq(pobj){
   async pushOrderInfo2Fq(pobj){
-    var limit = 5;
+    var limit = 50;
     if(pobj && pobj.limit){
     if(pobj && pobj.limit){
       limit = pobj.limit;
       limit = pobj.limit;
+      if(limit>50){
+        limit=50;
+      }
     }
     }
     var sql = "select ci.name as applyName,ci.applyAddr,rv.id as rv_id,rv.payOrderNo,rv.receiptType,"+
     var sql = "select ci.name as applyName,ci.applyAddr,rv.id as rv_id,rv.payOrderNo,rv.receiptType,"+
     "o.id,o.orderPayStatus,o.code,o.mobile,o.totalSum,o.salesNum,o.sveItemCode,"+
     "o.id,o.orderPayStatus,o.code,o.mobile,o.totalSum,o.salesNum,o.sveItemCode,"+
     "rv.certifyFileUrl,rv.payDate,rv.accountType as payType,u.nickName as createUserName,u.mobile as createUserMobile,"+
     "rv.certifyFileUrl,rv.payDate,rv.accountType as payType,u.nickName as createUserName,u.mobile as createUserMobile,"+
     "u.userName as createUserId from (SELECT * FROM `biz_order` where (orderPayStatus='yfk') "+
     "u.userName as createUserId from (SELECT * FROM `biz_order` where (orderPayStatus='yfk') "+
-    " and pushStatus=0 ) as o "+
+    " and pushStatus=0 and (sveItemCode = 'zzsbzc' or sveItemCode = 'dlrfzzc' or sveItemCode = 'dbsbzc' or sveItemCode = 'rjzzqdj' or "+
+    "sveItemCode = 'sbbhfs' or sveItemCode = 'sbzr' or sveItemCode = 'sbbg' or sveItemCode = 'sbyydb' or sveItemCode = 'sbxz' "+
+    " or sveItemCode = 'sbcssq' )  ) as o "+
     "LEFT JOIN biz_customerinfo as ci on o.customerinfo_id=ci.id  "+
     "LEFT JOIN biz_customerinfo as ci on o.customerinfo_id=ci.id  "+
     "LEFT JOIN p_user AS u ON o.createuser_id = u.id  "+
     "LEFT JOIN p_user AS u ON o.createuser_id = u.id  "+
     "LEFT JOIN biz_receiptvoucher as rv on rv.sourceOrderNo = o.code where 1=1 "+
     "LEFT JOIN biz_receiptvoucher as rv on rv.sourceOrderNo = o.code where 1=1 "+
@@ -2514,6 +2519,8 @@ class OrderService extends ServiceBase {
       }
       }
       if(pushRes && pushRes.code && pushRes.code==200){
       if(pushRes && pushRes.code && pushRes.code==200){
         await this.dao.update({id:orderInfo.id,pushStatus:"1"});
         await this.dao.update({id:orderInfo.id,pushStatus:"1"});
+      }else{
+        await this.dao.update({id:orderInfo.id,pushStatus:"2"});
       }
       }
     }
     }
     return {code:200,data:pushResList};
     return {code:200,data:pushResList};
@@ -2540,6 +2547,12 @@ class OrderService extends ServiceBase {
       "sbcssq":"5ec3996d34b232000924d6c7",//商标撤三
       "sbcssq":"5ec3996d34b232000924d6c7",//商标撤三
     };//产品码对照
     };//产品码对照
     if(!order || !order.sveItemCode || !itemCodeContrast[order.sveItemCode]){
     if(!order || !order.sveItemCode || !itemCodeContrast[order.sveItemCode]){
+      logCtl.info({
+        optitle: "知圈圈订单信息推送-----------产品错误",
+        op: "app/base/service/impl/orderSve.js/pushFqBusiness",
+        content: "订单号：" + order.id + "，产品码：" + order.sveItemCode,
+        clientIp:""
+      });
       return { code: -100, message: "产品错误"};
       return { code: -100, message: "产品错误"};
     }
     }
     var rc = system.getObject("util.aliyunClient");
     var rc = system.getObject("util.aliyunClient");
@@ -2576,15 +2589,15 @@ class OrderService extends ServiceBase {
         body["pay_vouchers"] = [{"url":order.certifyFileUrl,"name":"支付凭证"}];//凭证url
         body["pay_vouchers"] = [{"url":order.certifyFileUrl,"name":"支付凭证"}];//凭证url
       }
       }
       rtn = await rc.post(reqUrl, body);
       rtn = await rc.post(reqUrl, body);
-      if (rtn.code != 200 && rtn.success != true) {
-        return { code: -1, message: "推送失败，失败原因：" + rtn.errorMsg + "，selfrequestId=" + req.requestId + "，requestId=" + rtn.requestId};
-      }
       logCtl.info({
       logCtl.info({
         optitle: "知圈圈订单信息推送-----------蜂擎",
         optitle: "知圈圈订单信息推送-----------蜂擎",
         op: "app/base/service/impl/orderSve.js/pushFqBusiness",
         op: "app/base/service/impl/orderSve.js/pushFqBusiness",
         content: "参数：" + JSON.stringify(body) + "，返回结果：" + JSON.stringify(rtn),
         content: "参数：" + JSON.stringify(body) + "，返回结果：" + JSON.stringify(rtn),
         clientIp:""
         clientIp:""
       });
       });
+      if (rtn.code != 200 && rtn.success != true) {
+        return { code: -1, message: "推送失败，失败原因：" + rtn.errorMsg + "，requestId=" + rtn.requestId};
+      }
       return rtn;
       return rtn;
     } catch (e) {
     } catch (e) {
       logCtl.error({
       logCtl.error({