Merge branch 'igirl-channel' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel

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

@@ -603,7 +603,7 @@ class OrderTmProductService extends ServiceBase {
     var nclones = params.nclones || null;
     var nclones = params.nclones || null;
     var channelOrder = params.channelOrder || null;
     var channelOrder = params.channelOrder || null;
     var orderType = params.orderType || "dkxd";//订单类型，zzdd: 自主订单,dkxd: 代客下单
     var orderType = params.orderType || "dkxd";//订单类型，zzdd: 自主订单,dkxd: 代客下单
-    var needNo = "ztest512021303d1";//channelOrder.needNo;
+    var needNo = channelOrder.needNo;
     if (!needNo) {
     if (!needNo) {
       return system.getResult(null, "需求编号不能为空");
       return system.getResult(null, "需求编号不能为空");
     }
     }
@@ -614,25 +614,25 @@ class OrderTmProductService extends ServiceBase {
     if(!order || !order.id){
     if(!order || !order.id){
       return system.getResult(null, "未知订单");
       return system.getResult(null, "未知订单");
     }
     }
-    //获取渠道用户数据
-    var channelUser = await this.userDao.model.findOne({
-      where:{channelUserId:order.channelUserId,app_id:order.app_id},
-      raw:true,
-      attributes:["id","app_id","channelUserId","channelUserName","userMoblie","nickname"]
-    });
+    // //获取渠道用户数据
+    // var channelUser = await this.userDao.model.findOne({
+    //   where:{channelUserId:order.channelUserId,app_id:order.app_id},
+    //   raw:true,
+    //   attributes:["id","app_id","channelUserId","channelUserName","userMoblie","nickname"]
+    // });
     channelOrder["channelServiceNo"]=order.channelServiceNo;
     channelOrder["channelServiceNo"]=order.channelServiceNo;
     channelOrder["payTime"]=order.payTime;
     channelOrder["payTime"]=order.payTime;
-    if(channelUser && channelUser.userMobile){
-      channelUser["channelUserMobile"]=channelUser.userMobile;
-    }
+    // if(channelUser && channelUser.userMobile){
+    //   channelUser["channelUserMobile"]=channelUser.userMobile;
+    // }
     if (!nclones || nclones.length < 1) {
     if (!nclones || nclones.length < 1) {
       return system.getResult(null, "尼斯大类不能为空");
       return system.getResult(null, "尼斯大类不能为空");
     }
     }
     if (!itemCode) {
     if (!itemCode) {
       return system.getResult(null, "itemCode参数错误");
       return system.getResult(null, "itemCode参数错误");
     }
     }
-    itemCode="zzsbzc";//测试
-    var productItem = await this.appproductDao.findOneByCode(itemCode, 1);//获取产品
+    // itemCode="zzsbzc";//测试
+    var productItem = await this.appproductDao.findOneByCode(itemCode,user.app_id);//获取产品
     if (!productItem) {
     if (!productItem) {
       return system.getResult(null, "未知的产品");
       return system.getResult(null, "未知的产品");
     }
     }