lrf402788946 4 роки тому
батько
коміт
b7f5344a34

+ 4 - 0
app/controller/order/.transport.js

@@ -88,4 +88,8 @@ module.exports = {
       count: true,
     },
   },
+  getTransports: {
+    requestBody: ["nos"],
+    service: "getTransports",
+  },
 };

+ 2 - 0
app/router/transport.js

@@ -22,6 +22,8 @@ module.exports = app => {
   router.post('transport', `${prefix}/transport/sign`, controller[index].transport.sign);
   // 获取运输单号
   router.get('transport', `${prefix}/transport/no`, controller[index].transport.getNo);
+  // 根据nos获取运输单
+  router.post('transport', `${prefix}/transport/nos`, controller[index].transport.getTransports);
   // 运输
   router.resources(`${prefix}/transport`, controller[index].transport); // index、create、show、destroy
   router.post('transport', `${prefix}/transport/update/:id`, controller[index].transport.update);

+ 9 - 0
app/service/order/transport.js

@@ -11,6 +11,15 @@ class TransportService extends CrudService {
     this.os = this.ctx.service.order.order;
     this.util = this.ctx.service.util.util;
   }
+  /**
+   * 根据ids查询运输单号
+   * @param {Object} { nos } 运输单号集合
+   */
+  async getTransports({ nos }) {
+    console.log(nos);
+    const res = await this.model.find({ no: nos });
+    return res;
+  }
 
   async create(data) {
     const { goods, no, send_time } = data;

+ 2 - 1
app/service/util/util.js

@@ -94,10 +94,11 @@ class UtilService extends CrudService {
    * @param {Object} filter 查询条件
    */
   turnFilter(filter) {
-    const str = /^%\w*%$/;
+    const str = /^%\S*%$/;
     const keys = Object.keys(filter);
     for (const key of keys) {
       const res = key.match(str);
+      console.log(res);
       if (res) {
         const newKey = key.slice(1, key.length - 1);
         filter[newKey] = new RegExp(filter[key]);