tj

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

@@ -230,7 +230,7 @@ class OrderTmProductService extends ServiceBase {
         tmType: "p",//"p": "普通商标", "j": "集体商标", "z": "证明商标", "t": "特殊商标"
         tmFormType: tm.tmFormType,//商标类型形式："1": "立体", "3": "字", "4": "图", "5": "字图", "6": "颜色", "7": "彩色" 
         nclOneCodes: tm.nclOneCodes ? tm.nclOneCodes.join(",") : null,//尼斯大类列表：格式以,隔开                                                                                                                        
-        orderServicePayStatus: channelOrder.payStatus,//支付状态:dfk: 待付款, yfk: 已支付                                                                                  
+        payStatus: channelOrder.payStatus,//支付状态:dfk: 待付款, yfk: 已支付                                                                                  
         deliveryStatus: "dsccl",//商标交付状态：dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ywc: 已完成  
         appDataOpType: app.appDataOpType,// 应用数据操作类型：00独立，10全委托，20部分委托     
         sourceOrderNo: ordercode,//来源单号   
@@ -369,7 +369,7 @@ class OrderTmProductService extends ServiceBase {
         productOneType_id: productItem.productOneType_id,//产品大类Id      
         itemCode: productItem.itemCode,//                                                                                                                                                                                                 
         itemName: productItem.itemName,//                                                                                                                           
-        orderServicePayStatus: "dfk",//支付状态:dfk: 待付款, yfk: 已支付                                                                                  
+        payStatus: "dfk",//支付状态:dfk: 待付款, yfk: 已支付                                                                                  
         deliveryStatus: "dsccl",//商标交付状态：dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ywc: 已完成  
         appDataOpType: app.appDataOpType,// 应用数据操作类型：00独立，10全委托，20部分委托     
         sourceOrderNo: ordercode,//来源单号   
@@ -646,7 +646,7 @@ class OrderTmProductService extends ServiceBase {
     if (pageSize > 50) {
       pageSize = 50;
     }
-    var sql = "SELECT tm.`needNo`,tm.`channelServiceNo`,tm.`deliveryOrderNo`,tm.`tmName`,tm.`nclOneCount`,tm.`nclOneCodes`,tm.itemCode,tm.itemName," +
+    var sql = "SELECT tm.`needNo`,tm.`channelServiceNo`,tm.`sourceOrderNo`,tm.`deliveryOrderNo`,tm.`tmName`,tm.`nclOneCount`,tm.`nclOneCodes`,tm.itemCode,tm.itemName," +
       " o.`totalSum`,c.`name`,tm.`deliveryStatus`,tm.`deliveryStatusName`,tm.payStatus,tm.payStatusName,o.payTime AS CreateDate,tm.submitTime," +
       " c.`customerType`,c.`businessLicensePic`,c.`identityCardPic`,tm.`gzwtsUrl`,tm.`smwjUrl`" +
       " FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +
@@ -959,7 +959,7 @@ class OrderTmProductService extends ServiceBase {
         tmType: "p",//"p": "普通商标", "j": "集体商标", "z": "证明商标", "t": "特殊商标"
         tmFormType: tm.tmFormType,//商标类型形式："1": "立体", "3": "字", "4": "图", "5": "字图", "6": "颜色", "7": "彩色" 
         nclOneCodes: tm.nclOneCodes ? tm.nclOneCodes.join(",") : null,//尼斯大类列表：格式以,隔开                                                                                                                        
-        orderServicePayStatus: channelOrder.payStatus,//支付状态:dfk: 待付款, yfk: 已支付                                                                                  
+        payStatus: channelOrder.payStatus,//支付状态:dfk: 待付款, yfk: 已支付                                                                                  
         deliveryStatus: "dqrfa",//商标交付状态：dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ywc: 已完成  
         appDataOpType: app.appDataOpType,// 应用数据操作类型：00独立，10全委托，20部分委托     
         sourceOrderNo: ordercode,//来源单号   

igirl-channel/app/front/entry/public/apidoc/opTrademark/opTm.md

@@ -594,6 +594,7 @@
         "data": [
             {
                 "channelServiceNo": "z1203155540315474420",
+                "sourceOrderNo": "tm1203155540315474777",//订单号
                 "deliveryOrderNo": "JF201910301606zlBced",
                 "tmName": "testbiao",
                 "nclOneCount": 1,