@bee-hole/server 1.62.1 → 1.63.0

package/resource/public/cp/template/template8.html

@@ -0,0 +1,274 @@
+<div class="ProductPage">
+  <div class="topContent">
+    <div>
+      <img width="100%"
+        src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85ml6l9fv28opcgbpt.png" />
+    </div>
+    <div class="postionTop">
+      <div class="onePag-title">
+        HUAWEI Pura 70 Pro+
+      </div>
+      <div class="onePag-content">
+        锐意向前
+      </div>
+      <div>
+        <a class="a-button bgWhite">
+          了解更多
+        </a>
+      </div>
+    </div>
+  </div>
+  <div style="margin-top:6rem;">
+    <div class="row item-list">
+      <div class="col-lg-4 col-md-4 item-list-col">
+        <div class="item-list-item">
+          <div class="title">HUAWEIWATCH FIT 3</div>
+          <div class="desc">大方出场 时尚有方</div>
+          <a class="a-button bgGrey">
+            了解更多
+          </a>
+          <div>
+            <img width="100%"
+              src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/17fgy591000d2h9h8svqwtl2fa7xtghp.jpg" />
+          </div>
+        </div>
+      </div>
+      <div class="col-lg-4 col-md-4 item-list-col">
+        <div class="item-list-item">
+          <div class="title">HUAWElMatePad 11.5"s</div>
+          <div class="desc">云晰柔光屏 满屏新视野</div>
+          <a class="a-button bgGrey">
+            了解更多
+          </a>
+          <div>
+            <img width="100%"
+              src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/17fgy591000d2h9jqbtyqar2m6tx89je.jpg" />
+          </div>
+        </div>
+      </div>
+      <div class="col-lg-4 col-md-4 item-list-col">
+        <div class="item-list-item">
+          <div class="title">HUAWElMatePad SE</div>
+          <div class="desc">高刷好屏 全家臻亨</div>
+          <a class="a-button bgGrey">
+            了解更多
+          </a>
+          <div>
+            <img width="100%"
+              src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/17fgy591000d2h9fvd5nwah2cexwvodq.jpg" />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div style="margin-top:6rem;">
+    <div class="row item-list " style="margin-bottom:20px">
+      <div class="col-lg-6 col-md-6 item-list-col">
+        <div>
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85mnco4ql28q0w7qww.png" />
+        </div>
+      </div>
+      <div class="col-lg-6 col-md-6 item-list-col">
+        <div>
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85mx35k5229gs7q0co.png" />
+        </div>
+      </div>
+    </div>
+    <div class="row item-list ">
+      <div class="col-lg-6 col-md-6 item-list-col">
+        <div>
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85ms6k6w7290wa0b21.png" />
+        </div>
+      </div>
+      <div class="col-lg-6 col-md-6 item-list-col">
+        <div>
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85mtuqpk0295e9vl33.png" />
+        </div>
+      </div>
+    </div>
+  </div>
+  <div style="margin-top: 6rem;">
+    <div style="font-size:20pt;font-weight:600;text-align: center;margin-bottom:1.5rem;color:#000;">所有产品</div>
+    <div class="row item-list " style="margin-bottom:20px">
+      <div class="col-lg-4 col-md-4 item-list-col">
+        <div>
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85mttn7cl294sbveuf.png" />
+        </div>
+      </div>
+      <div class="col-lg-4 col-md-4 item-list-col">
+        <div class="bujianxi" style="position: relative;">
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85moo0tie28uqpk35t.png" />
+          <div style="position: absolute;bottom: 2rem;color: #000;text-align: center;width: 100%;font-weight: 600;">
+            HUAWEl Pura 70 Pro
+          </div>
+        </div>
+        <div style="position: relative;">
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85modgjku28sebr0tm.png" />
+          <div style="position: absolute;bottom: 2rem;color: #000;text-align: center;width: 100%;font-weight: 600;">
+            HUAWEl Pura 70
+          </div>
+        </div>
+      </div>
+      <div class="col-lg-4 col-md-4 item-list-col">
+        <div class="bujianxi" style="position: relative;">
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85ms5nsj628zeinc8k.png" />
+          <div style="position: absolute;bottom: 2rem;color: #000;text-align: center;width: 100%;font-weight: 600;">
+            HUAWEIPocket 2
+          </div>
+        </div>
+        <div style="position: relative;">
+          <img width="100%"
+            src="https://xbuy.oss-cn-shanghai.aliyuncs.com/xbuy/1/2024-07-05/5emozr01000d2h85ms5nsj628zeinc8k.png" />
+          <div style="position: absolute;bottom: 2rem;color: #000;text-align: center;width: 100%;font-weight: 600;">
+            HUAWEIPocket 2
+          </div>
+        </div>
+      </div>
+  
+    </div>
+  </div>
+</div>
+<style>
+@media (min-width: 1024px) {
+  .onePag-title {
+    font-size: 28pt;
+    color: #fff;
+    text-align: center;
+    line-height: 1;
+    margin-top: 1.5rem;
+  }
+
+  .onePag-content {
+    font-size: 20pt;
+    line-height: 1;
+    margin-top: 1.5rem;
+  }
+  .item-list-item .title {
+    font-size: 24pt;
+    font-weight: 500;
+    color: #000;
+  }
+
+  .item-list-item .desc {
+    font-size: 14pt;
+    font-weight: 500;
+    color: #000;
+    margin-top: 1.5rem;
+  }
+  .bujianxi{
+    margin-bottom:40px;
+  }
+}
+
+/* Desktop-only class */
+@media (max-width: 1023px) {
+  .onePag-title {
+    font-size: 18pt;
+    color: #fff;
+    text-align: center;
+    line-height: 1;
+    margin-top: 1.5rem;
+  }
+
+  .onePag-content {
+    font-size: 14pt;
+    line-height: 1;
+    margin-top: 1.5rem;
+  }
+  .item-list-item .title {
+    font-size: 16pt;
+    font-weight: 500;
+    color: #000;
+  }
+
+  .item-list-item .desc {
+    font-size: 12pt;
+    font-weight: 500;
+    color: #000;
+    margin-top: 1.5rem;
+  }
+  .bujianxi{
+    margin-bottom: 1rem;
+  }
+}
+  .ProductPage{
+    --c-text: #000 ;
+  }
+  .postionTop {
+    position: absolute;
+    width: 100%;
+    top: 0;
+  }
+
+  .topContent {
+    text-align: center;
+  }
+
+  .a-button {
+    display: inline-block;
+    width: auto;
+    height: 2rem;
+    line-height: 2rem;
+    text-align: center;
+    background-color: #E0E0E0;
+    color: #000;
+    margin: 0 auto;
+    border-radius: 5px;
+    padding: 0 1rem;
+    font-size: 10pt;
+    margin-top: 1.5rem;
+    --c-text: #000 !important;
+  }
+
+  .item-list {
+    width: 100%;
+    margin: 0 auto;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0 20px;
+
+    @media (max-width: 720px) {
+      gap: 18px 0;
+      flex-direction: column;
+    }
+
+    /* margin-bottom:30px; */
+    /* margin-top:20px; */
+  }
+
+  .item-list-item {
+    background-color: #fff;
+    text-align: center;
+    padding-top: 3rem;
+    border-radius: 5px;
+  }
+
+
+  .bgWhite {
+    background-color: #fff !important;
+  }
+
+  .bgGrey {
+    background-color: #E0E0E0 !important;
+  }
+
+  .item-list-col {
+    flex: 1;
+
+    @media (max-width: 720px) {
+      flex: 0;
+    }
+  }
+  #webSite {
+    --c-primary: green;
+    --c-light-variant: #fff;
+  }
+</style>

package/resource/public/cp/vsf.css

@@ -0,0 +1,14 @@
+body{
+  @media (min-width: 1024px) {
+    .smartphone-only {
+      display: none !important;
+    }
+  }
+
+  /* Desktop-only class */
+  @media (max-width: 1023px) {
+    .desktop-only {
+      display: none !important;
+    }
+  }
+}

package/storage/init/init.sql

@@ -520,6 +520,8 @@ CREATE TABLE `admin_goods_supply` (
   `id` bigint(20) NOT NULL COMMENT '供应ID 主键',
   `shop_id` bigint(20) NOT NULL COMMENT '供应方shop_id(子店)',
   `good_id` bigint(20) NOT NULL COMMENT '供应商品ID',
+  `deduction_ratio` decimal(10,2) DEFAULT NULL COMMENT '扣点比例',
+  `delivery_country` longtext COMMENT '配送国家列表[""]',
   `main_shop_id` bigint(20) NOT NULL COMMENT '主店shop_id',
   `main_good_id` bigint(20) DEFAULT '0' COMMENT '主店商品ID',
   `good_url` varchar(255) NOT NULL COMMENT '商品链接',
@@ -18238,6 +18240,8 @@ CREATE TABLE `admin_supply_orders` (
   `order_id` varchar(64) NOT NULL COMMENT '订单编号',
   `user_id` bigint(20) DEFAULT NULL COMMENT '供应商ID',
   `shop_id` bigint(20) NOT NULL COMMENT '供应商店铺ID',
+  `deduction_fee` decimal(10,2) DEFAULT NULL COMMENT '扣点金额',
+  `deduction_status` int(1) DEFAULT '1' COMMENT '扣点金额状态 1=>未支付   2=>已支付',
   `status` varchar(20) NOT NULL COMMENT '订单状态',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -18260,6 +18264,8 @@ CREATE TABLE `admin_supply_order_item_relationship` (
   `main_out_id` varchar(64) DEFAULT NULL,
   `main_sku_prop` varchar(100) DEFAULT NULL,
   `main_mailing_mode` int(1) DEFAULT NULL COMMENT '主店商品发货模式',
+  `deduction_ratio` decimal(10,2) DEFAULT NULL COMMENT '扣点比例',
+  `deduction_fee` decimal(10,2) DEFAULT NULL COMMENT '扣点金额',
   `son_good_id` bigint(20) DEFAULT NULL COMMENT '子店铺商品',
   `son_sku_id` bigint(20) DEFAULT NULL COMMENT '子店skuId信息',
   `son_title` varchar(255) DEFAULT NULL,
@@ -19315,7 +19321,7 @@ INSERT INTO `mall_country` (`id`, `pid`, `name`, `code`, `languageMap`, `countri
 (395, 333, '', '', NULL, NULL, NULL, NULL, NULL, 'Tỉnh Vĩnh Phúc', '1300062', 'VN', NULL),
 (396, 333, '', '', NULL, NULL, NULL, NULL, NULL, 'Tỉnh Yên Bái', '1300063', 'VN', NULL),
 (397, 333, '', '', NULL, NULL, NULL, NULL, NULL, 'Thu Do Ha Noi', '1313492', 'VN', NULL),
-(398, 182, '', '', NULL, '新加坡', 'SG', 'https://cdn.myshopline.com/country/icon/SG.png', '{\"de\":{\"name\":\"Singapur\",\"language\":\"de\"},\"zh-hant-tw\":{\"name\":\"新加坡\",\"language\":\"zh-hant-tw\"},\"hi\":{\"name\":\"सिंगापुर\",\"language\":\"hi\"},\"ru\":{\"name\":\"Сингапур\",\"language\":\"ru\"},\"fi\":{\"name\":\"Singapore\",\"language\":\"fi\"},\"pt\":{\"name\":\"Cingapura\",\"language\":\"pt\"},\"bg\":{\"name\":\"Сингапур\",\"language\":\"bg\"},\"zh-hans-cn\":{\"name\":\"新加坡\",\"language\":\"zh-hans-cn\"},\"lt\":{\"name\":\"Singapūras\",\"language\":\"lt\"},\"lv\":{\"name\":\"Singapūra\",\"language\":\"lv\"},\"hr\":{\"name\":\"Singapur\",\"language\":\"hr\"},\"fr\":{\"name\":\"Singapour\",\"language\":\"fr\"},\"hu\":{\"name\":\"Szingapúr\",\"language\":\"hu\"},\"sk\":{\"name\":\"Singapur\",\"language\":\"sk\"},\"sl\":{\"name\":\"Singapur\",\"language\":\"sl\"},\"id\":{\"name\":\"Singapura\",\"language\":\"id\"},\"sv\":{\"name\":\"Singapore\",\"language\":\"sv\"},\"ko\":{\"name\":\"싱가포르\",\"language\":\"ko\"},\"ms\":{\"name\":\"Singapura\",\"language\":\"ms\"},\"el\":{\"name\":\"Σιγκαπούρη\",\"language\":\"el\"},\"en\":{\"name\":\"Singapore\",\"language\":\"en\"},\"it\":{\"name\":\"Singapore\",\"language\":\"it\"},\"es\":{\"name\":\"Singapur\",\"language\":\"es\"},\"et\":{\"name\":\"Singapur\",\"language\":\"et\"},\"cs\":{\"name\":\"Singapur\",\"language\":\"cs\"},\"vi\":{\"name\":\"Singapore\",\"language\":\"vi\"},\"th\":{\"name\":\"สิงคโปร์\",\"language\":\"th\"},\"nb\":{\"name\":\"Singapore\",\"language\":\"nb\"},\"ja\":{\"name\":\"シンガポール\",\"language\":\"ja\"},\"pl\":{\"name\":\"Singapur\",\"language\":\"pl\"},\"ro\":{\"name\":\"Singapore\",\"language\":\"ro\"},\"da\":{\"name\":\"Singapore\",\"language\":\"da\"},\"nl\":{\"name\":\"Singapore\",\"language\":\"nl\"},\"tr\":{\"name\":\"Singapur\",\"language\":\"tr\"}}', NULL, NULL, NULL, NULL),
+(398, 182, '', '', NULL, 'Singapore', 'SG', 'https://cdn.myshopline.com/country/icon/SG.png', '{\"de\":{\"name\":\"Singapur\",\"language\":\"de\"},\"zh-hant-tw\":{\"name\":\"新加坡\",\"language\":\"zh-hant-tw\"},\"hi\":{\"name\":\"सिंगापुर\",\"language\":\"hi\"},\"ru\":{\"name\":\"Сингапур\",\"language\":\"ru\"},\"fi\":{\"name\":\"Singapore\",\"language\":\"fi\"},\"pt\":{\"name\":\"Cingapura\",\"language\":\"pt\"},\"bg\":{\"name\":\"Сингапур\",\"language\":\"bg\"},\"zh-hans-cn\":{\"name\":\"新加坡\",\"language\":\"zh-hans-cn\"},\"lt\":{\"name\":\"Singapūras\",\"language\":\"lt\"},\"lv\":{\"name\":\"Singapūra\",\"language\":\"lv\"},\"hr\":{\"name\":\"Singapur\",\"language\":\"hr\"},\"fr\":{\"name\":\"Singapour\",\"language\":\"fr\"},\"hu\":{\"name\":\"Szingapúr\",\"language\":\"hu\"},\"sk\":{\"name\":\"Singapur\",\"language\":\"sk\"},\"sl\":{\"name\":\"Singapur\",\"language\":\"sl\"},\"id\":{\"name\":\"Singapura\",\"language\":\"id\"},\"sv\":{\"name\":\"Singapore\",\"language\":\"sv\"},\"ko\":{\"name\":\"싱가포르\",\"language\":\"ko\"},\"ms\":{\"name\":\"Singapura\",\"language\":\"ms\"},\"el\":{\"name\":\"Σιγκαπούρη\",\"language\":\"el\"},\"en\":{\"name\":\"Singapore\",\"language\":\"en\"},\"it\":{\"name\":\"Singapore\",\"language\":\"it\"},\"es\":{\"name\":\"Singapur\",\"language\":\"es\"},\"et\":{\"name\":\"Singapur\",\"language\":\"et\"},\"cs\":{\"name\":\"Singapur\",\"language\":\"cs\"},\"vi\":{\"name\":\"Singapore\",\"language\":\"vi\"},\"th\":{\"name\":\"สิงคโปร์\",\"language\":\"th\"},\"nb\":{\"name\":\"Singapore\",\"language\":\"nb\"},\"ja\":{\"name\":\"シンガポール\",\"language\":\"ja\"},\"pl\":{\"name\":\"Singapur\",\"language\":\"pl\"},\"ro\":{\"name\":\"Singapore\",\"language\":\"ro\"},\"da\":{\"name\":\"Singapore\",\"language\":\"da\"},\"nl\":{\"name\":\"Singapore\",\"language\":\"nl\"},\"tr\":{\"name\":\"Singapur\",\"language\":\"tr\"}}', NULL, NULL, NULL, NULL),
 (399, 398, '', '', NULL, NULL, NULL, NULL, NULL, 'Singapore', '3000001', 'SG', NULL),
 (400, 182, '', '', NULL, '阿拉伯联合酋长国', 'AE', 'https://cdn.myshopline.com/country/icon/AE.png', '{\"de\":{\"name\":\"Vereinigte Arabische Emirate\",\"language\":\"de\"},\"zh-hant-tw\":{\"name\":\"阿拉伯聯合酋長國\",\"language\":\"zh-hant-tw\"},\"hi\":{\"name\":\"संयुक्त अरब अमीरात\",\"language\":\"hi\"},\"ru\":{\"name\":\"Объединенные Арабские Эмираты\",\"language\":\"ru\"},\"fi\":{\"name\":\"Yhdistyneet Arabiemiirikunnat\",\"language\":\"fi\"},\"pt\":{\"name\":\"Emirados Árabes Unidos\",\"language\":\"pt\"},\"bg\":{\"name\":\"Обединени арабски емирства\",\"language\":\"bg\"},\"zh-hans-cn\":{\"name\":\"阿拉伯联合酋长国\",\"language\":\"zh-hans-cn\"},\"lt\":{\"name\":\"Jungtiniai Arabų Emyratai\",\"language\":\"lt\"},\"lv\":{\"name\":\"Apvienotie Arābu Emirāti\",\"language\":\"lv\"},\"hr\":{\"name\":\"Ujedinjeni Arapski Emirati\",\"language\":\"hr\"},\"fr\":{\"name\":\"Émirats Arabes Unis\",\"language\":\"fr\"},\"hu\":{\"name\":\"Egyesült Arab Emírségek\",\"language\":\"hu\"},\"sk\":{\"name\":\"Spojené Arabské Emiráty\",\"language\":\"sk\"},\"sl\":{\"name\":\"Združeni Arabski Emirati\",\"language\":\"sl\"},\"id\":{\"name\":\"Uni Emirat Arab\",\"language\":\"id\"},\"sv\":{\"name\":\"Förenade arabemiraten\",\"language\":\"sv\"},\"ko\":{\"name\":\"아랍 에미리트\",\"language\":\"ko\"},\"ms\":{\"name\":\"Emiriah Arab Bersatu\",\"language\":\"ms\"},\"el\":{\"name\":\"Ηνωμένα Αραβικά Εμιράτα\",\"language\":\"el\"},\"en\":{\"name\":\"United Arab Emirates\",\"language\":\"en\"},\"it\":{\"name\":\"Emirati Arabi Uniti\",\"language\":\"it\"},\"es\":{\"name\":\"Emiratos Árabes Unidos\",\"language\":\"es\"},\"et\":{\"name\":\"Araabia Ühendemiraadid\",\"language\":\"et\"},\"cs\":{\"name\":\"Spojené arabské emiráty\",\"language\":\"cs\"},\"vi\":{\"name\":\"các Tiểu Vương Quốc Ả Rập Thống Nhất\",\"language\":\"vi\"},\"th\":{\"name\":\"สหรัฐอาหรับเอมิเรตส์\",\"language\":\"th\"},\"nb\":{\"name\":\"De forente arabiske emirater\",\"language\":\"nb\"},\"ja\":{\"name\":\"アラブ首長国連邦\",\"language\":\"ja\"},\"pl\":{\"name\":\"Zjednoczone Emiraty Arabskie\",\"language\":\"pl\"},\"ro\":{\"name\":\"Emiratele Arabe Unite\",\"language\":\"ro\"},\"da\":{\"name\":\"Forenede Arabiske Emirater\",\"language\":\"da\"},\"nl\":{\"name\":\"Verenigde Arabische Emiraten\",\"language\":\"nl\"},\"tr\":{\"name\":\"Birleşik Arap Emirlikleri\",\"language\":\"tr\"}}', NULL, NULL, NULL, NULL),
 (401, 400, '', '', NULL, NULL, NULL, NULL, NULL, '阿布扎比', '4100001', 'AE', 'AZ'),
@@ -20003,69 +20009,69 @@ INSERT INTO `mall_country` (`id`, `pid`, `name`, `code`, `languageMap`, `countri
 (1078, 695, '', '', NULL, '乌克兰', 'UA', 'https://cdn.myshopline.com/country/icon/UA.png', '{\"de\":{\"name\":\"Ukraine\",\"language\":\"de\"},\"zh-hant-tw\":{\"name\":\"烏克蘭\",\"language\":\"zh-hant-tw\"},\"hi\":{\"name\":\"यूक्रेन\",\"language\":\"hi\"},\"ru\":{\"name\":\"Украина\",\"language\":\"ru\"},\"fi\":{\"name\":\"Ukraina\",\"language\":\"fi\"},\"pt\":{\"name\":\"Ucrânia\",\"language\":\"pt\"},\"bg\":{\"name\":\"Украйна\",\"language\":\"bg\"},\"zh-hans-cn\":{\"name\":\"乌克兰\",\"language\":\"zh-hans-cn\"},\"lt\":{\"name\":\"Ukraina\",\"language\":\"lt\"},\"lv\":{\"name\":\"Ukraina\",\"language\":\"lv\"},\"hr\":{\"name\":\"Ukrajina\",\"language\":\"hr\"},\"fr\":{\"name\":\"Ukraine\",\"language\":\"fr\"},\"hu\":{\"name\":\"Ukrajna\",\"language\":\"hu\"},\"sk\":{\"name\":\"Ukrajina\",\"language\":\"sk\"},\"sl\":{\"name\":\"Ukrajina\",\"language\":\"sl\"},\"id\":{\"name\":\"Ukraina\",\"language\":\"id\"},\"sv\":{\"name\":\"Ukraina\",\"language\":\"sv\"},\"ko\":{\"name\":\"우크라이나\",\"language\":\"ko\"},\"ms\":{\"name\":\"Ukraine\",\"language\":\"ms\"},\"el\":{\"name\":\"Ουκρανία\",\"language\":\"el\"},\"en\":{\"name\":\"Ukraine\",\"language\":\"en\"},\"it\":{\"name\":\"Ucraina\",\"language\":\"it\"},\"es\":{\"name\":\"Ucrania\",\"language\":\"es\"},\"et\":{\"name\":\"Ukraina\",\"language\":\"et\"},\"cs\":{\"name\":\"Ukrajina\",\"language\":\"cs\"},\"vi\":{\"name\":\"Ukraine\",\"language\":\"vi\"},\"th\":{\"name\":\"ยูเครน\",\"language\":\"th\"},\"nb\":{\"name\":\"Ukraina\",\"language\":\"nb\"},\"ja\":{\"name\":\"ウクライナ\",\"language\":\"ja\"},\"pl\":{\"name\":\"Ukraina\",\"language\":\"pl\"},\"ro\":{\"name\":\"Ucraina\",\"language\":\"ro\"},\"da\":{\"name\":\"Ukraine\",\"language\":\"da\"},\"nl\":{\"name\":\"Oekraïne\",\"language\":\"nl\"},\"tr\":{\"name\":\"Ukrayna\",\"language\":\"tr\"}}', NULL, NULL, NULL, NULL),
 (1079, 695, '', '', NULL, '梵蒂冈', 'VA', 'https://cdn.myshopline.com/country/icon/VA.png', '{\"de\":{\"name\":\"Vatikanstadt\",\"language\":\"de\"},\"zh-hant-tw\":{\"name\":\"梵蒂岡\",\"language\":\"zh-hant-tw\"},\"hi\":{\"name\":\"वेटिकन सिटी\",\"language\":\"hi\"},\"ru\":{\"name\":\"Ватикан\",\"language\":\"ru\"},\"fi\":{\"name\":\"Vatikaanivaltio\",\"language\":\"fi\"},\"pt\":{\"name\":\"Cidade do Vaticano\",\"language\":\"pt\"},\"bg\":{\"name\":\"Ватикана\",\"language\":\"bg\"},\"zh-hans-cn\":{\"name\":\"梵蒂冈\",\"language\":\"zh-hans-cn\"},\"lt\":{\"name\":\"Vatikano miestas\",\"language\":\"lt\"},\"lv\":{\"name\":\"Vatikāna pilsēta\",\"language\":\"lv\"},\"hr\":{\"name\":\"Grad Vatikan\",\"language\":\"hr\"},\"fr\":{\"name\":\"Cité du Vatican\",\"language\":\"fr\"},\"hu\":{\"name\":\"Vatikán város\",\"language\":\"hu\"},\"sk\":{\"name\":\"Vatikán\",\"language\":\"sk\"},\"sl\":{\"name\":\"Vatikan\",\"language\":\"sl\"},\"id\":{\"name\":\"Kota Vatikan\",\"language\":\"id\"},\"sv\":{\"name\":\"Vatikanstaten\",\"language\":\"sv\"},\"ko\":{\"name\":\"바티칸 시국\",\"language\":\"ko\"},\"ms\":{\"name\":\"Kota Vatican\",\"language\":\"ms\"},\"el\":{\"name\":\"Η πόλη του Βατικανού\",\"language\":\"el\"},\"en\":{\"name\":\"Vatican City\",\"language\":\"en\"},\"it\":{\"name\":\"Città del Vaticano\",\"language\":\"it\"},\"es\":{\"name\":\"Ciudad del Vaticano\",\"language\":\"es\"},\"et\":{\"name\":\"Vatikan\",\"language\":\"et\"},\"cs\":{\"name\":\"Vatikán\",\"language\":\"cs\"},\"vi\":{\"name\":\"Thành phố Vatican\",\"language\":\"vi\"},\"th\":{\"name\":\"นครรัฐวาติกัน\",\"language\":\"th\"},\"nb\":{\"name\":\"Vatikanet\",\"language\":\"nb\"},\"ja\":{\"name\":\"バチカン市国\",\"language\":\"ja\"},\"pl\":{\"name\":\"Watykan\",\"language\":\"pl\"},\"ro\":{\"name\":\"Orasul Vatican\",\"language\":\"ro\"},\"da\":{\"name\":\"Vatikanet\",\"language\":\"da\"},\"nl\":{\"name\":\"Vaticaanstad\",\"language\":\"nl\"},\"tr\":{\"name\":\"Vatikan Şehri\",\"language\":\"tr\"}}', NULL, NULL, NULL, NULL),
 (1080, 0, '北美洲', 'NA', '{\"zh-hant-tw\":{\"name\":\"北美洲\",\"language\":\"zh-hant-tw\"},\"vi\":{\"name\":\"Bắc Mỹ\",\"language\":\"vi\"},\"th\":{\"name\":\"อเมริกาเหนือ\",\"language\":\"th\"},\"ms\":{\"name\":\"Amerika Utara\",\"language\":\"ms\"},\"zh-hans-cn\":{\"name\":\"北美洲\",\"language\":\"zh-hans-cn\"},\"en\":{\"name\":\"North America\",\"language\":\"en\"},\"id\":{\"name\":\"Amerika Utara\",\"language\":\"id\"}}', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(1081, 1080, '', '', NULL, '美国', 'US', 'https://cdn.myshopline.com/country/icon/US.png', '{\"de\":{\"name\":\"USA\",\"language\":\"de\"},\"zh-hant-tw\":{\"name\":\"美國\",\"language\":\"zh-hant-tw\"},\"hi\":{\"name\":\"अमेरिका\",\"language\":\"hi\"},\"ru\":{\"name\":\"Соединенные Штаты\",\"language\":\"ru\"},\"fi\":{\"name\":\"Amerikka\",\"language\":\"fi\"},\"pt\":{\"name\":\"Estados Unidos\",\"language\":\"pt\"},\"bg\":{\"name\":\"Америка\",\"language\":\"bg\"},\"zh-hans-cn\":{\"name\":\"美国\",\"language\":\"zh-hans-cn\"},\"lt\":{\"name\":\"Amerika\",\"language\":\"lt\"},\"lv\":{\"name\":\"Amerika\",\"language\":\"lv\"},\"hr\":{\"name\":\"Amerika\",\"language\":\"hr\"},\"fr\":{\"name\":\"États-Unis\",\"language\":\"fr\"},\"hu\":{\"name\":\"Amerika\",\"language\":\"hu\"},\"sk\":{\"name\":\"Amerika\",\"language\":\"sk\"},\"sl\":{\"name\":\"Amerika\",\"language\":\"sl\"},\"id\":{\"name\":\"Amerika Serikat\",\"language\":\"id\"},\"sv\":{\"name\":\"Amerika\",\"language\":\"sv\"},\"ko\":{\"name\":\"미국\",\"language\":\"ko\"},\"ms\":{\"name\":\"Amerika\",\"language\":\"ms\"},\"el\":{\"name\":\"Αμερική\",\"language\":\"el\"},\"en\":{\"name\":\"United States\",\"language\":\"en\"},\"it\":{\"name\":\"stati Uniti\",\"language\":\"it\"},\"es\":{\"name\":\"Estados Unidos\",\"language\":\"es\"},\"et\":{\"name\":\"Ameerika\",\"language\":\"et\"},\"cs\":{\"name\":\"Amerika\",\"language\":\"cs\"},\"vi\":{\"name\":\"Châu mỹ\",\"language\":\"vi\"},\"th\":{\"name\":\"สหรัฐอเมริกา\",\"language\":\"th\"},\"nb\":{\"name\":\"Amerika\",\"language\":\"nb\"},\"ja\":{\"name\":\"アメリカ合衆国\",\"language\":\"ja\"},\"pl\":{\"name\":\"Stany Zjednoczone\",\"language\":\"pl\"},\"ro\":{\"name\":\"America\",\"language\":\"ro\"},\"da\":{\"name\":\"Amerika\",\"language\":\"da\"},\"nl\":{\"name\":\"Verenigde Staten\",\"language\":\"nl\"},\"tr\":{\"name\":\"Amerika\",\"language\":\"tr\"}}', NULL, NULL, NULL, NULL),
-(1082, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '亚拉巴马州', '4200001', 'US', 'AL'),
-(1083, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '阿拉斯加州', '4200002', 'US', 'AK'),
-(1084, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '美属萨摩亚群岛', '4200003', 'US', 'AS'),
-(1085, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '亚利桑那州', '4200004', 'US', 'AZ'),
-(1086, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '阿肯色州', '4200005', 'US', 'AR'),
-(1087, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '加利福尼亚州', '4200006', 'US', 'CA'),
-(1088, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '科罗拉多州', '4200007', 'US', 'CO'),
-(1089, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '康涅狄格州', '4200008', 'US', 'CT'),
-(1090, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '特拉华州', '4200009', 'US', 'DE'),
-(1091, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '华盛顿哥伦比亚特区', '4200010', 'US', 'DC'),
-(1092, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '密克罗尼西亚', '4200011', 'US', 'FM'),
-(1093, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '佛罗里达州', '4200012', 'US', 'FL'),
-(1094, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '佐治亚州', '4200013', 'US', 'GA'),
-(1095, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '关岛', '4200014', 'US', 'GU'),
-(1096, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '夏威夷州', '4200015', 'US', 'HI'),
-(1097, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '爱达荷州', '4200016', 'US', 'ID'),
-(1098, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '伊利诺伊州', '4200017', 'US', 'IL'),
-(1099, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '印第安纳州', '4200018', 'US', 'IN'),
-(1100, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '爱荷华州', '4200019', 'US', 'IA'),
-(1101, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '堪萨斯州', '4200020', 'US', 'KS'),
-(1102, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '肯塔基州', '4200021', 'US', 'KY'),
-(1103, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '路易斯安那州', '4200022', 'US', 'LA'),
-(1104, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '缅因州', '4200023', 'US', 'ME'),
-(1105, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '马绍尔群岛', '4200024', 'US', 'MH'),
-(1106, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '马里兰州', '4200025', 'US', 'MD'),
-(1107, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '马萨诸塞州', '4200026', 'US', 'MA'),
-(1108, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '密歇根州', '4200027', 'US', 'MI'),
-(1109, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '明尼苏达州', '4200028', 'US', 'MN'),
-(1110, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '密西西比州', '4200029', 'US', 'MS'),
-(1111, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '密苏里州', '4200030', 'US', 'MO'),
-(1112, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '蒙大纳州', '4200031', 'US', 'MT'),
-(1113, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '内布拉斯加州', '4200032', 'US', 'NE'),
-(1114, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '内华达州', '4200033', 'US', 'NV'),
-(1115, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '新罕布什尔州', '4200034', 'US', 'NH'),
-(1116, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '新泽西州', '4200035', 'US', 'NJ'),
-(1117, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '新墨西哥州', '4200036', 'US', 'NM'),
-(1118, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '纽约州', '4200037', 'US', 'NY'),
-(1119, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '北卡罗来纳州', '4200038', 'US', 'NC'),
-(1120, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '北达科他州', '4200039', 'US', 'ND'),
-(1121, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '北马里亚纳群岛', '4200040', 'US', 'MP'),
-(1122, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '俄亥俄州', '4200041', 'US', 'OH'),
-(1123, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '俄克拉何马州', '4200042', 'US', 'OK'),
-(1124, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '俄勒冈州', '4200043', 'US', 'OR'),
-(1125, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '帕劳群岛', '4200044', 'US', 'PW'),
-(1126, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '宾夕法尼亚州', '4200045', 'US', 'PA'),
-(1127, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '波多黎各', '4200046', 'US', 'PR'),
-(1128, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '罗得岛州', '4200047', 'US', 'RI'),
-(1129, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '南卡罗来纳州', '4200048', 'US', 'SC'),
-(1130, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '南达科他州', '4200049', 'US', 'SD'),
-(1131, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '田纳西州', '4200050', 'US', 'TN'),
-(1132, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '得克萨斯州', '4200051', 'US', 'TX'),
-(1133, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '犹他州', '4200052', 'US', 'UT'),
-(1134, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '佛蒙特州', '4200053', 'US', 'VT'),
-(1135, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '美属维尔京群岛', '4200054', 'US', 'VI'),
-(1136, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '弗吉尼亚州', '4200055', 'US', 'VA'),
-(1137, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '华盛顿州', '4200056', 'US', 'WA'),
-(1138, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '西弗吉尼亚州', '4200057', 'US', 'WV'),
-(1139, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '威斯康星州', '4200058', 'US', 'WI'),
-(1140, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '怀俄明州', '4200059', 'US', 'WY'),
-(1141, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '美洲军事', '4200060', 'US', 'AA'),
-(1142, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '欧洲军事', '4200061', 'US', 'AE'),
-(1143, 1081, '', '', NULL, NULL, NULL, NULL, NULL, '太平洋军事', '4200062', 'US', 'AP'),
+(1081, 1080, '', '', NULL, 'United States of America', 'US', 'https://cdn.myshopline.com/country/icon/US.png', '{\"de\":{\"name\":\"USA\",\"language\":\"de\"},\"zh-hant-tw\":{\"name\":\"美國\",\"language\":\"zh-hant-tw\"},\"hi\":{\"name\":\"अमेरिका\",\"language\":\"hi\"},\"ru\":{\"name\":\"Соединенные Штаты\",\"language\":\"ru\"},\"fi\":{\"name\":\"Amerikka\",\"language\":\"fi\"},\"pt\":{\"name\":\"Estados Unidos\",\"language\":\"pt\"},\"bg\":{\"name\":\"Америка\",\"language\":\"bg\"},\"zh-hans-cn\":{\"name\":\"美国\",\"language\":\"zh-hans-cn\"},\"lt\":{\"name\":\"Amerika\",\"language\":\"lt\"},\"lv\":{\"name\":\"Amerika\",\"language\":\"lv\"},\"hr\":{\"name\":\"Amerika\",\"language\":\"hr\"},\"fr\":{\"name\":\"États-Unis\",\"language\":\"fr\"},\"hu\":{\"name\":\"Amerika\",\"language\":\"hu\"},\"sk\":{\"name\":\"Amerika\",\"language\":\"sk\"},\"sl\":{\"name\":\"Amerika\",\"language\":\"sl\"},\"id\":{\"name\":\"Amerika Serikat\",\"language\":\"id\"},\"sv\":{\"name\":\"Amerika\",\"language\":\"sv\"},\"ko\":{\"name\":\"미국\",\"language\":\"ko\"},\"ms\":{\"name\":\"Amerika\",\"language\":\"ms\"},\"el\":{\"name\":\"Αμερική\",\"language\":\"el\"},\"en\":{\"name\":\"United States\",\"language\":\"en\"},\"it\":{\"name\":\"stati Uniti\",\"language\":\"it\"},\"es\":{\"name\":\"Estados Unidos\",\"language\":\"es\"},\"et\":{\"name\":\"Ameerika\",\"language\":\"et\"},\"cs\":{\"name\":\"Amerika\",\"language\":\"cs\"},\"vi\":{\"name\":\"Châu mỹ\",\"language\":\"vi\"},\"th\":{\"name\":\"สหรัฐอเมริกา\",\"language\":\"th\"},\"nb\":{\"name\":\"Amerika\",\"language\":\"nb\"},\"ja\":{\"name\":\"アメリカ合衆国\",\"language\":\"ja\"},\"pl\":{\"name\":\"Stany Zjednoczone\",\"language\":\"pl\"},\"ro\":{\"name\":\"America\",\"language\":\"ro\"},\"da\":{\"name\":\"Amerika\",\"language\":\"da\"},\"nl\":{\"name\":\"Verenigde Staten\",\"language\":\"nl\"},\"tr\":{\"name\":\"Amerika\",\"language\":\"tr\"}}', NULL, NULL, NULL, NULL),
+(1082, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Alabama', '4200001', 'US', 'AL'),
+(1083, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Alaska', '4200002', 'US', 'AK'),
+(1084, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'American Samoa', '4200003', 'US', 'AS'),
+(1085, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Arizona', '4200004', 'US', 'AZ'),
+(1086, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Arkansas', '4200005', 'US', 'AR'),
+(1087, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'California', '4200006', 'US', 'CA'),
+(1088, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Colorado', '4200007', 'US', 'CO'),
+(1089, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Connecticut', '4200008', 'US', 'CT'),
+(1090, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Delaware', '4200009', 'US', 'DE'),
+(1091, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Washington, D.C.', '4200010', 'US', 'DC'),
+(1092, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Micronesia', '4200011', 'US', 'FM'),
+(1093, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Florida', '4200012', 'US', 'FL'),
+(1094, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Georgia', '4200013', 'US', 'GA'),
+(1095, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Guam', '4200014', 'US', 'GU'),
+(1096, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Hawaii', '4200015', 'US', 'HI'),
+(1097, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Idaho', '4200016', 'US', 'ID'),
+(1098, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Illinois', '4200017', 'US', 'IL'),
+(1099, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Indiana', '4200018', 'US', 'IN'),
+(1100, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Iowa', '4200019', 'US', 'IA'),
+(1101, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Kansas', '4200020', 'US', 'KS'),
+(1102, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Kentucky', '4200021', 'US', 'KY'),
+(1103, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Louisiana', '4200022', 'US', 'LA'),
+(1104, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Maine', '4200023', 'US', 'ME'),
+(1105, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Marshall Islands', '4200024', 'US', 'MH'),
+(1106, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Maryland', '4200025', 'US', 'MD'),
+(1107, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Massachusetts', '4200026', 'US', 'MA'),
+(1108, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Michigan', '4200027', 'US', 'MI'),
+(1109, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Minnesota', '4200028', 'US', 'MN'),
+(1110, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Mississippi', '4200029', 'US', 'MS'),
+(1111, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Missouri', '4200030', 'US', 'MO'),
+(1112, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Montana', '4200031', 'US', 'MT'),
+(1113, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Nebraska', '4200032', 'US', 'NE'),
+(1114, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Nevada', '4200033', 'US', 'NV'),
+(1115, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'New Hampshire', '4200034', 'US', 'NH'),
+(1116, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'New Jersey', '4200035', 'US', 'NJ'),
+(1117, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'New Mexico', '4200036', 'US', 'NM'),
+(1118, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'New York', '4200037', 'US', 'NY'),
+(1119, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'North Carolina', '4200038', 'US', 'NC'),
+(1120, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'North Dakota', '4200039', 'US', 'ND'),
+(1121, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Northern Mariana Islands', '4200040', 'US', 'MP'),
+(1122, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Ohio', '4200041', 'US', 'OH'),
+(1123, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Oklahoma', '4200042', 'US', 'OK'),
+(1124, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Oregon', '4200043', 'US', 'OR'),
+(1125, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Palau', '4200044', 'US', 'PW'),
+(1126, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Pennsylvania', '4200045', 'US', 'PA'),
+(1127, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Puerto Rico', '4200046', 'US', 'PR'),
+(1128, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Rhode Island', '4200047', 'US', 'RI'),
+(1129, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'South Carolina', '4200048', 'US', 'SC'),
+(1130, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'South Dakota', '4200049', 'US', 'SD'),
+(1131, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Tennessee', '4200050', 'US', 'TN'),
+(1132, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Texas', '4200051', 'US', 'TX'),
+(1133, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Utah', '4200052', 'US', 'UT'),
+(1134, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Vermont', '4200053', 'US', 'VT'),
+(1135, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Virgin Islands', '4200054', 'US', 'VI'),
+(1136, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Virginia', '4200055', 'US', 'VA'),
+(1137, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Washington', '4200056', 'US', 'WA'),
+(1138, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'West Virginia', '4200057', 'US', 'WV'),
+(1139, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Wisconsin', '4200058', 'US', 'WI'),
+(1140, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'Wyoming', '4200059', 'US', 'WY'),
+(1141, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'USA global military base', '4200060', 'US', 'AA'),
+(1142, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'USA europe military base', '4200061', 'US', 'AE'),
+(1143, 1081, '', '', NULL, NULL, NULL, NULL, NULL, 'USA pacific military base', '4200062', 'US', 'AP'),
 (1144, 1080, '', '', NULL, '加拿大', 'CA', 'https://cdn.myshopline.com/country/icon/CA.png', '{\"de\":{\"name\":\"Kanada\",\"language\":\"de\"},\"zh-hant-tw\":{\"name\":\"加拿大\",\"language\":\"zh-hant-tw\"},\"hi\":{\"name\":\"कनाडा\",\"language\":\"hi\"},\"ru\":{\"name\":\"Канада\",\"language\":\"ru\"},\"fi\":{\"name\":\"Kanada\",\"language\":\"fi\"},\"pt\":{\"name\":\"Canadá\",\"language\":\"pt\"},\"bg\":{\"name\":\"Канада\",\"language\":\"bg\"},\"zh-hans-cn\":{\"name\":\"加拿大\",\"language\":\"zh-hans-cn\"},\"lt\":{\"name\":\"Kanada\",\"language\":\"lt\"},\"lv\":{\"name\":\"Kanāda\",\"language\":\"lv\"},\"hr\":{\"name\":\"Kanada\",\"language\":\"hr\"},\"fr\":{\"name\":\"Canada\",\"language\":\"fr\"},\"hu\":{\"name\":\"Kanada\",\"language\":\"hu\"},\"sk\":{\"name\":\"Kanada\",\"language\":\"sk\"},\"sl\":{\"name\":\"Kanada\",\"language\":\"sl\"},\"id\":{\"name\":\"Kanada\",\"language\":\"id\"},\"sv\":{\"name\":\"Kanada\",\"language\":\"sv\"},\"ko\":{\"name\":\"캐나다\",\"language\":\"ko\"},\"ms\":{\"name\":\"Kanada\",\"language\":\"ms\"},\"el\":{\"name\":\"Καναδάς\",\"language\":\"el\"},\"en\":{\"name\":\"Canada\",\"language\":\"en\"},\"it\":{\"name\":\"Canada\",\"language\":\"it\"},\"es\":{\"name\":\"Canadá\",\"language\":\"es\"},\"et\":{\"name\":\"Kanada\",\"language\":\"et\"},\"cs\":{\"name\":\"Kanada\",\"language\":\"cs\"},\"vi\":{\"name\":\"Canada\",\"language\":\"vi\"},\"th\":{\"name\":\"แคนาดา\",\"language\":\"th\"},\"nb\":{\"name\":\"Canada\",\"language\":\"nb\"},\"ja\":{\"name\":\"カナダ\",\"language\":\"ja\"},\"pl\":{\"name\":\"Kanada\",\"language\":\"pl\"},\"ro\":{\"name\":\"Canada\",\"language\":\"ro\"},\"da\":{\"name\":\"Canada\",\"language\":\"da\"},\"nl\":{\"name\":\"Canada\",\"language\":\"nl\"},\"tr\":{\"name\":\"Kanada\",\"language\":\"tr\"}}', NULL, NULL, NULL, NULL),
 (1145, 1144, '', '', NULL, NULL, NULL, NULL, NULL, '阿尔伯塔省', '1700001', 'CA', 'AB'),
 (1146, 1144, '', '', NULL, NULL, NULL, NULL, NULL, '不列颠哥伦比亚省', '1700002', 'CA', 'BC'),
@@ -21493,6 +21499,7 @@ CREATE TABLE `mall_sales_order_status` (
 CREATE TABLE `mall_scats` (
   `cid` bigint(20) NOT NULL COMMENT '标准类目ID',
   `name` varchar(255) NOT NULL COMMENT '标准类目名称',
+  `deduction_ratio` decimal(10,2) DEFAULT NULL COMMENT '扣点比例',
   `parent_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '父级类目ID'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -21500,17 +21507,17 @@ CREATE TABLE `mall_scats` (
 -- 转存表中的数据 `mall_scats`
 --
 
-INSERT INTO `mall_scats` (`cid`, `name`, `parent_id`) VALUES
-(16, '女装/女士精品', 0),
-(21, '居家日用', 0),
-(30, '男装', 0),
-(50002766, '零食/坚果/特产', 0),
-(50006843, '女鞋', 0),
-(50008141, '酒类', 0),
-(50008165, '童装/婴儿装/亲子装', 0),
-(50010788, '彩妆/香水/美妆工具', 0),
-(50011740, '流行男鞋', 0),
-(122650005, '童鞋/婴儿鞋/亲子鞋', 0);
+INSERT INTO `mall_scats` (`cid`, `name`, `deduction_ratio`, `parent_id`) VALUES
+(16, '女装/女士精品', NULL, 0),
+(21, '居家日用', NULL, 0),
+(30, '男装', NULL, 0),
+(50002766, '零食/坚果/特产', NULL, 0),
+(50006843, '女鞋', NULL, 0),
+(50008141, '酒类', NULL, 0),
+(50008165, '童装/婴儿装/亲子装', NULL, 0),
+(50010788, '彩妆/香水/美妆工具', NULL, 0),
+(50011740, '流行男鞋', NULL, 0),
+(122650005, '童鞋/婴儿鞋/亲子鞋', NULL, 0);
 
 -- --------------------------------------------------------
 
@@ -22147,6 +22154,21 @@ CREATE TABLE `mall_warehouse_priority_shipping` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `mall_warehouse_region_delivery`
+--
+
+CREATE TABLE `mall_warehouse_region_delivery` (
+  `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
+  `shop_id` bigint(20) NOT NULL COMMENT '所属店铺',
+  `warehouse_id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
+  `country_code` varchar(2) NOT NULL COMMENT '国家代码',
+  `status` tinyint(4) NOT NULL COMMENT '状态 默认: 0启用,1关闭',
+  `create_time` datetime NOT NULL COMMENT '数据创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='仓库配送区域表';
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `mall_warehouse_stock`
 --
@@ -28155,7 +28177,16 @@ ALTER TABLE `mall_warehouse`
 --
 ALTER TABLE `mall_warehouse_priority_shipping`
   ADD PRIMARY KEY (`id`),
-  ADD UNIQUE KEY `mall_warehouse_priority_shipping_UN` (`shop_id`,`weight`);
+  ADD UNIQUE KEY `mall_warehouse_priority_shipping_pk` (`shop_id`,`warehouse_id`),
+  ADD KEY `mall_warehouse_priority_shipping_shop_id_weight_index` (`shop_id`,`weight`);
+
+--
+-- 表的索引 `mall_warehouse_region_delivery`
+--
+ALTER TABLE `mall_warehouse_region_delivery`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `mall_warehouse_region_delivery_pk` (`shop_id`,`country_code`,`warehouse_id`),
+  ADD KEY `mall_warehouse_region_delivery_shop_id_country_code_status_index` (`shop_id`,`country_code`,`status`);
 
 --
 -- 表的索引 `mall_warehouse_stock`
@@ -29098,6 +29129,12 @@ ALTER TABLE `mall_uploads`
 ALTER TABLE `mall_warehouse_priority_shipping`
   MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
 
+--
+-- 使用表AUTO_INCREMENT `mall_warehouse_region_delivery`
+--
+ALTER TABLE `mall_warehouse_region_delivery`
+  MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
+
 --
 -- 使用表AUTO_INCREMENT `mall_warehouse_stock`
 --