From 5527ccecc2462c371fa4944104fe84a8815b2423 Mon Sep 17 00:00:00 2001
From: Lei PAN <paneicim@gmail.com>
Date: Fri, 16 Jun 2023 10:42:51 +0200
Subject: [PATCH] try to set store via excel

---
 src/excel/ExcelUtil.js       | 8 ++++++--
 src/models/ContactPojo.js    | 3 ++-
 src/workers/CommandorPage.js | 5 ++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/excel/ExcelUtil.js b/src/excel/ExcelUtil.js
index 8b4a7c0..86acd4d 100644
--- a/src/excel/ExcelUtil.js
+++ b/src/excel/ExcelUtil.js
@@ -10,7 +10,7 @@ class ExcelUtil {
             (info, index, list) => {
                 if (index > 0 && info.length > 0) {
                     // console.log(info)
-                    if (info[0].includes("Aijing")){
+                    if (info[0].includes("Aijing")) {
                         console.log("found");
                     }
                     let name = info[0].trim().split(" ")
@@ -19,7 +19,11 @@ class ExcelUtil {
                     let phoneNumber = info[1];
                     let passportNumber = info[2];
                     let mail = info[3];
-                    let newContact = new ContactPojo(phoneNumber, passportNumber, lastName, firstName, mail);
+                    let store = info[4];
+                    if (store === undefined || store.length === 0) {
+                        store = "random"
+                    }
+                    let newContact = new ContactPojo(phoneNumber, passportNumber, lastName, firstName, mail, store);
                     contactList.push(newContact);
                 }
             }
diff --git a/src/models/ContactPojo.js b/src/models/ContactPojo.js
index 7f61a42..ef083cd 100644
--- a/src/models/ContactPojo.js
+++ b/src/models/ContactPojo.js
@@ -1,11 +1,12 @@
 class ContactPojo {
 
-    constructor(phoneNumber, passportNumber, lastName, firstName, mail) {
+    constructor(phoneNumber, passportNumber, lastName, firstName, mail, store) {
         this.phoneNumber = phoneNumber;
         this.passportNumber = passportNumber;
         this.lastName = lastName;
         this.firstName = firstName;
         this.mail = mail;
+        this.store = store;
     }
 
 
diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js
index d9e194d..0f579fb 100644
--- a/src/workers/CommandorPage.js
+++ b/src/workers/CommandorPage.js
@@ -441,7 +441,10 @@ class CommandorPage {
         await delay(getRandomWaitTime())
         try {
             if (!this.page.isClosed() && !this.isTerminated) {
-                if (this.selectedStore !== "random") {
+                if (this.contact.store === undefined || this.contact.store.length === 0) {
+                    this.contact.store = this.selectedStore;
+                }
+                if (this.contact.store !== "random") {
                     // page.focus(PREFER_STORE);
                     await delay(500)
                     // page.click(PREFER_STORE);