aaa

center-order/app/base/db/models/dbcorder/orderinfo.js

@@ -6,7 +6,8 @@ module.exports = (db, DataTypes) => {
     uapp_id             :DataTypes.INTEGER,//     
     // solutionId          :DataTypes.STRING(128),//  方案ID 
     orderNo             :DataTypes.STRING(128),//  订单号         
-    channelServiceNo    :DataTypes.STRING(128),//  渠道服务单号                                                                                                                                                                                 
+    channelServiceNo    :DataTypes.STRING(128),//  渠道服务单号     
+    serviceOrderNo      :DataTypes.STRING(128),//  服务单号                                                                                                                                                                               
     channelOrderNo      :DataTypes.STRING(128),//  渠道订单号（页面中列表中显示该单号）
     channelNeedNo       :DataTypes.STRING(128), //渠道需求号（页面中列表中显示该需求号）
     needNo              :DataTypes.STRING(128), //需求号--用于服务商或需求表中创建订单

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -2449,7 +2449,7 @@ class OrderInfoService extends ServiceBase {
         if(!res || res.status!=0){
             return res;
         }
-        var orderNo = await self.getBusUid("tm" + appInfo.uapp_id);
+        var orderNo = await this.getBusUid("tm" + pobj.appInfo.uapp_id);
         var ab = pobj.actionBody;
         ab.orderNo = orderNo;
         var o = await this.dao.create(ab);
@@ -2483,7 +2483,7 @@ class OrderInfoService extends ServiceBase {
             return system.getResult(null, "阿里需求号不能为空，100110");
         }
         var orderInfo = await this.dao.model.findOne({
-            where:{channelOrderNo:pobj.actionBody.channelOrderNo，uapp_id:pobj.appInfo.uapp_id},raw:true
+            where:{channelOrderNo:pobj.actionBody.channelOrderNo,uapp_id:pobj.appInfo.uapp_id},raw:true
         });
         if(orderInfo && orderInfo.id){
             return system.getResult(null, "阿里订单号："+pobj.actionBody.channelOrderNo+"的订单已存在，100140");
@@ -2521,7 +2521,7 @@ class OrderInfoService extends ServiceBase {
         }
         var orderInfo = await this.dao.model.findOne({
             attributes:["id","channelOrderNo","payTotalSum"],
-            where:{channelOrderNo:pobj.actionBody.channelOrderNo，uapp_id:pobj.appInfo.uapp_id},raw:true
+            where:{channelOrderNo:pobj.actionBody.channelOrderNo,uapp_id:pobj.appInfo.uapp_id},raw:true
         });
         if(!orderInfo || !orderInfo.id){
             return system.getResult(null, "阿里订单号："+pobj.actionBody.channelOrderNo+"的订单不存在，100140");