aaa

igirl-channel/app/base/db/impl/dborder/orderflowDao.js

@@ -10,6 +10,7 @@ class OrderFlowDao extends Dao {
         sourceOrderNo: sourceOrderNo,
         isShow: 1
       },
+      order:[["created_at", 'desc']],
       raw: true
     });
   }

igirl-channel/app/base/service/impl/dborder/orderSve.js

@@ -501,7 +501,7 @@ class OrderService extends ServiceBase {
         userId: item.channelUserId,// 否 用户 ID
         companyName: "",// 否 公司名称
         orderPrice: item.totalSum,// 是 订单金额
-        productId: "5dc936eb296d1572b9bc5b8d",// 是 产品 ID
+        productId: "5dd513db4f3b08000a6fc082",// 是 产品 ID
         productQuantity: item.salesNum,// 是 产品数量
       };
       rtn = await rc.post(reqUrl, body);

igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js

@@ -34,6 +34,24 @@ class OrderTmProductService extends ServiceBase {
     if (!nclones || nclones.length < 1) {
       return system.getResult(null, "尼斯大类不能为空");
     }
+    if (nclones.length > 1) {
+      return system.getResult(null, "尼斯大类不能大于1个大类");
+    }
+    //判断尼斯小项的数量
+    var selectNclThreeCount = 0;
+    for (let index = 0; index < nclones.length; index++) {
+      const element = nclones[index];
+      var nclList = null;
+      if (typeof (element) == "string") {
+        nclList = JSON.parse(element);
+      } else {
+        nclList = element;
+      }
+      selectNclThreeCount = selectNclThreeCount + nclList.nclThree.length;
+    }
+    if (selectNclThreeCount > 10) {
+      return system.getResult(null, "尼斯小项数量不能大于10个小项数量，目前选择的小项数量为" + selectNclThreeCount);
+    }
     if (!itemCode) {
       return system.getResult(null, "itemCode参数错误");
     }
@@ -103,7 +121,7 @@ class OrderTmProductService extends ServiceBase {
           flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款";
         } else {
           orderProductObj["deliveryStatus"] = "dsh";
-          flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
+          flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待专家服务" : "订单已创建待付款";
         }
       }
       if (apply.customerType == "ent") {
@@ -112,7 +130,7 @@ class OrderTmProductService extends ServiceBase {
           flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款";
         } else {
           orderProductObj["deliveryStatus"] = "dsh";
-          flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
+          flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待专家服务" : "订单已创建待付款";
         }
       }
       //订单客户档案添加和修改
@@ -236,7 +254,7 @@ class OrderTmProductService extends ServiceBase {
           flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款";
         } else {
           orderProductObj["deliveryStatus"] = "dsh";
-          flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
+          flowContent = channelOrder.payStatus == "yfk" ? "订单已付款" : "订单已创建待付款";
         }
       }
       if (apply.customerType == "ent") {
@@ -245,7 +263,7 @@ class OrderTmProductService extends ServiceBase {
           flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款";
         } else {
           orderProductObj["deliveryStatus"] = "dsh";
-          flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
+          flowContent = channelOrder.payStatus == "yfk" ? "订单已付款" : "订单已创建待付款";
         }
       }
       //订单客户档案添加和修改
@@ -830,7 +848,7 @@ class OrderTmProductService extends ServiceBase {
         nclCount: tm.nclCount,
       };
       var flowContent = "";
-      flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
+      flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待专家服务" : "订单已创建待付款";
       // if (apply.customerType == "person") {
       //   if (!apply.businessLicensePic || !apply.identityCardPic || !tm.gzwtsUrl) {
       //     orderProductObj["deliveryStatus"] = "dsccl";

igirl-channel/app/base/utils/aliyunClient.js

 const Client = require('aliyun-api-gateway').Client;
-// const client = new Client('203727307', 'b6za34qem6k9a3s3jguvh24nc3ridlnh');
-const client = new Client('203756805', 'crkyej0xlmqa6bmvqijun6ltxparllyn');
+
+// const client = new Client('203756805', 'crkyej0xlmqa6bmvqijun6ltxparllyn');
+const client = new Client('203763771', 'e5e2ytnn6nrkr9qnqk4w5e6z0xlhkznu');
 class aliyunClient {
   constructor() {
     // this.aliReqUrl = "https://aliapi.gongsibao.com/tm/springboard";