update

app/service/dock.js

@@ -93,11 +93,23 @@ class ChatService extends CrudService {
         apply.status = body.status;
       }
     } else {
-      // 保存
-      dock.apply.push({
-        ...body,
-        apply_time: moment().format('YYYY-MM-DD HH:mm:ss'),
-      });
+      // 如果是新添,查找之前该userid是否申请了,如果申请了,就把商品列表合并,如果没申请,就保存
+      const { apply } = dock;
+      const ri = apply.findIndex(f => f.user_id === body.user_id);
+      if (ri < 0) {
+        // 保存
+        dock.apply.push({
+          ...body,
+          apply_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+        });
+      } else {
+        // 之前申请过,合并goodsList
+        apply[ri].goodsList = [ ...apply[ri].goodsList, ...body.goodsList ];
+        dock.apply = apply;
+        console.log(apply);
+      }
+
+
     }
 
     const res = await dock.save();