tj

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

@@ -738,6 +738,7 @@ class OrderTmProductService extends ServiceBase {
     }
     }
     if (item.payStatus == "dfk") {
     if (item.payStatus == "dfk") {
       item.deliveryStatus = item.payStatus;
       item.deliveryStatus = item.payStatus;
+      item.deliveryStatusName = item.payStatusName;
     }
     }
     var resultData = {
     var resultData = {
       tm: {
       tm: {
@@ -752,6 +753,7 @@ class OrderTmProductService extends ServiceBase {
         gzwtsUrl: item.gzwtsUrl,
         gzwtsUrl: item.gzwtsUrl,
         smwjUrl: item.smwjUrl,
         smwjUrl: item.smwjUrl,
         deliveryStatus: item.deliveryStatus,
         deliveryStatus: item.deliveryStatus,
+        deliveryStatusName: item.deliveryStatusName,
         totalSum: item.totalSum,
         totalSum: item.totalSum,
         notes: item.notes
         notes: item.notes
       }, orderFlow: [], receiptVoucher: []
       }, orderFlow: [], receiptVoucher: []

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

@@ -602,9 +602,9 @@
                 "itemName": "商标自主注册",
                 "itemName": "商标自主注册",
                 "totalSum": "270.00",
                 "totalSum": "270.00",
                 "name": "上海辰者信息科技有限公司",
                 "name": "上海辰者信息科技有限公司",
-                "deliveryStatus": "dsccl",
+                "deliveryStatus": "dsccl",//dqrfa: 待确认方案, fabtg: 方案不通过, dfwsfw: 待服务, dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ydj: 已递交, ywc: 已完成
                 "deliveryStatusName":"待上传材料",
                 "deliveryStatusName":"待上传材料",
-                "payStatus": "yfk",
+                "payStatus": "yfk",// dfk: 待付款, yfk: 已付款
                 "payStatusName": "已付款",
                 "payStatusName": "已付款",
                 "CreateDate": "2019-10-30T08:06:02.000Z",
                 "CreateDate": "2019-10-30T08:06:02.000Z",
                 "submitTime": null,
                 "submitTime": null,
@@ -650,7 +650,7 @@
                 "nclOneCodes": "02",
                 "nclOneCodes": "02",
                 "gzwtsUrl": null,
                 "gzwtsUrl": null,
                 "smwjUrl": null,
                 "smwjUrl": null,
-                "deliveryStatus": "dsccl",
+                "deliveryStatus": "dsccl",//dfk: 待付款, dqrfa: 待确认方案, fabtg: 方案不通过, dfwsfw: 待服务, dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ydj: 已递交, ywc: 已完成
                 "notes": ""
                 "notes": ""
             },
             },
             "orderFlow": [
             "orderFlow": [