tj

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

@@ -148,6 +148,9 @@ class OrderTmProductService extends ServiceBase {
         sourceOrderNo: orderTm.sourceOrderNo,
         sourceOrderNo: orderTm.sourceOrderNo,
         opContent: flowContent
         opContent: flowContent
       };
       };
+      if (channelOrder.payStatus == "yfk") {
+        flowObj.isShow = 1;
+      }
       await self.orderflowDao.create(flowObj, t);//创建订单流程
       await self.orderflowDao.create(flowObj, t);//创建订单流程
       flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo;
       flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo;
       await self.orderflowDao.create(flowObj, t);//创建交付流程     
       await self.orderflowDao.create(flowObj, t);//创建交付流程     
@@ -271,6 +274,9 @@ class OrderTmProductService extends ServiceBase {
       };
       };
       await self.orderflowDao.create(flowObj, t);//创建订单流程
       await self.orderflowDao.create(flowObj, t);//创建订单流程
       flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo;
       flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo;
+      if (channelOrder.payStatus == "yfk") {
+        flowObj.isShow = 1;
+      }
       await self.orderflowDao.create(flowObj, t);//创建交付流程      
       await self.orderflowDao.create(flowObj, t);//创建交付流程      
       orderTm.needNo = channelOrder.needNo || null;//需求单号
       orderTm.needNo = channelOrder.needNo || null;//需求单号
       var returnTm = await self.opTmInfo(user, tm, apply, nclones, orderTm, JSON.stringify(productItem), t);
       var returnTm = await self.opTmInfo(user, tm, apply, nclones, orderTm, JSON.stringify(productItem), t);
@@ -877,7 +883,7 @@ class OrderTmProductService extends ServiceBase {
         nclCount: tm.nclCount,
         nclCount: tm.nclCount,
       };
       };
       var flowContent = "";
       var flowContent = "";
-      flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待专家服务" : "订单已创建待付款";
+      flowContent = "专家服务已提供服务，方案待确认";
       // if (apply.customerType == "person") {
       // if (apply.customerType == "person") {
       //   if (!apply.businessLicensePic || !apply.identityCardPic || !tm.gzwtsUrl) {
       //   if (!apply.businessLicensePic || !apply.identityCardPic || !tm.gzwtsUrl) {
       //     orderProductObj["deliveryStatus"] = "dsccl";
       //     orderProductObj["deliveryStatus"] = "dsccl";
@@ -926,7 +932,8 @@ class OrderTmProductService extends ServiceBase {
         app_id: user.app_id,
         app_id: user.app_id,
         createuser_id: user.id,
         createuser_id: user.id,
         sourceOrderNo: ordercode,
         sourceOrderNo: ordercode,
-        opContent: flowContent
+        opContent: flowContent,
+        isShow: 1
       };
       };
       await self.orderflowDao.create(flowObj, t);//创建订单流程
       await self.orderflowDao.create(flowObj, t);//创建订单流程
       flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo;
       flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo;
@@ -1160,16 +1167,16 @@ class OrderTmProductService extends ServiceBase {
         otpObj["deliveryStatus"] = "fabtg";
         otpObj["deliveryStatus"] = "fabtg";
         otpObj["notes"] = obj.notes;
         otpObj["notes"] = obj.notes;
         tmObj.officialType = "fabtg";
         tmObj.officialType = "fabtg";
-        logMsg["opContent"]="商标方案不通过";
+        logMsg["opContent"] = "商标方案不通过";
       }
       }
       if (isConfirm == "1") {
       if (isConfirm == "1") {
         otpObj["deliveryStatus"] = "dsh";
         otpObj["deliveryStatus"] = "dsh";
         otpObj["notes"] = obj.notes || "";
         otpObj["notes"] = obj.notes || "";
-        logMsg["opContent"]="商标方案确认通过";
+        logMsg["opContent"] = "商标方案确认通过";
       }
       }
       await self.trademarkDao.updateByWhere(tmObj, { where: { deliveryOrderNo: deliveryOrderNo } }, t);
       await self.trademarkDao.updateByWhere(tmObj, { where: { deliveryOrderNo: deliveryOrderNo } }, t);
       await self.dao.update(otpObj, t);
       await self.dao.update(otpObj, t);
-      
+
       await self.orderflowDao.create(logMsg, t);
       await self.orderflowDao.create(logMsg, t);
       return system.getResultSuccess();
       return system.getResultSuccess();
     })
     })