dd

xgg-deliver/app/base/controller/impl/order/orderCtl.js

@@ -102,9 +102,6 @@ class OrderCtl extends CtlBase {
     if (!pobj.status) {
       return system.getResult(null, `参数错误 订单状态不能为空`);
     }
-    if (!pobj.operator_id) {
-      return system.getResult(null, `参数错误 业务员ID不能为空`);
-    }
     
     try {
       return await this.orderSve.handleStatus(pobj);
@@ -343,7 +340,7 @@ class OrderCtl extends CtlBase {
    * @param {*} pobj2 
    * @param {*} req 
    */
-  async taxReportComplete(pobj, pobj2, req) {
+  async taxCategoryDetermine(pobj, pobj2, req) {
     if (!pobj.id) {
       return system.getResult(null, `参数错误 订单ID不能为空`);
     }
@@ -382,7 +379,7 @@ class OrderCtl extends CtlBase {
    * @param {*} pobj2 
    * @param {*} req 
    */
-  async taxReportComplete(pobj, pobj2, req) {
+  async submitAudit(pobj, pobj2, req) {
     if (!pobj.id) {
       return system.getResult(null, `参数错误 订单ID不能为空`);
     }
@@ -410,10 +407,10 @@ class OrderCtl extends CtlBase {
     if (!pobj.status) {
       return system.getResult(null, `参数错误 状态码不能为空`);
     }
-    if (!params.deliver_mail_no) {
+    if (!pobj.deliver_mail_no) {
       return system.getResult(null, `参数错误 交付商交付快递单号不能为空`);
     }
-    if (!params.deliver_mail_img) {
+    if (!pobj.deliver_mail_img) {
       return system.getResult(null, `参数错误 交付商交付快递单号图片不能为空`);
     }
     try {

xgg-deliver/app/front/entry/public/apidoc/order/order.md

@@ -268,11 +268,34 @@
 
 {
     "status": 0,
-    "msg": "success",
-    "data": null,
-    "requestid": "6c308d46116945968592fbce5f3f4a95"
+    "msg": "操作成功",
+    "data": {
+        "id": "1567514207003510",
+        "merchant_id": "",
+        "busi_type": 1,
+        "busi_id": "",
+        "product_id": 10010000,
+        "price": 0,
+        "status": "1050",
+        "assign_time": "2020-01-11T07:38:50.000Z",
+        "assign_user_id": 18,
+        "deliver_id": "1148267157001391",
+        "desc": "",
+        "bd_id": "17",
+        "bd_path": "/我是说/guodegang10",
+        "service_items": "10010200,10010500",
+        "service_remark": "no note",
+        "source_id": 1000,
+        "source_no": "songyi3",
+        "contact_mobile": "13777777777",
+        "created_at": "2020-01-10T06:56:32.000Z",
+        "updated_at": "2020-01-11T08:02:58.566Z",
+        "deleted_at": null,
+        "version": 4
+    },
+    "bizmsg": "empty",
+    "requestid": "2442e84cbe9c4e1091792da7f196ffed"
 }
-
 ```
 
 
@@ -328,12 +351,35 @@
 
 #### 返回结果
 ```javascript
-
 {
     "status": 0,
-    "msg": "success",
-    "data": null,
-    "requestid": "6c308d46116945968592fbce5f3f4a95"
+    "msg": "操作成功",
+    "data": {
+        "id": "1567514207003510",
+        "merchant_id": "",
+        "busi_type": 1,
+        "busi_id": "147709017000663",
+        "product_id": 10010000,
+        "price": 0,
+        "status": "1070",
+        "assign_time": "2020-01-11T07:38:50.000Z",
+        "assign_user_id": 18,
+        "deliver_id": "1148267157001391",
+        "desc": "",
+        "bd_id": "17",
+        "bd_path": "/我是说/guodegang10",
+        "service_items": "10010200,10010300,10010400,10010500",
+        "service_remark": "no note",
+        "source_id": 1000,
+        "source_no": "songyi3",
+        "contact_mobile": "13777777777",
+        "created_at": "2020-01-10T06:56:32.000Z",
+        "updated_at": "2020-01-11T08:09:31.623Z",
+        "deleted_at": null,
+        "version": 6
+    },
+    "bizmsg": "empty",
+    "requestid": "d49b643a152248d8ad3832fa9b08ad65"
 }
 
 ```
@@ -392,12 +438,35 @@
 
 #### 返回结果
 ```javascript
-
 {
     "status": 0,
-    "msg": "success",
-    "data": null,
-    "requestid": "6c308d46116945968592fbce5f3f4a95"
+    "msg": "操作成功",
+    "data": {
+        "id": "1567514207003510",
+        "merchant_id": "",
+        "busi_type": 1,
+        "busi_id": "147709017000663",
+        "product_id": 10010000,
+        "price": 0,
+        "status": "1090",
+        "assign_time": "2020-01-11T07:38:50.000Z",
+        "assign_user_id": 18,
+        "deliver_id": "1148267157001391",
+        "desc": "",
+        "bd_id": "17",
+        "bd_path": "/我是说/guodegang10",
+        "service_items": "10010200,10010300,10010400,10010500",
+        "service_remark": "no note",
+        "source_id": 1000,
+        "source_no": "songyi3",
+        "contact_mobile": "13777777777",
+        "created_at": "2020-01-10T06:56:32.000Z",
+        "updated_at": "2020-01-11T08:12:26.542Z",
+        "deleted_at": null,
+        "version": 7
+    },
+    "bizmsg": "empty",
+    "requestid": "3d63de640512463eb86a9c450295dfb9"
 }
 
 ```
@@ -457,9 +526,33 @@
 
 {
     "status": 0,
-    "msg": "success",
-    "data": null,
-    "requestid": "6c308d46116945968592fbce5f3f4a95"
+    "msg": "操作成功",
+    "data": {
+        "id": "1567514207003510",
+        "merchant_id": "",
+        "busi_type": 1,
+        "busi_id": "147709017000663",
+        "product_id": 10010000,
+        "price": 0,
+        "status": "1110",
+        "assign_time": "2020-01-11T07:38:50.000Z",
+        "assign_user_id": 18,
+        "deliver_id": "1148267157001391",
+        "desc": "",
+        "bd_id": "17",
+        "bd_path": "/我是说/guodegang10",
+        "service_items": "10010200,10010300,10010400,10010500",
+        "service_remark": "no note",
+        "source_id": 1000,
+        "source_no": "songyi3",
+        "contact_mobile": "13777777777",
+        "created_at": "2020-01-10T06:56:32.000Z",
+        "updated_at": "2020-01-11T08:16:18.064Z",
+        "deleted_at": null,
+        "version": 8
+    },
+    "bizmsg": "empty",
+    "requestid": "f881a6457c9c48109d686f023accc1b6"
 }
 
 ```
@@ -553,9 +646,33 @@
 
 {
     "status": 0,
-    "msg": "success",
-    "data": null,
-    "requestid": "6c308d46116945968592fbce5f3f4a95"
+    "msg": "操作成功",
+    "data": {
+        "id": "1567514207003510",
+        "merchant_id": "",
+        "busi_type": 1,
+        "busi_id": "147709017000663",
+        "product_id": 10010000,
+        "price": 0,
+        "status": "1140",
+        "assign_time": "2020-01-11T07:38:50.000Z",
+        "assign_user_id": 18,
+        "deliver_id": "1148267157001391",
+        "desc": "",
+        "bd_id": "17",
+        "bd_path": "/我是说/guodegang10",
+        "service_items": "10010200,10010300,10010400,10010500",
+        "service_remark": "no note",
+        "source_id": 1000,
+        "source_no": "songyi3",
+        "contact_mobile": "13777777777",
+        "created_at": "2020-01-10T06:56:32.000Z",
+        "updated_at": "2020-01-11T08:21:51.262Z",
+        "deleted_at": null,
+        "version": 9
+    },
+    "bizmsg": "empty",
+    "requestid": "a08b06d058904333bb075846b12d7e9b"
 }
 
 ```