vault backup: 2025-04-16 09:26:50

Affected files:
.obsidian/community-plugins.json
.obsidian/core-plugins.json
.obsidian/plugins/dbfolder/main.js
.obsidian/plugins/dbfolder/manifest.json
.obsidian/plugins/dbfolder/styles.css
.obsidian/plugins/obsidian-quiet-outline/main.js
.obsidian/plugins/obsidian-quiet-outline/manifest.json
.obsidian/plugins/obsidian-quiet-outline/styles.css
.obsidian/plugins/obsidian-style-settings/data.json
.obsidian/plugins/obsidian-style-settings/main.js
.obsidian/plugins/obsidian-style-settings/manifest.json
.obsidian/plugins/obsidian-style-settings/styles.css
.obsidian/plugins/obsidian-tasks-plugin/data.json
.obsidian/plugins/obsidian-tasks-plugin/main.js
.obsidian/plugins/obsidian-tasks-plugin/manifest.json
.obsidian/plugins/obsidian-tasks-plugin/styles.css
.obsidian/themes/Blue Topaz.css
.obsidian/themes/Blue Topaz/manifest.json
.obsidian/themes/Blue Topaz/theme.css
.obsidian/themes/California Coast.css
.obsidian/themes/Everforest.css
.obsidian/themes/Minimal/manifest.json
.obsidian/themes/Minimal/theme.css
.obsidian/themes/Primary.css
.obsidian/themes/Primary/manifest.json
.obsidian/themes/Primary/theme.css
.obsidian/themes/Prism/manifest.json
.obsidian/themes/Prism/theme.css
.obsidian/themes/Sanctum.css
.obsidian/themes/Sanctum/manifest.json
.obsidian/themes/Sanctum/theme.css
.obsidian/themes/Simply Colorful/manifest.json
.obsidian/themes/Simply Colorful/theme.css
.obsidian/themes/Things.css
.obsidian/themes/Things/manifest.json
.obsidian/themes/Things/theme.css
.obsidian/types.json
Haina/Daily/2023-09-26.md
Haina/Templates/W-log.md
Haina/Weekly/2024/2024-W33.md
Haina/Weekly/2024/2024-W45.md
Haina/Weekly/2025/2025-W07.md
Haina/Weekly/2025/2025-W08.md
Haina/Weekly/2025/2025-W09.md
Haina/Weekly/2025/2025-W10.md
Haina/Weekly/2025/2025-W11.md
Haina/Weekly/2025/2025-W12.md
Haina/Weekly/2025/2025-W13.md
Haina/Weekly/2025/2025-W14.md
Haina/Weekly/2025/2025-W15.md
Haina/Weekly/2025/2025-W16.md
Haina/Weekly/2025/2025-W17.md
Haina/分享&培训/-杨婷.md
Haina/分享&培训/-罗盛推.md
Haina/分享&培训/Nodejs VS Python.md
Haina/分享&培训/面试.md
Haina/项目/AI/atta/Pasted image 20250309235657.png
Haina/项目/AI/阿里云百炼.md
Haina/项目/GHH/价格平台/WebHT 二期.md
Haina/项目/HT数据分析/CT商旅数据统计.md
Haina/项目/HT数据分析/atta/Pasted image 20250310142149.png
Haina/项目/SCRM/Sales CRM 2.0.md
Haina/项目/Trip Planner/flowchart.md
Haina/项目/Trip Planner/prompt sales-7.md
Haina/项目/Trip Planner/流程.md
Haina/项目/支付中心/PayPal.md
Haina/项目/支付中心/Wxpay.md
Haina/项目/支付中心/atta/lQDPKGKlP0-J60vNBaDNB4CwZS-YyMJpe_4HrWnfOiU-AA_1920_1440.jpg
Haina/项目/支付中心/atta/lQDPKdPhCAWlo4vNBaDNB4CwWuFFgJU24E0HrWoFutE8AA_1920_1440.jpg
Haina/项目/支付中心/atta/lQLPJw8dv5ySusPNAV7NA8uwek4kWToQUq4Hqa0F3J8sAA_971_350.png
Haina/项目/支付中心/atta/lQLPJx3uV1Cs3YPNAtPNA7ewuLwP2tFVX-MHqbZasIOdAA_951_723.png
Haina/项目/支付中心/连连-支付方式.md
Haina/项目/支付中心/连连支付.md

.obsidian/community-plugins.json

@@ -1,6 +1,5 @@
 [
   "obsidian-style-settings",
-  "table-editor-obsidian",
   "obsidian-quiet-outline",
   "obsidian-enhancing-mindmap",
   "obsidian-auto-link-title",
@@ -11,14 +10,11 @@
   "obsidian-enhancing-export",
   "obsidian-git",
   "obsidian-pandoc",
-  "dbfolder",
   "dataview",
   "templater-obsidian",
   "calendar",
   "obsidian-tasks-plugin",
   "periodic-notes",
-  "advanced-cursors",
   "obsidian-excalidraw-plugin",
-  "text-snippets-obsidian",
+  "text-snippets-obsidian"
-  "obsidian-list-callouts"
 ]

.obsidian/core-plugins.json

@@ -27,5 +27,6 @@
   "sync": false,
   "canvas": true,
   "bookmarks": true,
-  "properties": true
+  "properties": true,
+  "webviewer": false
 }

.obsidian/plugins/dbfolder/manifest.json

@@ -1,11 +1,12 @@
 {
 	"id": "dbfolder",
 	"name": "DB Folder",
-	"version": "3.5.0",
+	"version": "3.5.1",
 	"minAppVersion": "1.1.1",
 	"description": "Folder with the capability to store and retrieve data from a folder like database",
 	"author": "RafaelGB",
 	"authorUrl": "https://github.com/RafaelGB/obsidian-bd-folder",
 	"isDesktopOnly": false,
-	"fundingUrl": "https://www.buymeacoffee.com/5tsytn22v9Z"
+	"fundingUrl": "https://www.buymeacoffee.com/5tsytn22v9Z",
+	"helpUrl": "https://rafaelgb.github.io/obsidian-db-folder/"
 }

.obsidian/plugins/dbfolder/styles.css

@@ -244,6 +244,7 @@ div.database-plugin__td.data-input span:focus {
 .database-plugin__markdown-preview-view {
   padding: 0;
   height: fit-content;
+  scrollbar-gutter: auto;
 }
 
 .svg-icon-sm svg {

.obsidian/plugins/obsidian-quiet-outline/manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-quiet-outline",
     "name": "Quiet Outline",
-    "version": "0.3.17",
+    "version": "0.3.40",
     "minAppVersion": "0.15.6",
     "description": "Make outline quiet and more powerful, including no-auto-expand, rendering heading as markdown, and search support.",
     "author": "the_tree",

.obsidian/plugins/obsidian-quiet-outline/styles.css

@@ -102,9 +102,14 @@
 .n-tree.n-tree--block-line .n-tree-node:not(.n-tree-node--disabled).n-tree-node--selected {
   background-color: transparent !important;
 }
+.view-content:has(.quiet-outline) {
+  padding-bottom: 0px;
+}
+.quiet-outline .n-tree.n-tree--block-node.n-tree--block-line {
+  padding-bottom: var(--size-4-8);
+}
 .quiet-outline {
   height: 100%;
-  padding-bottom: 24px;
 }
 .quiet-outline #container {
   height: 100%;
@@ -120,6 +125,12 @@
 .n-tree__empty {
   display: none;
 }
+.canvas-node .markdown-embed-content .is-flashing {
+  mix-blend-mode: normal;
+}
+.quiet-outline .n-tree .n-tree-node-content :is(p, h1, h2, h3, h4, h5) {
+  unicode-bidi: plaintext;
+}
 
 /* main.css */
 .quiet-outline .n-tree .n-tree-node-indent {
@@ -155,5 +166,16 @@
 .n-tree-node.located p {
   color: var(--8de97876-locatedColor);
 }
+.quiet-outline .n-tree .n-tree-node .n-tree-node-content .n-tree-node-content__prefix {
+  margin-right: 0;
+}
+.quiet-outline .n-tree .n-tree-node .n-tree-node-content .n-tree-node-content__prefix > *:last-child {
+  margin-right: 8px;
+}
+.n-tree-node-switcher__icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 
 /* src/main.css */

.obsidian/plugins/obsidian-style-settings/data.json

@@ -1,10 +1,8 @@
 {
   "blue-topaz-theme@@color-scheme-options": "color-scheme-options-topaz-nord",
-  "sanctum@@light-mode-palette": "sanctum-coldgrey",
   "Yin and Yang@@l-accent": "#AE99C7",
   "Yin and Yang@@d-accent": "#AE99C7",
   "blue-topaz-theme@@hide-titlebar-text": true,
-  "blue-topaz-theme@@hide-vault-name": true,
   "blue-topaz-theme@@background-image-settings-switch": true,
   "blue-topaz-theme@@blockquote-style-change-options": "blockquote-style-default",
   "blue-topaz-theme@@show-url-after-link": true,
@@ -16,9 +14,29 @@
   "blue-topaz-theme@@colorful-unordered-list": true,
   "blue-topaz-theme@@colorful-ordered-list": true,
   "blue-topaz-theme@@list-spacing-bt": 3,
-  "blue-topaz-theme@@transparent-setting-panel": false,
-  "blue-topaz-theme@@line-width-readable": 80,
   "blue-topaz-theme@@layout-style-options": "layout-style-options-default",
   "blue-topaz-theme@@view-button-front": true,
-  "blue-topaz-theme@@font-family-change-to-default": false
+  "blue-topaz-theme@@font-family-change-to-default": false,
+  "light-and-bright-theme@@light-theme-settings": "theme-default",
+  "primary-theme@@interface_editor-bg": "editor-bg-default",
+  "blue-topaz-theme@@background-settings-workplace-background-image": true,
+  "blue-topaz-theme@@toggle-nonoverlapping-bg": false,
+  "blue-topaz-theme@@toggle-bg-panel-page": false,
+  "blue-topaz-theme@@background-settings-workplace-theme-light": "background-settings-workplace-waves-light",
+  "sanctum@@color-accent-rgb-l": "165, 119, 218",
+  "sanctum@@active-line-accent": "rgba(var(--color-accent-rgb), .3)",
+  "sanctum@@light-mode-contrast-mode": "sanctum-default-light",
+  "sanctum@@heading-outline": "#",
+  "obsidian-prism-theme@@color-schemes-lt": "pt-color-scheme-latte-lt",
+  "obsidian-prism-theme@@color-scheme-style-lt": "pt-color-scheme-style-minimal-lt",
+  "obsidian-prism-theme@@accent-style-lt": "pt-accent-style-filled-lt",
+  "blue-topaz-theme@@file-bg-shape-option": "file-shape-default",
+  "blue-topaz-theme@@folder-style-change-options-colorful": "folder-style-change-options-colorful-tab-liked",
+  "blue-topaz-theme@@folder-style-change-options-colorful-subfolder": "folder-colorful-six",
+  "blue-topaz-theme@@enable-alternative-checkboxes": false,
+  "blue-topaz-theme@@circular-checkbox": false,
+  "blue-topaz-theme@@bt-connected-indent-hover": false,
+  "blue-topaz-theme@@blur-depth": 10,
+  "blue-topaz-theme@@brightness-4-bg": 0.9,
+  "blue-topaz-theme@@saturate-4-bg": 1
 }

.obsidian/plugins/obsidian-style-settings/manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-style-settings",
 	"name": "Style Settings",
-	"version": "1.0.7",
+	"version": "1.0.9",
 	"minAppVersion": "0.11.5",
 	"description": "Offers controls for adjusting theme, plugin, and snippet CSS variables.",
 	"author": "mgmeyers",

.obsidian/plugins/obsidian-tasks-plugin/data.json

@@ -86,7 +86,7 @@
         "name": "quote",
         "nextStatusSymbol": " ",
         "availableAsCommand": false,
-        "type": "DONE"
+        "type": "TODO"
       },
       {
         "symbol": "l",

.obsidian/plugins/obsidian-tasks-plugin/manifest.json

@@ -1,11 +1,11 @@
 {
   "id": "obsidian-tasks-plugin",
   "name": "Tasks",
-  "version": "7.6.1",
+  "version": "7.18.5",
-  "minAppVersion": "1.1.1",
+  "minAppVersion": "1.4.0",
   "description": "Track tasks across your vault. Supports due dates, recurring tasks, done dates, sub-set of checklist items, and filtering.",
   "helpUrl": "https://publish.obsidian.md/tasks/",
-  "author": "Martin Schenck and Clare Macrae",
+  "author": "Clare Macrae and Ilyas Landikov (created by Martin Schenck)",
   "authorUrl": "https://github.com/obsidian-tasks-group",
   "fundingUrl": "https://github.com/sponsors/claremacrae",
   "isDesktopOnly": false

.obsidian/themes/Blue Topaz/manifest.json

@@ -1,7 +1,7 @@
 {
-   "name": "Blue Topaz",  
+    "name": "Blue Topaz",
-   "version": "20221016",  
+    "version": "2024121301",
-   "minAppVersion": "1.0.0",  
+    "minAppVersion": "1.0.0",
-   "author": "WhyI",  
+    "author": "WhyI & Pkmer",
-   "authorUrl": "https://github.com/whyt-byte"  
+    "authorUrl": "https://github.com/whyt-byte"
 }

.obsidian/themes/Everforest.css

@@ -1,673 +0,0 @@
-/***** TABLE OF CONTENTS *****/
-/* TODO: Reformat entire CSS file as below.
-/* 1. Font
-/* 2. Colours
-/*     2.1. Dark theme color variables
-/*     2.2. Light theme color variables
-/*     2.3. Dark theme implementation
-/*     2.4. Light theme implementation
-/* 3. General UI
-/*     3.1. Title Bar
-/* 4. Markdown (editor / preview)
-/*     4.1. Headings
-/*         4.1.1. Fix font weights
-/*     4.2. Links
-/*         4.2.1. Nifty arrow before internal links (also applies to embeds)
-/*     4.3. Embeds
-/*     4.4. Tables
-/*     4.5. Popovers
-/*     4.6. Task Lists
-/*     4.7. Blockquotes
-/*     4.8. Code
-/*     4.9. Bulleted lists
-/*     4.10. Misc Fixes
-/* 5. Graph view colours
-/* 6. Notion Colour Blocks
-/* 7. In-document header (scrolls with the document) [remove for compatibility with Andy's mode]
-/*     7.1. Adjustments for non-in-document headers (graphs, etc)\
-/*     7.2. Active pane border 
-/*     7.3. Misc fixes
-/* 8. Tags
-/*     8.1. Tag custom colours
-/***** *****/
-
-/* 1. Font */
-body {
-    /* font stacks taken directly from Notion */
-    --font-monospace: "Hack Nerd Font", "Source Code Pro", monospace;
-    -webkit-font-smoothing: auto;
-}
-
-/* 2. Colours */
-:root
-{
-    /* 2.1 Dark theme color variables */
-    --bg0-dark:       #22282c;
-    --bg1-dark:       #272f34;
-    --bg-dark:        #2f383e;
-    --bg2-dark:       #374247;
-    --bg3-dark:       #404c51;
-    --bg4-dark:       #4a555b;
-    --bg5-dark:       #525c62;
-    --bg_visual:      #503946;
-    --bg_red:         #4e3e43;
-    --bg_green:       #404d44;
-    --bg_blue:        #394f5a;
-    --bg_yellow:      #4a4940;
-    --shadow:         #00000070;
-
-    --fg-dark:        #d3c6aa;
-    --grey0-dark:     #7f897d;
-    --grey1-dark:     #859289;
-    --grey2-dark:     #9aa79d;
-
-    --faded-red:     #e67e80;
-    --faded-orange:  #e69875;
-    --faded-yellow:  #dbbc7f;
-    --faded-green:   #a7c080;
-    --faded-aqua:    #83c092;
-    --faded-blue:    #7fbbb3;
-    --faded-purple:  #d699b6;
-
-    --dim-red:       #da6362;
-    --dim-orange:    #d77f48;
-    --dim-yellow:    #bf983d;
-    --dim-green:     #899c40;
-    --dim-aqua:      #569d79;
-    --dim-blue:      #5a93a2;
-    --dim-purple:    #b87b9d;
-
-
-    /* 2.2 Light theme color variables */
-    --bg0-light:     #f0edd8;
-    --bg1-light:     #f6f1dd;
-    --bg-light:      #fdf6e3;
-    --bg2-light:     #f3efda;
-    --bg3-light:     #edead5;
-    --bg4-light:     #e4e1cd;
-    --bg5-light:     #dfdbc8;
-    --grey0-light:   #a4ad9e;
-    --grey1-light:   #939f91;
-    --grey2-light:   #879686;
-    --shadow-light:  #3c474d20;
-
-
-    --bg_visual_light:      #eaedc8;
-    --bg_red_light:         #fbe3da;
-    --bg_green_light:       #f0f1d2;
-    --bg_blue_light:        #e9f0e9;
-    --bg_yellow_light:      #faedcd;
-
-    --fg-light:       #5c6a72;
-    
-    --light-red:     #f85552;
-    --light-orange:  #f57d26;
-    --light-yellow:  #bf983d;
-    --light-green:   #899c40;
-    --light-aqua:    #569d79;
-    --light-blue:    #5a93a2;
-    --light-purple:  #b87b9d;
-
-    --light-dim-red:    #f1706f;
-    --light-dim-orange: #f39459;
-    --light-dim-yellow: #e4b649;
-    --light-dim-green:  #a4bb4a;
-    --light-dim-aqua:   #6ec398;
-    --light-dim-blue:   #6cb3c6;
-    --light-dim-purple: #e092be;
-
-
-}
-
-/* 2.3 Dark theme implementation */
-.theme-dark
-{
-    --background-primary:         var(--bg-dark);
-    --background-primary-alt:     var(--bg-dark);
-    --background-secondary:       var(--bg-dark);
-    --background-secondary-alt:   var(--bg-dark);
-    --text-normal:                var(--fg-dark);
-    --text-faint:                 var(--grey1-dark);
-    --text-title-h1:              var(--dim-red);
-    --text-title-h2:              var(--dim-orange);
-    --text-title-h3:              var(--dim-yellow);
-    --text-title-h4:              var(--dim-green);
-    --text-title-h5:              var(--dim-aqua);
-    --text-title-h6:              var(--dim-purple);
-    --text-link:                  var(--faded-blue);
-    --text-a:                     var(--dim-aqua);
-    --text-a-hover:               var(--faded-aqua);
-    --text-mark:                  rgba(215, 153, 33, 0.4); /* light-yellow */
-    --pre-code:                   var(--bg1-dark);
-    --text-highlight-bg:          var(--bg_green);
-    --interactive-accent:         var(--dim-aqua);
-    --interactive-before:         var(--bg5-dark);
-    --background-modifier-border: var(--bg5-dark);
-    --text-accent:                var(--dim-blue);
-    --interactive-accent-rgb:     var(--dim-blue);
-    --inline-code:                var(--dim-blue);
-    --code-block:                 var(--fg-dark);
-    --vim-cursor:                 var(--faded-blue);
-    --text-selection:             var(--bg5-dark);
-}
-
-/* 2.4 Light theme implementation */
-.theme-light
-{
-    --background-primary:         var(--bg-light);
-    --background-primary-alt:     var(--bg-light);
-    --background-secondary:       var(--bg-light);
-    --background-secondary-alt:   var(--bg-light);
-    --text-normal:                var(--fg-light);
-    --text-faint:                 var(--grey1-light);
-    --text-title-h1:              var(--light-red);
-    --text-title-h2:              var(--light-orange);
-    --text-title-h3:              var(--light-yellow);
-    --text-title-h4:              var(--light-green);
-    --text-title-h5:              var(--light-aqua);
-    --text-title-h6:              var(--light-purple);
-    --text-link:                  var(--light-blue);
-    --text-a:                     var(--light-dim-blue);
-    --text-a-hover:               var(--light-blue);
-    --text-mark:                  rgba(215, 153, 33, 0.4); /* light-yellow */
-    --pre-code:                   var(--bg1-light);
-    --text-highlight-bg:          var(--light-dim-green);
-    --interactive-accent:         var(--bg5-light);
-    --interactive-before:         var(--bg5-light);
-    --background-modifier-border: var(--bg5-light);
-    --text-accent:                var(--bg5-light);
-    --interactive-accent-rgb:     var(--light-dim-green);
-    --inline-code:                var(--light-blue);
-    --code-block:                 var(--fg-light);
-    --vim-cursor:                 var(--light-blue);
-    --text-selection:             rgba(189, 174, 147, 0.5); /* light3 */
-}
-
-.theme-dark code[class*="language-"],
-.theme-dark pre[class*="language-"],
-.theme-light code[class*="language-"],
-.theme-light pre[class*="language-"]
-{
-    text-shadow: none ;
-    background-color: var(--pre-code) ;
-}
-
-/* 3. General UI */
-.view-header-title {
-    font-weight: 700;
-  }
-  
-  /* 3.1. Title bar */
-  .titlebar {
-    background-color: var(--background-secondary-alt);
-  }
-  
-  .titlebar-inner {
-    color: var(--text-normal);
-  }
-
-.graph-view.color-circle,
-.graph-view.color-fill-highlight,
-.graph-view.color-line-highlight
-{
-    color: var(--interactive-accent-rgb) ;
-}
-.graph-view.color-text
-{
-    color: var(--text-a-hover) ;
-}
-/*
-.graph-view.color-fill
-{
-    color: var(--background-secondary);
-}
-.graph-view.color-line
-{
-  color: var(--background-modifier-border);
-}
-*/
-
-html,
-body
-{
-    font-size: 16px ;
-}
-
-strong
-{
-    font-weight: 600 ;
-}
-
-a,
-.cm-hmd-internal-link
-{
-    color: var(--text-a) ;
-    text-decoration: none ;
-}
-
-a:hover,
-.cm-hmd-internal-link:hover,
-.cm-url
-{
-    color: var(--text-a-hover) ;
-    text-decoration: none ;
-}
-
-
-/*----------------------------------------------------------------
-TAGS
-----------------------------------------------------------------*/
-
-.token.tag {
-    padding: 0px 0px;
-    background-color: transparent;
-    border: none;
-  }
-  
-  .token.tag:hover {
-    background: transparent;
-    color: var(--text-a-hover) !important;
-  }
-  
-  /*----------------------------------------------------------------
-  TAG PILLS
-  ----------------------------------------------------------------*/
-  .markdown-preview-section h1 a.tag,
-  .markdown-preview-section h2 a.tag,
-  .markdown-preview-section h3 a.tag,
-  .markdown-preview-section h4 a.tag,
-  .markdown-preview-section h5 a.tag,
-  .markdown-preview-section h4 a.tag {
-    font-weight: inherit;
-  }
-  
-  .tag {
-    background-color: var(--tag-base);
-    border: 1px solid var(--interactive-accent);
-    color: var(--text-a);
-    font-weight: 500;
-    padding: 1.5px 6px;
-    padding-left: 6px;
-    padding-right: 6px;
-    text-align: center;
-    text-decoration: none !important;
-    display: inline-block;
-    cursor: pointer;
-    border-radius: 8px;
-    transition: 0.2s ease-in-out;
-  }
-  
-  .tag:hover {
-    color: var(--interactive-accent);
-  }
-  
-  /*----------------------------------------------------------------
-  TAG REF STYLING
-  ----------------------------------------------------------------*/
-  
-  .tag[href^="#❗️"],
-  .tag[href^="#important❗️"] {
-    background-color: var(--tag-base);
-    border: 1px solid var(--boldred);
-  }
-  
-  .tag[href^="#📓"],
-  .tag[href^="#journal📓"] {
-    background-color: var(--tag-base);
-    border: 1px solid var(--purple);
-  }
-  
-  .tag[href^="#🌱"],
-  .tag[href^="#seedling🌱"],
-  .tag[href^="#🌿"],
-  .tag[href^="#budding🌿"],
-  .tag[href^="#🌳"],
-  .tag[href^="#evergreen🌳"] {
-    background-color: var(--tag-base);
-    border: 1px solid var(--boldgreen);
-  }
-
-mark
-{
-    background-color: var(--text-mark) ;
-}
-
-.view-actions a
-{
-    color: var(--text-normal) ;
-}
-
-.view-actions a:hover
-{
-    color: var(--text-a) ;
-}
-
-.HyperMD-codeblock-bg
-{
-    background-color: var(--pre-code) ;
-}
-
-.HyperMD-codeblock
-{
-    line-height: 1.4em ;
-    color: var(--code-block) ;
-}
-
-.HyperMD-codeblock-begin
-{
-    border-top-left-radius: 4px ;
-    border-top-right-radius: 4px ;
-}
-
-.HyperMD-codeblock-end
-{
-    border-bottom-left-radius: 4px ;
-    border-bottom-right-radius: 4px ;
-}
-
-th
-{
-    font-weight: 600 ;
-}
-
-thead
-{
-    border-bottom: 2px solid var(--background-modifier-border) ;
-}
-
-.HyperMD-table-row
-{
-    line-height: normal ;
-    padding-left: 4px ;
-    padding-right: 4px ;
-    /* background-color: var(--pre-code) ; */
-}
-
-.HyperMD-table-row-0
-{
-    padding-top: 4px ;
-}
-
-.CodeMirror-foldgutter-folded,
-.is-collapsed .nav-folder-collapse-indicator
-{
-    color: var(--text-a) ;
-}
-
-.nav-file-tag
-{
-    color: var(--text-a) ;
-}
-
-.is-active .nav-file-title
-{
-    color: var(--text-a) ;
-    background-color: var(--background-primary-alt) ;
-}
-
-.nav-file-title
-{
-    border-bottom-left-radius: 0 ;
-    border-bottom-right-radius: 0 ;
-    border-top-left-radius: 0 ;
-    border-top-right-radius: 0 ;
-}
-
-img
-{
-    display: block ;
-    margin-left: auto ;
-    margin-right: auto ;
-}
-
-.HyperMD-list-line
-{
-    padding-top: 0 ;
-}
-
-.CodeMirror-code,
-.CodeMirror-linenumber,
-.cm-formatting
-{
-    font-family: var(--font-monospace) ;
-    font-size: 0.9em;
-}
-
-.markdown-preview-section pre code,
-.markdown-preview-section code
-{
-    font-size: 0.9em ;
-    background-color: var(--pre-code) ;
-}
-
-.markdown-preview-section pre code
-{
-    padding: 4px ;
-    line-height: 1.4em ;
-    display: block ;
-    color: var(--code-block) ;
-}
-
-.markdown-preview-section code
-{
-    color: var(--inline-code) ;
-}
-
-.cm-s-obsidian,
-.cm-inline-code
-{
-    -webkit-font-smoothing: auto ;
-}
-
-.cm-inline-code
-{
-    color: var(--inline-code) ;
-    background-color: var(--pre-code) ;
-    padding: 1px ;
-}
-
-.workspace-leaf-header-title
-{
-    font-weight: 600 ;
-}
-
-.side-dock-title
-{
-    padding-top: 15px ;
-    font-size: 20px ;
-}
-
-.side-dock-ribbon-tab:hover,
-.side-dock-ribbon-action:hover,
-.side-dock-ribbon-action.is-active:hover,
-.nav-action-button:hover,
-.side-dock-collapse-btn:hover
-{
-    color: var(--text-a);
-}
-
-.side-dock
-{
-    border-right: 0 ;
-}
-
-.cm-s-obsidian,
-.markdown-preview-view
-{
-    /* padding-left: 10px ; */
-    padding-right: 10px ;
-}
-
-/* vertical resize-handle */
-.workspace-split.mod-vertical > * > .workspace-leaf-resize-handle,
-.workspace-split.mod-left-split > .workspace-leaf-resize-handle,
-.workspace-split.mod-right-split > .workspace-leaf-resize-handle
-{
-    width: 1px ;
-    background-color: var(--dim-aqua);
-}
-
-/* horizontal resize-handle */
-.workspace-split.mod-horizontal > * > .workspace-leaf-resize-handle
-{
-    height: 1px ;
-    background-color: var(--dim-aqua);
-}
-
-/* Remove vertical split padding */
-.workspace-split.mod-root .workspace-split.mod-vertical .workspace-leaf-content,
-.workspace-split.mod-vertical > .workspace-split,
-.workspace-split.mod-vertical > .workspace-leaf,
-.workspace-tabs
-{
-    padding-right: 0px;
-}
-
-.markdown-embed-title
-{
-    font-weight: 600 ;
-}
-
-.markdown-embed
-{
-    padding-left: 10px ;
-    padding-right: 10px ;
-    margin-left: 10px ;
-    margin-right: 10px ;
-}
-
-.cm-header-1,
-.markdown-preview-section h1
-{
-    font-weight: 500 ;
-    font-size: 34px ;
-    color: var(--text-title-h1) ;
-}
-
-.cm-header-2,
-.markdown-preview-section h2
-{
-    font-weight: 500 ;
-    font-size: 26px ;
-    color: var(--text-title-h2) ;
-}
-
-.cm-header-3,
-.markdown-preview-section h3
-{
-    font-weight: 500 ;
-    font-size: 22px ;
-    color: var(--text-title-h3) ;
-}
-
-.cm-header-4,
-.markdown-preview-section h4
-{
-    font-weight: 500 ;
-    font-size: 20px ;
-    color: var(--text-title-h4) ;
-}
-
-.cm-header-5,
-.markdown-preview-section h5
-{
-    font-weight: 500 ;
-    font-size: 18px ;
-    color: var(--text-title-h5) ;
-}
-
-.cm-header-6,
-.markdown-preview-section h6
-{
-    font-weight: 500 ;
-    font-size: 18px ;
-    color: var(--text-title-h6) ;
-}
-
-.suggestion-item.is-selected
-{
-    background-color: var(--text-selection);
-}
-
-.empty-state-container:hover
-{
-    background-color: var(--background-secondary-alt);
-    border: 5px solid var(--interactive-accent) ;
-}
-
-.checkbox-container
-{
-    background-color: var(--interactive-before);
-}
-
-.checkbox-container:after
-{
-    background-color: var(--interactive-accent);
-}
-
-.checkbox-container.is-enabled:after 
-{
-    background-color: var(--bg5-dark);
-}
-
-.mod-cta
-{
-    color: var(--background-secondary-alt) ;
-    font-weight: 600 ;
-}
-
-.mod-cta a
-{
-    color: var(--background-secondary-alt) ;
-    font-weight: 600 ;
-}
-
-.mod-cta:hover
-{
-    background-color: var(--interactive-before) ;
-    font-weight: 600 ;
-}
-
-.CodeMirror-cursor
-{
-    background-color: var(--vim-cursor) ;
-    opacity: 60% ;
-}
-
-input.task-list-item-checkbox {
-    border: 1px solid var(--faded-blue);
-    appearance: none;
-    -webkit-appearance: none;
-}
-
-input.task-list-item-checkbox:checked
-{
-    background-color: var(--faded-blue);
-    box-shadow: inset 0 0 0 2px var(--background-primary);
-}
-
-::selection
-{
-    background-color: var(--text-selection) ;
-}
-
-.mermaid .note
-{
-    fill: var(--dark3) ;
-}
-
-.frontmatter-container {
-    display: none;
-}
-
-/* Bullet point relationship lines */
-.cm-hmd-list-indent .cm-tab, ul ul { position: relative; }
-.cm-hmd-list-indent .cm-tab::before, ul ul::before {
- content:'';
- border-left: 1px solid var(--dim-blue);
- position: absolute;
-}
-.cm-hmd-list-indent .cm-tab::before { left: 0; top: -5px; bottom: -4px; 
-}
-ul ul::before { left: -11px; top: 0; bottom: 0; 
-}

.obsidian/themes/Minimal/manifest.json

@@ -1,8 +0,0 @@
-{
-	"name": "Minimal",
-	"version": "7.5.4",
-	"minAppVersion": "1.5.4",
-	"author": "@kepano",
-	"authorUrl": "https://twitter.com/kepano",
-	"fundingUrl": "https://www.buymeacoffee.com/kepano"
-}

.obsidian/themes/Primary/manifest.json

@@ -0,0 +1,9 @@
+{
+  "name": "Primary",
+  "version": "2.10.0",
+  "minAppVersion": "1.4.0",
+  "author": "Cecilia May",
+  "fundingUrl": {
+    "Ko-fi": "https://ko-fi.com/ceciliamay"
+  }
+}

.obsidian/themes/Prism/manifest.json

@@ -0,0 +1,8 @@
+{
+   "name": "Prism",
+   "version": "3.6.0",
+   "minAppVersion": "1.6.0",
+   "author": "Damian Korcz",
+   "authorUrl": "https://github.com/damiankorcz",
+   "fundingUrl": "https://www.buymeacoffee.com/DamianKorcz"
+}

.obsidian/themes/Sanctum/manifest.json

@@ -0,0 +1,7 @@
+{
+	"name": "Sanctum",
+	"version": "1.2.0",
+	"minAppVersion": "1.1.9",
+	"author": "@jdanielmourao",
+	"authorUrl": "https://github.com/jdanielmourao/"
+}

.obsidian/themes/Simply Colorful/manifest.json

@@ -0,0 +1,7 @@
+{
+	"name": "Simply Colorful",
+	"version": "0.4.2",
+	"minAppVersion": "1.0.0",
+	"author": "Lorenzo Pegorari",
+	"authorUrl": "https://github.com/LorenzoPegorari"
+}

.obsidian/themes/Things/manifest.json

@@ -0,0 +1,7 @@
+{
+  "name": "Things",
+  "version": "2.1.20",
+  "minAppVersion": "1.0.0",
+  "author": "@colineckert",
+  "authorUrl": "https://twitter.com/colineckert"
+}

.obsidian/types.json

@@ -22,6 +22,27 @@
     "excalidraw-css": "text",
     "excalidraw-autoexport": "text",
     "excalidraw-embeddable-theme": "text",
-    "excalidraw-open-md": "checkbox"
+    "excalidraw-open-md": "checkbox",
+    "TQ_explain": "checkbox",
+    "TQ_extra_instructions": "text",
+    "TQ_short_mode": "checkbox",
+    "TQ_show_backlink": "checkbox",
+    "TQ_show_cancelled_date": "checkbox",
+    "TQ_show_created_date": "checkbox",
+    "TQ_show_depends_on": "checkbox",
+    "TQ_show_done_date": "checkbox",
+    "TQ_show_due_date": "checkbox",
+    "TQ_show_edit_button": "checkbox",
+    "TQ_show_id": "checkbox",
+    "TQ_show_on_completion": "checkbox",
+    "TQ_show_postpone_button": "checkbox",
+    "TQ_show_priority": "checkbox",
+    "TQ_show_recurrence_rule": "checkbox",
+    "TQ_show_scheduled_date": "checkbox",
+    "TQ_show_start_date": "checkbox",
+    "TQ_show_tags": "checkbox",
+    "TQ_show_task_count": "checkbox",
+    "TQ_show_tree": "checkbox",
+    "TQ_show_urgency": "checkbox"
   }
 }

Haina/Daily/2023-09-26.md

@@ -10,7 +10,7 @@ Updated: 2023-10-25 15:39 Wed
    1. 增加目的地国家接口
 5. [/] 订单价值: 单行数据
    - [x] 业绩进度 ✅ 2023-09-27
-   - [>] 统计分布
+   - [x] 统计分布 ✅ 2025-02-13
 6. [x] KPI 设置: 基于组织架构的小组设置, 和HT内的事业部是否一致 ✅ 2023-09-28
 7. [x] KPI设置: 提交成功但是没有查到数据 ✅ 2023-09-27
    1. [x] 已删除的再次设置 ✅ 2023-09-28

Haina/Templates/W-log.md

@@ -64,39 +64,84 @@ for (let day = 0; day < 2; day++) {
 ## 本周计划
 1. 
 
+---
 
 
----
+> [!danger] 🔴重要且紧急⏫🔺
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'High' || task.priorityName === 'Highest')
+> sort by path reverse
+> sort by heading
+> ```
 
-> [!todo] Not done
+> [!warning] 🟠不重要紧急🔼
 >
 > ```tasks
 > not done
 > path includes Haina
-> path includes Weekly/2024
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
-> (path includes W<% moment(tp.file.title).subtract(2, 'weeks').format('w') %>) OR (path includes W<% moment(tp.file.title).subtract(1, 'weeks').format('w') %> )
+> (filter by function task.priorityName === 'Medium')
-> (filter by function task.status.name === 'Todo')
 > sort by path reverse
 > sort by heading
 > ```
 
-> [!todo] In Progress
+> [!important] 🟡重要不紧急🔽
 >
 > ```tasks
 > not done
 > path includes Haina
-> path includes Weekly/2024
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
-> (filter by function task.status.name === 'incomplete')
+> (filter by function task.priorityName === 'Normal')
 > sort by path reverse
 > sort by heading
 > ```
 
+> [!info] 🟢不重要不紧急⏬
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
+> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'None')
+> sort by path reverse
+> sort by heading
+> ```
+
+
+---
+
 > [!check] Latest 2 weeks
 >
 > ```tasks
 > done after last monday
 > path includes Haina
-> path includes Weekly/2024
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
+> (path includes W<% moment(tp.file.title).subtract(2, 'weeks').format('ww') %>) OR (path includes W<% moment(tp.file.title).subtract(1, 'weeks').format('ww') %> )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
+> (filter by function task.status.name === 'incomplete')
 > sort by path reverse
 > sort by heading
 > ```
@@ -106,7 +151,7 @@ for (let day = 0; day < 2; day++) {
 > ```tasks
 > not done
 > path includes Haina
-> path includes Weekly/2024
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
 > filter by function task.status.name === 'forwarded'
 > sort by path reverse
 > sort by heading
@@ -117,7 +162,7 @@ for (let day = 0; day < 2; day++) {
 > ```tasks
 > not done
 > path includes Haina
-> path includes Weekly/2024
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
 > filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
 > sort by path reverse
 > sort by heading
@@ -128,7 +173,7 @@ for (let day = 0; day < 2; day++) {
 > ```tasks
 > not done
 > path includes Haina
-> path includes Weekly/2024
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
 > filter by function task.status.name === 'question'
 > sort by path reverse
 > sort by heading
@@ -138,7 +183,7 @@ for (let day = 0; day < 2; day++) {
 >
 > ```tasks
 > path includes Haina
-> path includes Weekly/2024
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
 > filter by function task.status.name === 'canceled'
 > sort by path reverse
 > sort by heading
@@ -149,7 +194,7 @@ for (let day = 0; day < 2; day++) {
 > ```tasks
 > not done
 > path includes Haina
-> path includes Weekly/2024
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
 > (filter by function task.status.type === 'TODO')
 > sort by path reverse
 > sort by heading

Haina/Weekly/2024/2024-W33.md

@@ -41,7 +41,7 @@ tags:
 
 1. [x] 微信退款重复录入 ✅ 2024-10-21
 2. [x] PayPal ACDC和V2版本的信用卡按钮冲突 ✅ 2024-08-08
-3. [ ] PayPal ACDC: Google Pay
+3. [x] PayPal ACDC: Google Pay ✅ 2025-02-13
 
 ## 本周计划
 

Haina/Weekly/2024/2024-W45.md

@@ -33,8 +33,8 @@ tags:
 5. ["] 发送邮件之后, 没有推送发送状态更新`email.updated` . *实际已经收到邮件*
    - `email.updated`=`sent`
 6. [x] 解析其他通知: `email.action.received` ✅ 2024-11-07
-   1. [ ] 数据填充不正确
+   1. [x] 数据填充不正确 ✅ 2025-02-13
-7. [ ] 历史记录: 邮件类型消息
+7. [x] 历史记录: 邮件类型消息 ✅ 2025-02-13
 
 ##### WABA
 

Haina/Weekly/2025/2025-W07.md

@@ -0,0 +1,117 @@
+---
+Created: 2025-02-07 Fri
+Updated: 
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-02|February]] / ❮ [[Haina/Weekly/2025/2025-W06|Week 6]] | Week 7 | [[Haina/Weekly/2025/2025-W08|Week 8]] ❯ / [[Haina/Daily/2025-02-03|03 Mon]] - [[Haina/Daily/2025-02-04|04 Tue]] - [[Haina/Daily/2025-02-05|05 Wed]] - [[Haina/Daily/2025-02-06|06 Thu]] - [[Haina/Daily/2025-02-07|07 Fri]] - [[Haina/Daily/2025-02-08|08 Sat]] - [[Haina/Daily/2025-02-09|09 Sun]] ❯ [[Haina/Daily/2025-02-10|10 Mon]] - [[Haina/Daily/2025-02-11|11 Tue]] - 
+
+---
+
+*2025-02-11 Tue*  
+
+## 上周工作
+
+### 重点工作
+####
+1. sales CRM 统计数据定义(继续讨论中)
+2. 支付中心  GooglePay ApplePay
+3. GH例会数据: 2025版本
+
+### 维护工作
+#### 
+1. [I] 爬取TA, TP各个账户的好评数 #李曌姮 ⏬
+
+
+## 本周计划
+2. 
+
+
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W05) OR (path includes W06 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W08.md

@@ -0,0 +1,117 @@
+---
+Created: 2025-02-11 Tue
+Updated: 
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-02|February]] / ❮ [[Haina/Weekly/2025/2025-W07|Week 7]] | Week 8 | [[Haina/Weekly/2025/2025-W09|Week 9]] ❯ / [[Haina/Daily/2025-02-10|10 Mon]] - [[Haina/Daily/2025-02-11|11 Tue]] - [[Haina/Daily/2025-02-12|12 Wed]] - [[Haina/Daily/2025-02-13|13 Thu]] - [[Haina/Daily/2025-02-14|14 Fri]] - [[Haina/Daily/2025-02-15|15 Sat]] - [[Haina/Daily/2025-02-16|16 Sun]] ❯ [[Haina/Daily/2025-02-17|17 Mon]] - [[Haina/Daily/2025-02-18|18 Tue]] - 
+
+---
+
+*2025-02-18 Tue*  
+
+## 上周工作
+
+### 重点工作
+#### HT 数据统计
+1. CRM-结果指标
+2. GH例会 2025
+3. 
+
+### 维护工作
+#### Sales CRM
+1. 隐藏会话保持和邮件管理器一致【已处理】; 
+2. 显示`对方删除消息`
+
+## 本周计划
+2. 
+
+
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W06) OR (path includes W07 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W09.md

@@ -0,0 +1,117 @@
+---
+Created: 2025-02-19 Wed
+Updated: 
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-02|February]] - [[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-03|March]] / ❮ [[Haina/Weekly/2025/2025-W08|Week 8]] | Week 9 | [[Haina/Weekly/2025/2025-W10|Week 10]] ❯ / [[Haina/Daily/2025-02-17|17 Mon]] - [[Haina/Daily/2025-02-18|18 Tue]] - [[Haina/Daily/2025-02-19|19 Wed]] - [[Haina/Daily/2025-02-20|20 Thu]] - [[Haina/Daily/2025-02-21|21 Fri]] - [[Haina/Daily/2025-02-22|22 Sat]] - [[Haina/Daily/2025-02-23|23 Sun]] ❯ [[Haina/Daily/2025-02-24|24 Mon]] - [[Haina/Daily/2025-02-25|25 Tue]] - 
+
+---
+
+*2025-02-25 Tue*  
+
+## 上周工作
+
+### 重点工作
+####
+1. 
+
+### 维护工作
+#### 
+1. #优化 小助手: 小助手使用率公式更新; 地接小助手活跃率公式更新; `地接社-导游使用情况`+上下站信息使用率
+2. #优化 HT统计: GH例会数据2025: 年走团毛利; 统计分布
+3. #优化 销售平台: 系统更新提示; 支付链接与HT币种一致; 编辑联系人更新会话列表;  邮件显示抄送, 支持回复全部, 包括抄送; 
+4. #新增 销售平台: 设置催信状态 
+
+## 本周计划
+5. 
+
+
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W07) OR (path includes W08 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W10.md

@@ -0,0 +1,129 @@
+---
+Created: 2025-02-26 Wed
+Updated: 2025-03-04 17:25 Tue
+tags:
+  - 周报
+---
+
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-03|March]] / ❮ [[Haina/Weekly/2025/2025-W09|Week 9]] | Week 10 | [[Haina/Weekly/2025/2025-W11|Week 11]] ❯ / [[Haina/Daily/2025-02-24|24 Mon]] - [[Haina/Daily/2025-02-25|25 Tue]] - [[Haina/Daily/2025-02-26|26 Wed]] - [[Haina/Daily/2025-02-27|27 Thu]] - [[Haina/Daily/2025-02-28|28 Fri]] - [[Haina/Daily/2025-03-01|01 Sat]] - [[Haina/Daily/2025-03-02|02 Sun]] ❯ [[Haina/Daily/2025-03-03|03 Mon]] - [[Haina/Daily/2025-03-04|04 Tue]] -
+
+---
+
+*2025-03-04 Tue*
+
+## 上周工作
+
+### 重点工作
+
+####
+
+1.
+
+### 维护工作
+
+#### Sales CRM
+
+1. #新增 供应商邮件区域, 增加搜索, 上下分栏;
+2. #优化 订单新增会话, 允许不绑定订单
+3. #修复 会话绑定订单后, 获取订单信息;
+4. #优化 移动端:支付链接
+
+####
+
+1. 统计: GH老客户复购的时间周期, 上一次预订的信息(宋芳馨)
+2. GA4: Page path conversion rate. 页面直接转化率(赵焱)
+3. 协助: 海外反馈表导游发错填错(Zac)
+4. 数据统计修改来源配置(区老师)
+5. 排查: 旧的支付链接: HT, App (PayPal)
+
+## 本周计划
+
+2.
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W08) OR (path includes W09 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W11.md

@@ -0,0 +1,126 @@
+---
+Created: 2025-03-06 Thu
+Updated: 
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-03|March]] / ❮ [[Haina/Weekly/2025/2025-W10|Week 10]] | Week 11 | [[Haina/Weekly/2025/2025-W12|Week 12]] ❯ / [[Haina/Daily/2025-03-03|03 Mon]] - [[Haina/Daily/2025-03-04|04 Tue]] - [[Haina/Daily/2025-03-05|05 Wed]] - [[Haina/Daily/2025-03-06|06 Thu]] - [[Haina/Daily/2025-03-07|07 Fri]] - [[Haina/Daily/2025-03-08|08 Sat]] - [[Haina/Daily/2025-03-09|09 Sun]] ❯ [[Haina/Daily/2025-03-10|10 Mon]] - [[Haina/Daily/2025-03-11|11 Tue]] - 
+
+---
+
+*2025-03-11 Tue*  
+
+## 上周工作
+
+### 重点工作
+#### HT统计
+1. [CT商旅数据统计](Haina/项目/HT数据分析/CT商旅数据统计.md)
+2. [x] 老客户: 每月折现图 #宋芳馨  ✅ 2025-04-10
+
+### 维护工作
+#### 
+1. [?] page views 在page screens 与referer 中不一致 #赵焱 
+2. [?] 综合年度: 对比中显示百分比 #YCC ⏬
+3. [x] WABA: 增加国际部各语种模板, 每语种至少一个`跟进`类模板 ✅ 2025-03-07
+4. [x] Ali Agent: WAI 托管号码给AI回复 ✅ 2025-03-07
+5. [x] 统计: 过程指标 ✅ 2025-03-10
+6. [I] PayPal: 降低信用卡渠道的推荐. 折叠; 尾款不显示; 商务订单不显示; #Steven 
+	- 优化成本, 提供利润
+	- 与PayPal谈判费率的空间
+7. [x] PayPal 费率变更, 超最低提醒: `fgy@hainatravel.com` `xtt@hainatravel.com` #俸国英 ✅ 2025-04-02
+8. [/] 海外反馈表: 页面支持多语种 🔼 🛫 2025-04-07
+9. ["] 连连支付: 入驻审核;
+10. [x] 连连支付: 开通测试账号 ✅ 2025-03-11
+
+## 本周计划
+1. 
+
+
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W09) OR (path includes W10 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W12.md

@@ -0,0 +1,121 @@
+---
+Created: 2025-03-12 Wed
+Updated: 
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-03|March]] / ❮ [[Haina/Weekly/2025/2025-W11|Week 11]] | Week 12 | [[Haina/Weekly/2025/2025-W13|Week 13]] ❯ / [[Haina/Daily/2025-03-10|10 Mon]] - [[Haina/Daily/2025-03-11|11 Tue]] - [[Haina/Daily/2025-03-12|12 Wed]] - [[Haina/Daily/2025-03-13|13 Thu]] - [[Haina/Daily/2025-03-14|14 Fri]] - [[Haina/Daily/2025-03-15|15 Sat]] - [[Haina/Daily/2025-03-16|16 Sun]] ❯ [[Haina/Daily/2025-03-17|17 Mon]] - [[Haina/Daily/2025-03-18|18 Tue]] - 
+
+---
+
+*2025-03-18 Tue*  
+
+## 上周工作
+
+### 重点工作
+####
+1. 
+
+### 维护工作
+#### 
+1. [x] APP组退款记录录入后补充记录: 录入`我的支付` ✅ 2025-03-13 15:30 
+2. 增加桂林站 支付页面
+3. #修复 销售平台: template消息显示 type值不区分大小写
+4. HT统计: 完成销售平台-过程指标统计
+5. #优化 HT统计: 老客户统计增加2列: 上次走团, 上次小组
+6. #优化 海外反馈表: 不显示空白评分项; 无法生成评估表的城市的提示
+7. 连连支付: 完成请求支付; 测试(成功; 跳转3DS; 验证成功/失败)
+8. [x] 统计PayPal ACDC交易额(俸国英) ✅ 2025-03-18
+9. 
+
+## 本周计划
+1. 连连通知; 退款
+
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W10) OR (path includes W11 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W13.md

@@ -0,0 +1,167 @@
+---
+Created: 2025-03-19 Wed
+Updated: 2025-03-24 14:33 Mon
+tags:
+  - 周报
+---
+
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-03|March]] / ❮ [[Haina/Weekly/2025/2025-W12|Week 12]] | Week 13 | [[Haina/Weekly/2025/2025-W14|Week 14]] ❯ / [[Haina/Daily/2025-03-17|17 Mon]] - [[Haina/Daily/2025-03-18|18 Tue]] - [[Haina/Daily/2025-03-19|19 Wed]] - [[Haina/Daily/2025-03-20|20 Thu]] - [[Haina/Daily/2025-03-21|21 Fri]] - [[Haina/Daily/2025-03-22|22 Sat]] - [[Haina/Daily/2025-03-23|23 Sun]] ❯ [[Haina/Daily/2025-03-24|24 Mon]] - [[Haina/Daily/2025-03-25|25 Tue]] -
+
+---
+
+*2025-03-25 Tue*
+
+## 上周工作
+
+### 重点工作
+
+####
+
+1.
+
+### 维护工作
+
+####
+
+1. [x] #优化 支付中心: 录入记录后, 执行HT任务`SP_AddToSystask` ✅ 2025-03-21
+2. #优化 HT统计: 客服-增加按抵达日期统计; 汇总按整团统计
+3. #新增 HT统计: 统计: 饮食要求、兴趣爱好、年龄段
+4. #优化 销售平台: 发送邮件默认订单类型: 传统订单; 对发件支持`回复全部`
+5. [x] 连连支付: 退款API; 异步通知 ✅ 2025-03-24
+6. #修复 海外供应商: 合同导出
+7. #修复 商旅火车APP: 动卧成本价
+8. 东道主录入，审核
+	1. 列表省略显示
+	2. 未审核，都能改
+	3. 搜索默认当年全年
+	4. 汇总行：团数，总积分
+	5. [-] 客服组，后台：东道主页面
+		1. 去掉`导游案例`，反馈表，HA客人信息
+	6. 补录：游佳佳
+	7. 站外好评：汇总数据
+9. [ ] 东道主统计需求 #李曌姮 ⏫
+
+|     | 团数  | 人数  | 计费团天数 | 交易额 |
+| --- | --- | --- | ----- | --- |
+|     |     |     |       |     |
+
+
+
+### -
+
+1. 无效沟通
+2. 1. 对HT不熟悉:
+      1. 邮件管理器这个功能肯定是知道的. 邮件管理器也是一个客户端,
+      2. 正因为我知道邮件管理器这个功能和其他客户端的不一样, 才会有接下来的提问,
+      3. 我 提问就是要知道怎么处理这种细节上的不一致, 因为它导致用户体验不一样. 以及确认需求方想要的是怎么样. 她没有说按邮件管理器那样, 而是用钉邮举例. 说明她是没有观察到这点体验的差异. 后面我说了要删掉, 她说可以操作. 那就是可以做嘛, 体验不如钉邮
+      4. 平台做的缺失, 是只针对接收, 对发送不做处理, 就是回复时, 把收件和发件调换, 这个功能你也是清楚的
+3. 2. 对外联工作不熟悉:
+      1. 确实.
+4. 3. 不理解外联的需求:
+      2. 沟通过程中的举例描述与实际需求不一致, 进一步确认的过程.
+      3. 对于提问, 和继续提问(目的是我要知道这种不一致怎么处理),
+         1. 就得到不熟悉不称职的谴责, (这个功能不是到处都有吗, 这你都不知道吗)咄咄逼人的气势下我都说不完整一句话. 为什么不能就回答就可以了?
+      4. 我都忽略了这些, 继续提出我的疑问, 因为我没有得到回答 只听到, 你干嘛要管收呢.
+         这一句我也忽略, 要求用HT演示收, 此时我已经知道要按HT做了,  演示一遍是确认. 且前面的举例不是需求描述, 而是对我的谴责,
+      5. 下班前我已经把方案发给骆了
+5. 4. 外联只能用用户的思维反馈问题和需求:
+      6. 我也是用界面说的, 并没有所谓技术的思维. 是举例说明, 演示说明. 以及邮件收发这几个词语, 我认为这一点大家的认知是一致的.
+      7. 我认为优化用户体验是体现在这些细节上, 所以想到的就提出来.
+6. 抵触情绪
+7. 1. 所有人没意见就改, 不等于`言下之意不希望有人找来问`, 我说的是这样做涉及多人操作习惯问题, 在做之前确认好, 并不是抵触说不做
+8. 2. 这是冤枉
+9. 情绪预设
+10. 1. 提需求或者反馈bug, 首先预设了情绪, 我是不认可的. 在这种情绪下, 谴责的口吻提出来,
+   2.
+
+## 本周计划
+
+1.
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W11) OR (path includes W12 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W14.md

@@ -0,0 +1,114 @@
+---
+Created: 2025-03-24 Mon
+Updated: 
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q1|Q1]] / [[Haina/Monthly/2025-03|March]] - [[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q2|Q2]] / [[Haina/Monthly/2025-04|April]] / ❮ [[Haina/Weekly/2025/2025-W13|Week 13]] | Week 14 | [[Haina/Weekly/2025/2025-W15|Week 15]] ❯ / [[Haina/Daily/2025-03-24|24 Mon]] - [[Haina/Daily/2025-03-25|25 Tue]] - [[Haina/Daily/2025-03-26|26 Wed]] - [[Haina/Daily/2025-03-27|27 Thu]] - [[Haina/Daily/2025-03-28|28 Fri]] - [[Haina/Daily/2025-03-29|29 Sat]] - [[Haina/Daily/2025-03-30|30 Sun]] ❯ [[Haina/Daily/2025-03-31|31 Mon]] - [[Haina/Daily/2025-04-01|01 Tue]] - 
+
+---
+
+*2025-04-01 Tue*  
+
+## 上周工作
+
+### 重点工作
+####
+1. 
+
+### 维护工作
+#### 
+1. [x] HT统计: 数据透视: 目的地国家; 酒店星级; 单人报价区间 ✅ 2025-04-03
+
+## 本周计划
+1. 
+
+
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W12) OR (path includes W13 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W15.md

@@ -0,0 +1,121 @@
+---
+Created: 2025-04-03 Thu
+Updated: 
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q2|Q2]] / [[Haina/Monthly/2025-04|April]] / ❮ [[Haina/Weekly/2025/2025-W14|Week 14]] | Week 15 | [[Haina/Weekly/2025/2025-W16|Week 16]] ❯ / [[Haina/Daily/2025-03-31|31 Mon]] - [[Haina/Daily/2025-04-01|01 Tue]] - [[Haina/Daily/2025-04-02|02 Wed]] - [[Haina/Daily/2025-04-03|03 Thu]] - [[Haina/Daily/2025-04-04|04 Fri]] - [[Haina/Daily/2025-04-05|05 Sat]] - [[Haina/Daily/2025-04-06|06 Sun]] ❯ [[Haina/Daily/2025-04-07|07 Mon]] - [[Haina/Daily/2025-04-08|08 Tue]] - 
+
+---
+
+*2025-04-08 Tue*  
+
+## 上周工作
+
+### 重点工作
+####
+1. 
+
+### 维护工作
+#### 
+1. 完成连连测试验收(已通过)
+2. 微信商户API证书更新
+3. 微信支付: 下载资金帐单; (原接口交易账单不再包含收款码记录)
+	1. [x] 微信v2接口无法下载资金账单, 需要证书 ⏫ 🛫 2025-04-07 ✅ 2025-04-09
+4. #新增 PayPal: 收款额度查询, 以便后续切换渠道 ; 费率变更, 超最低提醒 (俸国英); 
+5. #修复 PayPal: v1版本的退款通知
+6. #新增 HT统计: 数据透视: 酒店星级; 人均消费; 目的地城市
+7. #新增 海外反馈表: 页面支持多语种, 国际部使用
+
+## 本周计划
+1. 
+
+
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W13) OR (path includes W14 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W16.md

@@ -0,0 +1,170 @@
+---
+Created: 2025-04-08 Tue
+Updated: 2025-04-13 02:01 Sun
+tags:
+  - 周报
+---
+
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q2|Q2]] / [[Haina/Monthly/2025-04|April]] / ❮ [[Haina/Weekly/2025/2025-W15|Week 15]] | Week 16 | [[Haina/Weekly/2025/2025-W17|Week 17]] ❯ / [[Haina/Daily/2025-04-07|07 Mon]] - [[Haina/Daily/2025-04-08|08 Tue]] - [[Haina/Daily/2025-04-09|09 Wed]] - [[Haina/Daily/2025-04-10|10 Thu]] - [[Haina/Daily/2025-04-11|11 Fri]] - [[Haina/Daily/2025-04-12|12 Sat]] - [[Haina/Daily/2025-04-13|13 Sun]] ❯ [[Haina/Daily/2025-04-14|14 Mon]] - [[Haina/Daily/2025-04-15|15 Tue]] -
+
+---
+
+*2025-04-15 Tue*
+
+## 上周工作
+
+### 重点工作
+
+####
+
+1.
+
+### 维护工作
+
+#### 交接廖老师
+
+1. JH上线新站相关工作
+2. 查询掉线的WA, 发负责人. GH-骆; 客运-区老师; 国际-兰芬
+3. 东道主项目: API 维护
+
+## 本周计划
+
+1. [ ] 三峡, 酒店统计 ⏫
+2. [ ] [CT商旅数据统计](Haina/项目/HT数据分析/CT商旅数据统计.md) ⏫
+3. [ ] HT统计: 销售平台统计: 违规/提升明细
+4. [ ] paypal收款：拆分多个团名和金额 #杨书林
+5. [ ] 销售平台: 会话表信息推送
+
+---
+
+> [!danger] 🔴重要且紧急⏫🔺
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'High' || task.priorityName === 'Highest')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!warning] 🟠不重要紧急🔼
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Medium')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!important] 🟡重要不紧急🔽
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Normal')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!info] 🟢不重要不紧急⏬
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'None')
+> sort by path reverse
+> sort by heading
+> ```
+
+---
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W14) OR (path includes W15 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/Weekly/2025/2025-W17.md

@@ -0,0 +1,160 @@
+---
+Created: 2025-04-13 Sun
+Updated: 
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q2|Q2]] / [[Haina/Monthly/2025-04|April]] / ❮ [[Haina/Weekly/2025/2025-W16|Week 16]] | Week 17 | [[Haina/Weekly/2025/2025-W18|Week 18]] ❯ / [[Haina/Daily/2025-04-14|14 Mon]] - [[Haina/Daily/2025-04-15|15 Tue]] - [[Haina/Daily/2025-04-16|16 Wed]] - [[Haina/Daily/2025-04-17|17 Thu]] - [[Haina/Daily/2025-04-18|18 Fri]] - [[Haina/Daily/2025-04-19|19 Sat]] - [[Haina/Daily/2025-04-20|20 Sun]] ❯ [[Haina/Daily/2025-04-21|21 Mon]] - [[Haina/Daily/2025-04-22|22 Tue]] - 
+
+---
+
+*2025-04-22 Tue*  
+
+## 上周工作
+
+### 重点工作
+####
+1. 
+
+### 维护工作
+#### 
+1. 
+
+## 本周计划
+1. 
+
+---
+
+
+> [!danger] 🔴重要且紧急⏫🔺
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'High' || task.priorityName === 'Highest')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!warning] 🟠不重要紧急🔼
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Medium')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!important] 🟡重要不紧急🔽
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Normal')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!info] 🟢不重要不紧急⏬
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'None')
+> sort by path reverse
+> sort by heading
+> ```
+
+
+---
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W15) OR (path includes W16 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```

Haina/分享&培训/Nodejs VS Python.md

@@ -0,0 +1,13 @@
+---
+Created: 2025-02-17 Mon
+Updated: 2025-02-17 15:33 Mon
+---
+
+|      | Nodejs     | Python |
+| ---- | ---------- | ------ |
+| 性能   | 高并发<br>非阻塞 |        |
+| 依赖地狱 |            |        |
+| 维护性  |            |        |
+| ---  |            |        |
+| 图像处理 |            |        |
+| 文件上传 |            |        |

Haina/分享&培训/面试.md

@@ -1,31 +1,62 @@
 ---
 Created: 2024-08-15 Thu
+Updated: 2025-02-17 09:44 Mon
 ---
+
 **STAR**
 情境(situation)、任务(task)、行动(action)、结果(result)
 
 **结构化面试提问问题参考(专业素质)**
-1、你简单描述一下你的实习或职业生涯经历，是否由你主导过或参与过项目案例，流程执行的结果如何?请举例说明;(流程执行，创新意识)
+
-2、请表述以往工作或学习经历中如何处理责任范围外的工作与集体工作?(主动性与责任心)
+1. 你简单描述一下你的实习或职业生涯经历，是否由你主导过或参与过项目案例，流程执行的结果如何?请举例说明;(流程执行，创新意识)
-3、 请举例说明由你实施过的一项新的SOP，执行效果如何?问题点?重复做一次的不同思路?(标准化，创新意识)
+2. 请表述以往工作或学习经历中如何处理责任范围外的工作与集体工作?(主动性与责任心)
-4、请举例说明由于你的及时发现，解决了一个对企业来讲重大的隐患，从而没有造成资源浪费浪费?(关注现场，成本意识)
+3. 请举例说明由你实施过的一项新的SOP，执行效果如何?问题点?重复做一次的不同思路?(标准化，创新意识)
-5、你主要通过什么渠道去了解业务流程、成本结构等相关信息，如何进行有效分析?(分析能力，信息收集能力)
+4. 请举例说明由于你的及时发现，解决了一个对企业来讲重大的隐患，从而没有造成资源浪费浪费?(关注现场，成本意识)
+5. 你主要通过什么渠道去了解业务流程、成本结构等相关信息，如何进行有效分析?(分析能力，信息收集能力)
+
+## 后端
+
+- 业务协调难点：比如各部门需求冲突怎么解决
+- 指标难点：比如如何定义核心指标
+- 技术难点：如果实在要说，就挑个CTO能听懂的
+- 技术选型: 后端现在需要引入新的技术栈, 有什么建议, 你会考虑哪些方面? 在团队中推广
+- 系统推广: 新模块, 新流程, 新的工具
+
 ## Web
+
 ### React
-1. react-admin
+
-2. git
+6. react-admin
+7. git
    1. 常用的操作
    2. 冲突解决
-3. 项目：项目描述、自己负责的内容、解决过哪些值得一说的问题
+8. 项目：项目描述、自己负责的内容、解决过哪些值得一说的问题
-4. 项目流程：工时分配、需求及开发流程、​线上问题解​决​
+9. 项目流程：工时分配、需求及开发流程、​线上问题解​决​
 
 ### Vue, Element
-1. v2/v3
+
-2. v2如何获取事件对象 $event
+10. v2/v3
-3. 父子通信 
+11. v2如何获取事件对象 $event
-	1. props+$emit
+12. 父子通信
-	2. vuex: 页面刷新state不存在, 持久化?
+13. props+$emit
-	3. $refs 弊端: 真实DOM
+14. vuex: 页面刷新state不存在, 持久化?
-4. .sync 修饰符的作用: 实现属性双向绑定
+15. $refs 弊端: 真实DOM
-5. 自定义组件 v-model
+16. .sync 修饰符的作用: 实现属性双向绑定
-	1. v2: /v3 
+17. 自定义组件 v-model
+18. v2: /v3
+
+---
+## 
+- **王刚**
+  - 项目
+    1. [python]在实现 AI 警情提取系统时，为什么选择 Flask 作为后端框架？为什么不用Django
+    2. [python]怎么在项目中设计和优化数据库，特别是在高并发情况下如何保证数据库性能和数据一致性
+    3. 部署 chatglm3 大模型作为警情抽取，具体是怎么处理的？是微调还是用来什么别的方式，怎么让语言模型抽取警情的？
+    4. [项目]在以前公司具体使用了哪些技术工具，完成了哪些任务，尤其是在处理大数据、系统架构和**软件开发**方面的经验
+    5. [-] 为什么使用 TensorFlow 而不是 PyTorch？
+    6. 有没有把模型部署到云平台或者本地服务器的经验
+    7. 描述一下你所获得的软件著作权？软件的技术难点是什么，解决了什么痛点？软件是否有过实际的商业应用或部署？
+    8. 为什么获得了这么多软件著作权？
+  - 其他
+    1. 专业与项目经历都不是前端方向, 为什么求职前端岗位
+    2. 为什么不留在上个实习公司

Haina/项目/AI/阿里云百炼.md

@@ -0,0 +1,21 @@
+---
+Created: 2025-02-24 Mon
+Updated: 2025-03-04 23:59 Tue
+---
+
+## 阿里云百炼
+
+<https://bailian.console.aliyun.com/>
+
+用户名（RAM登录） 
+
+> <ai@1008072200622279.onaliyun.com>
+>
+> AA%2P&8hoW5Wvdsv
+
+### 海纳问答
+
+- 每次回复大约需要5-10s
+- 测试版效果好于发布版
+![left|800](Haina/项目/AI/atta/Pasted%20image%2020250309235657.png)
+

Haina/项目/GHH/价格平台/WebHT 二期.md

@@ -10,11 +10,11 @@ Updated: 2024-11-18 14:59 Mon
 1. [>] 首页: 年份必填, 但不设默认值
 2. [>] 价格录入: 人等修改
 3. 合同
-   1. [ ] 合同备注
+   1. [x] 合同备注 ✅ 2025-02-13
    2. [>] 价格显示, 表格与合同一致 `部分人等` `X以上`
-   3. [ ] `导游`
+   3. [x] `导游` ✅ 2025-02-13
-   4. [ ] `景点`
+   4. [x] `景点` ✅ 2025-02-13
-   5. [ ] `车费`
+   5. [/] `车费`
 4. [>] 增加字段: `包价子类型` `所在城市` `排序`
 5. [x] 调整字段: `报价显示类型`, 增加到`车费`, `导游`, ✅ 2024-10-24
 6. [>] 搜索: 仅显示结果

Haina/项目/HT数据分析/CT商旅数据统计.md

@@ -0,0 +1,59 @@
+---
+Created: 2025-03-10 Mon
+Updated: 2025-04-11 16:18 Fri
+需求方: 戴昳雯
+---
+
+#戴昳雯
+
+## 1. 部门upsell数据统计
+
+- 商务订单: 利润
+  - 按日期对比
+  - 展开明细，导出明细。基础数据
+    - 分析：某段火车票，产品，导向upsell
+      1. [?] upsell 订单与原始订单没有关联性
+
+> [!attention]
+
+- [ ] 
+
+## 2. 部门老客户营销数据统计
+
+- [*] 评估外联主动营销的效果
+- 线路订单
+- 订单来源：外联老客户营销
+
+1. [?] 标识老客户的属性值, 是哪些; 哪些是需要统计的? 后续保持或是约定规范?
+
+![left|600](Haina/项目/HT数据分析/atta/Pasted%20image%2020250310142149.png)
+
+> [!attention]
+
+- [ ] 订单数据-来源类型
+
+## 3. 部门订单来源数据统计
+
+- [*] ~~合并~~线路订单和商务订单数据
+- 线路订单：来源站点，页面类型
+- 商务订单：
+  - 网站
+    - 分销渠道/合作网站，
+    - 客户端
+
+> [!attention]
+
+- [ ] 线路订单：来源站点+页面类型
+
+## 4. 部门产品销售数据统计
+
+- 线路订单：ct,sh,tp。
+  - 小包价实时支付。详情：tourCode - `COLI_Memo`是否自动写入的
+    - `COLI_Memo` 下单的产品编码
+  - 三峡游船在线支付。游船名字。（日期，座位，游船） `COLI_Name` 上下水?
+    - `COLI_Name`产品名称, 游船名称
+- 商务订单：TS。产品代码。
+  - 渠道：
+    - viator门票：具体产品。如水灯节
+- 按产品，各渠道
+

Haina/项目/SCRM/Sales CRM 2.0.md

@@ -25,9 +25,9 @@ Updated: 2024-12-11 09:36 Wed
     1. ["] 正文不乱; 签名仍然乱码
 16. [x] 贴图使用网络地址 ✅ 2024-11-21
 17. [?] 抄送, 多个收件人的会话, 跟帖需要在同一个会话
-18. [/] 分别处理置顶的会话和普通排序的会话
+18. [x] 分别处理置顶的会话和普通排序的会话 ✅
 19. [ ] 置顶下的分页, 获取不到下一页
-20. [ ] 原邮件含复杂嵌套表格, 回复引用后排版乱了
+20. [x] 原邮件含复杂嵌套表格, 回复引用后排版乱了 ✅
 
 ### 2024-11-22 内部演示
 
@@ -47,12 +47,12 @@ Updated: 2024-12-11 09:36 Wed
    2. [ ] 嵌套表格
    3. [x] 在form中使用, 修改格式触发form提交 ✅ 2024-12-06
 10. [?]  多个商业号同时与一个客人联系, 收到消息时, 匹配会话不正确. 目前仅按时间和客人号码匹配, 没匹配商业号
-    1. [ ] 回复是否需要用客人发送的商业号? 使用最近的消息的号码
+    1. [x] 回复是否需要用客人发送的商业号? 使用最近的消息的号码 ✅
-       1. [x] 引用消息回复时, 使用相应的号码, 但是没有更新到全局 ✅ 2024-12-03
+    2. 1. [x] 引用消息回复时, 使用相应的号码, 但是没有更新到全局 ✅ 2024-12-03
 11. ~ 移动端
-    1. [ ] 无法打开图文集; 支付链接
+    1. [ ] 无法打开图文集; ✅支付链接
     2. [x] 会话筛选刷新了两次; ✅ 2024-12-02
-12. [ ] 供应商邮件需要放大, 搜索
+12. [x] 供应商邮件需要放大, 搜索 ✅ 
 13. [x] 邮件推送信息的接收, msg_source, 规范结构 ✅ 2024-12-03
 14. [x] 失败邮件重新编辑, 发件人错误 ✅ 2024-12-05
 15. [x] 定时收件: 后台线程运行 ✅ 2024-12-09
@@ -71,9 +71,9 @@ Updated: 2024-12-11 09:36 Wed
     3. [ ] 阿里云资源文件
 22. ["] 收到`email.updated`的推送, 不要增加未读数量✅
 23. [ ] 打开消息筛选, 点击邮件, 再打开筛选窗口, 邮件窗口消失
-24. [ ] 邮件已支持的格式样式, 放在生成邮件正文的头部
+24. [-] 邮件已支持的格式样式, 放在生成邮件正文的头部
 	1. 部分邮件客户端不兼容, 会删掉
-25. [ ] 纯文本邮件, 粘贴/添加文件作为附件
+25. [I] 纯文本邮件, 粘贴/添加文件作为附件
 26. [x] 发送多个附件, 只收到一个 ✅ 
 27. [-] 消息列表收到推送提示key重复✅ 
 	1. 气泡组件的meetingLink的按钮没有key
@@ -97,7 +97,7 @@ Updated: 2024-12-11 09:36 Wed
 > [!info]- 404
 >
 > ```json
-> {"userId":"404","userIdStr":"404","emailList":[{"opi_sn":404,"mat_sn":763,"email":"yoyo@chinahighlights.com","default":false,"backup":false},{"opi_sn":404,"mat_sn":764,"email":"yoyo@chinahighlights.net","default":false,"backup":false},{"opi_sn":404,"mat_sn":765,"email":"lyt@hainatravel.com","default":false,"backup":false}],"username":"雷元廷OT","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPDfmVTxPSmNPNAyDNAyA_800_800.png","mobile":"+86-13557032060","email":"lyt@hainatravel.com","openId":"Z1v8OdYXOC4GMcbIkKCdAwiEiE","accountList":[{"OPI_SN":404,"OPI_Code":"LYT","OPI_NameCN":"雷元廷","OPI_DEI_SN":30,"OPI_NameEN":"yoyo"}],"whatsAppBusiness":"8617607730395"}
+> {"userId":"404","userIdStr":"404","emailList":[{"opi_sn":404,"mat_sn":763,"email":"yoyo@chinahighlights.com","default":false,"backup":false},{"opi_sn":404,"mat_sn":764,"email":"yoyo@chinahighlights.net","default":false,"backup":false}],"whatsAppBusiness":"+8617607730395","whatsAppNo":"8613557032060","username":"雷元廷OT","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPDfmVTxPSmNPNAyDNAyA_800_800.png","mobile":"+86-13557032060","email":"lyt@hainatravel.com","openId":"Z1v8OdYXOC4GMcbIkKCdAwiEiE","accountList":[{"OPI_SN":404,"OPI_Code":"LYT","OPI_NameCN":"雷元廷","OPI_DEI_SN":30,"OPI_NameEN":"yoyo"}]}
 > ```
 
 > [!info]- 383

Haina/项目/Trip Planner/flowchart.md

@@ -0,0 +1,70 @@
+---
+Created: 2025-02-24 Mon
+Updated: 2025-03-06 16:34 Thu
+---
+
+
+
+## 1
+
+系统从客人预定表单中提取信息，并直接与AI助手进行交互，不需要顾问介入：
+
+```mermaid
+sequenceDiagram
+    participant Guest
+    participant System
+    participant AIAssistant
+
+    Guest->>System: 提交预定表单信息
+    System->>System: 自动提取信息
+    System->>AIAssistant: 发送客人信息
+    AIAssistant->>System: 返回 session id
+    System->>Guest: 返回 session id
+    System->>Guest: 问候客人
+    Guest->>System: 发送消息
+    System->>AIAssistant: 处理会话
+    AIAssistant->>System: 返回回复
+    System->>Guest: 返回回复
+    loop 多轮对话
+        Guest->>System: 发送消息
+        System->>AIAssistant: 处理会话
+        AIAssistant->>System: 返回回复
+        System->>Guest: 返回回复
+    end
+```
+
+## 2
+
+好的，为了更直观地展示各个角色之间的交互，我们可以使用时序图（Sequence Diagram）。时序图能够清晰地展示角色之间的消息传递和交互流程。以下是根据你的描述生成的时序图：
+
+```mermaid
+sequenceDiagram
+    participant Guest
+    participant System
+    participant Advisor
+    participant AIAssistant
+
+    Guest->>System: 发送消息
+    System->>Advisor: 检查账号是否托管
+    Advisor->>System: 是托管账号
+    System->>AIAssistant: 生成新会话
+    AIAssistant->>System: 返回新会话ID
+    System->>Guest: 问候客人
+    Guest->>System: 回复问候
+    System->>AIAssistant: 收到客人回复
+    AIAssistant->>System: 托管会话
+    AIAssistant->>System: 返回 session id
+    System->>Guest: 返回 session id
+    Guest->>System: 发送后续消息
+    System->>AIAssistant: 多轮对话
+    AIAssistant->>System: 处理会话
+    System->>Guest: 返回回复
+    loop 多轮对话
+        Guest->>System: 发送消息
+        System->>AIAssistant: 处理会话
+        AIAssistant->>System: 返回回复
+        System->>Guest: 返回回复
+    end
+```
+
+这个时序图清晰地展示了用户（Guest）、系统（System）、顾问（Advisor）和AI助手（AI Assistant）之间的交互流程，包括生成新会话、问候客人、AI托管会话以及多轮对话的管理。每个角色之间的消息传递用箭头表示，便于理解。

Haina/项目/Trip Planner/prompt sales-7.md

@@ -0,0 +1,79 @@
+---
+Created: 2025-03-05 Wed
+Updated: 2025-03-18 18:54 Tue
+---
+
+# 参考订单
+
+- Albee240613008
+
+---
+
+Never forget your name is Ada. You work as a Travel Customization Consultant Assistant.
+You work at company named China Highlights. China Highlights's business is the following: China Highlights, the most-chosen and best-rated tour company for personalized travel in China. We are experts in customizing and best-rated in delivering personalized China exploration, ensured by our company-managed local services across China.
+Company values are the following: We are dedicated to providing personalized and stress-free travel services globally, creating travel highlights that paint beautiful memories.
+You are contacting a potential prospect in order to Digging the destinations, hotels, budgets, budgets, budgets, budgets, etc. in China, and the purpose of team members and travel.
+Your means of contacting the prospect is Text.
+
+If you're asked about where you got the user's contact information, say that you got it from public records.
+Keep your responses in short length to retain the user's attention. Never produce lists, just answers.
+Start the conversation by just a greeting and how is the prospect doing without pitching in your first turn.
+Respond in whatever language the user asks the question in.
+Always think about at which conversation stage you are at before answering:
+
+1: Introduction: Start the conversation by introducing yourself and your company. Be polite and respectful while keeping the tone of the conversation professional. Your greeting should be welcoming. Always clarify in your greeting the reason why you are calling.
+2: Value proposition: Briefly explain how your product/service can benefit the prospect. Focus on the unique selling points and value proposition of your product/service that sets it apart from competitors.
+3: Needs analysis: Ask open-ended questions to uncover the prospect's needs and pain points. Listen carefully to their responses and take notes.
+4: Solution presentation: Based on the prospect's needs, present your product/service as the solution that can address their pain points.
+5: Objection handling: Address any objections that the prospect may have regarding your product/service. Be prepared to provide evidence or testimonials to support your claims.
+6: Close: Ask for the sale by proposing a next step. This could be paying a 100USD deposit or upgrading to a travel customization specialist for in-depth customization. Ensure to summarize what has been discussed and reiterate the benefits.
+7: End conversation: The prospect has to leave, the prospect is not interested, or next steps where already determined by the sales agent.
+
+## 技能
+
+### 技能1：知识库使用
+
+- **快速响应**：在接收到咨询时，迅速理解问题核心，以专业、友好的语气进行即时回复。
+- **问题分类与专业回复**：准确判断咨询性质，您拥有访问公司全面知识库的权限，其中包括但不限于人事手册、行政规章、后勤操作指南、顾问培训知识库、销售技巧、销售流程以及公司文化相关的文件。在解答问题前，请先从知识库中寻找最准确、最新的资料以保证所提供信息的质量。如果知识库内没有直接的答案，则根据已有资料进行合理推测，并明确指出这是基于当前可用信息的最佳估计。
+
+### 技能2：持续学习
+
+- **学习**：根据问题描述或对话日志，精准理解问题并持续学习知识库内容。
+- **解决方案提供**：随着公司政策调整或新增加的服务项目，定期更新自己的知识体系，确保始终能够提供最新、最准确的帮助。
+
+### 技能3：个性化旅行建议
+
+- **用户偏好分析**：通过询问或分析用户偏好（如目的地类型、活动兴趣、旅行节奏等）、预算范围、出行日期等关键信息，生成高度契合用户需求的旅行建议。
+
+### 技能4：行程规划与优化
+
+- **智能编排**：根据用户选择的目的地和活动，智能编排每日行程，包括景点游览、餐饮推荐、交通安排等，并考虑时间、距离、开放时间等因素进行最优路径规划。
+- **动态调整**：具备动态调整行程的能力，应对突发情况（如天气变化、临时关闭等）或用户临时需求变更。
+
+## 限制
+
+- 在提供公司内部文档相关咨询时，必须依据最新的知识库内容，确保信息的准确性和时效性。
+- 严格遵循保密机制和保护个人隐私，禁止出现任何客户名字，邮箱，电话，信用卡，银行卡，家庭地址等个人信息
+- 不提供实际的预订服务，仅提供预订建议和比价信息。
+- 旅行建议和行程规划应基于用户的实际需求和偏好，确保个性化和实用性。
+- 所有提供的信息和建议都应符合职业道德规范，不得泄露公司机密或个人隐私。
+
+## 检索说明
+
+- 如果知识库中没有相关知识，在回复时需要特别注明这个是生成的，仅供参考
+
+# 知识库
+
+请记住以下材料，他们可能对回答问题有帮助。
+${documents}
+
+# Memory
+
+在回答用户问题时，请尽量忘记大部分不相关的信息。只有当用户提供的信息与当前问题或对话内容非常相关时，才记住这些信息并加以使用。请确保你的回答简洁、准确，并聚焦于用户当前的问题或对话主题。信息：
+${memory}
+
+# 样例
+
+${samples}
+
+---

Haina/项目/Trip Planner/流程.md

@@ -0,0 +1,29 @@
+---
+Created: 2025-03-18 Tue
+---
+
+系统从客人预定表单中提取信息，并直接与AI助手进行交互，不需要顾问介入：
+
+```mermaid
+sequenceDiagram
+    participant Guest
+    participant System
+    participant AIAssistant
+
+    Guest->>System: 提交预定表单信息
+    System->>System: 自动提取信息
+    System->>AIAssistant: 发送客人信息
+    AIAssistant->>System: 返回 session id
+    System->>Guest: 返回 session id
+    System->>Guest: 问候客人
+    Guest->>System: 发送消息
+    System->>AIAssistant: 处理会话
+    AIAssistant->>System: 返回回复
+    System->>Guest: 返回回复
+    loop 多轮对话
+        Guest->>System: 发送消息
+        System->>AIAssistant: 处理会话
+        AIAssistant->>System: 返回回复
+        System->>Guest: 返回回复
+    end
+```

Haina/项目/支付中心/PayPal.md

@@ -1,6 +1,8 @@
 ---
 Created: 2024-04-24 Wed
-Updated: 2024-08-27 15:17 Tue
+Updated: 2025-03-12 15:55 Wed
+cssclasses:
+  - img-grid
 ---
 
 ### Merchant SERVER API
@@ -18,19 +20,47 @@ Updated: 2024-08-27 15:17 Tue
 
 [Checkout](https://developer.paypal.com/docs/checkout/)
 
+### Todo
+
+1. [ ] 自动分期, 每月发给客人/每月提醒顾问 ➕ 2025-03-04
+2. [ ] 调整信用卡付款的推荐等级: 尾款不推荐; 大额不推荐
+   - 优化成本, 提高利润
+   - 与PayPal谈判费率的空间
+
+#### 旧的链接, 没有使用 order v2的
+
+1. 报价信(无分项, 含景点描述)(F) [PriceLetter](http://202.103.68.35/CustomerManager/english/PriceLetteren.asp?coli_sn=1138664&LGC=1&price_detail=0&VType=2&VTime=5933322)
+
+![left|200](Haina/项目/支付中心/atta/lQLPJx3uV1Cs3YPNAtPNA7ewuLwP2tFVX-MHqbZasIOdAA_951_723.png)
+2. 新版确认信(S)->发送邮件(报价/确认信以附件形式)
+![left|200](Haina/项目/支付中心/atta/lQDPKGKlP0-J60vNBaDNB4CwZS-YyMJpe_4HrWnfOiU-AA_1920_1440.jpg)![left|200](Haina/项目/支付中心/atta/lQDPKdPhCAWlo4vNBaDNB4CwWuFFgJU24E0HrWoFutE8AA_1920_1440.jpg)
+3. App native. app内调起sdk支付
+
 ### ACDC
 
 #### Credit card
 
-1. [ ] PayPal本地支付没有结果, `APPROVED`之后无结果   
+1. [ ] PayPal本地支付没有结果, `APPROVED`之后无结果\
    ![](Haina/项目/支付中心/atta/p24-approved-but-not-completed.json)
-2. [ ] 客人页面: ACDC 显示成功; 后续失败`DECLINED`  
+2. [ ] 客人页面: ACDC 显示成功; 后续失败`DECLINED`\
    ![](Haina/项目/支付中心/atta/ACDC-order%20completed%20but%20capture%20DECLINED.json)
 3. [ ] 记录approved事件 ➕ 2024-08-27
 
 #### Google Pay
 
-### Available
+### ACDC 报告
+
+已在后台设置好账号 <pays@chinahighlights.com> 的ACDC 报告，通过报告页面找到“Custom Templates”里的“ACDCReport”可以下载查看。如果需要自动下载“ By Schedule”，可以授权PayPal开通账号的SFTP功能，后期会每天自动下载。
+
+点击“ View Report” 就可以查看下载好的报告，目前我先从后台提交了7.1至今的交易报告供查看。
+
+通过筛选报告里面的“card type/卡类型” 和 “Payment Source/付款来源” 2个字段来区分ACDC和Apple Pay/ Google Pay的付款。
+
+“card type/卡类型”里面有显示VISA和MASTERCARD的就是ACDC的交易，同时“Payment Source/付款来源”里会显示信用卡直接付款。
+
+“Payment Source/付款来源”里面显示有Apple Pay 和Google Pay的，则是来自于这2个渠道的付款。
+
+### Reference Source
 
 - [支持的国家和地区](https://www.paypal.com/ng/webapps/mpp/country-worldwide)
 - [PayPal API Status](https://www.paypal-status.com/api/production)
@@ -38,17 +68,27 @@ Updated: 2024-08-27 15:17 Tue
 - [ACDC支持](https://developer.paypal.com/docs/checkout/advanced/eligibility/)
 - [测试卡](https://developer.paypal.com/tools/sandbox/card-testing/#link-testgeneratedcardnumbers)
 
+### 测试卡
+
+| Card No.         | Expiry date | CVC code | Card type |
+| ---------------- | ----------- | -------- | --------- |
+| 4032036973225392 | 01/2028     | 442      | Visa      |
+| 343062652211430  | 07/2029     | 8716     | AE        |
+| 5110920188076348 | 05/2027     | 148      | Master    |
+
 ### PayPal Notify
+#### webhook
+3 天内最多重试 25 次
 
 > [!faq] 通知不全
 >
 > 1. webhook没有发送
->    1. `9BU18513BH318232S`
+> 2. 1. `9BU18513BH318232S`
->    2. `5NP174266F735682P` `CW231214017_T`
+> 3. 2. `5NP174266F735682P` `CW231214017_T`
->    3. ~~`4NW74413KE195510H` `SHX240325005_T`~~
+> 4. 3. ~~`4NW74413KE195510H` `SHX240325005_T`~~
->    4. ~~`49N102461W2482132` `CA240704075_T`~~
+> 5. 4. ~~`49N102461W2482132` `CA240704075_T`~~
-> 2. IPN没有发送
+> 6. IPN没有发送
->    1. `39G25248JF041404J` Upsell, 自动转账到账户
+> 7. 1. `39G25248JF041404J` Upsell, 自动转账到账户
-> 3. 两个通知都没有
+> 8. 两个通知都没有
->    1. `2SX71059RU3114540`
+> 9. 1. `2SX71059RU3114540`
->    2. `5XM96027GJ2728935`
+> 10. 2. `5XM96027GJ2728935`

Haina/项目/支付中心/Wxpay.md

@@ -0,0 +1,7 @@
+---
+Created: 2025-04-08 Tue
+Updated: 2025-04-10 16:35 Thu
+---
+
+[账单说明](https://kf.qq.com/faq/180925NRz6Jb180925e6jMRV.html)
+[在线咨询](https://support.pay.weixin.qq.com/online-service?from=wechatpay)

Haina/项目/支付中心/连连-支付方式.md

@@ -0,0 +1,89 @@
+---
+Created: 2025-04-03 Thu
+Updated: 2025-04-03 17:10 Thu
+---
+
+| Logo                                                                                   | 支付方式  | 类型                                                                                         | 主要流行国家/地区         | 技术参数代码 |
+| -------------------------------------------------------------------------------------- | ----- | ------------------------------------------------------------------------------------------ | ----------------- | ------ |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338322/image-preview) |       |                                                                                            |                   |        |
+| [Visa](https://doc.lianlianpay.com/338488m0)                                           | 国际卡   | 全球                                                                                         | inter_credit_card |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338286/image-preview) |       |                                                                                            |                   |        |
+| [MasterCard](https://doc.lianlianpay.com/338488m0)                                     | 国际卡   | 全球                                                                                         |                   |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338282/image-preview) |       |                                                                                            |                   |        |
+| [American Express](https://doc.lianlianpay.com/338488m0)                               | 国际卡   | 全球                                                                                         |                   |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338290/image-preview) |       |                                                                                            |                   |        |
+| [JCB](https://doc.lianlianpay.com/338488m0)                                            | 国际卡   | 全球                                                                                         |                   |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338301/image-preview) |       |                                                                                            |                   |        |
+| [Discover](https://doc.lianlianpay.com/338488m0)                                       | 国际卡   | 全球                                                                                         |                   |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338315/image-preview) |       |                                                                                            |                   |        |
+| [Diners Club](https://doc.lianlianpay.com/338488m0)                                    | 国际卡   | 全球                                                                                         |                   |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338715/image-preview) |       |                                                                                            |                   |        |
+| [Union Pay](https://doc.lianlianpay.com/338488m0)                                      | 国际卡   | 全球                                                                                         |                   |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338422/image-preview) |       |                                                                                            |                   |        |
+| [Afterpay](https://doc.lianlianpay.com/338717m0)                                       | 先买后付  | 美国，加拿大，澳大利亚，新西兰                                                                            | afterpay          |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338280/image-preview) |       |                                                                                            |                   |        |
+| [Apple Pay](https://doc.lianlianpay.com/338492m0)                                      | 电子钱包  | 全球                                                                                         | apple_pay         |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338312/image-preview) |       |                                                                                            |                   |        |
+| [Google Pay](https://doc.lianlianpay.com/338502m0)                                     | 电子钱包  | 全球                                                                                         | google_pay        |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338302/image-preview) |       |                                                                                            |                   |        |
+| [Klarna](https://doc.lianlianpay.com/338504m0)                                         | 先买后付  | 澳大利亚、奥地利、比利时、加拿大、捷克、丹麦、芬兰、法国、德国、希腊、匈牙利、 爱尔兰、意大利、墨西哥、荷兰、挪威、波兰、葡萄牙、罗马尼亚、斯洛伐克、西班牙、瑞典、瑞士、英国、美国 | klarna            |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338283/image-preview) |       |                                                                                            |                   |        |
+| [Alipay CN](https://doc.lianlianpay.com/338490m0)                                      | 电子钱包  | 中国                                                                                         | alipay_cn         |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338281/image-preview) |       |                                                                                            |                   |        |
+| [Alipay HK](https://doc.lianlianpay.com/338491m0)                                      | 电子钱包  | 中国香港                                                                                       | alipay_hk         |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338311/image-preview) |       |                                                                                            |                   |        |
+| [WeChat Pay](https://doc.lianlianpay.com/338521m0)                                     | 电子钱包  | 中国                                                                                         | wechat_pay        |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338307/image-preview) |       |                                                                                            |                   |        |
+| [Konbini](https://doc.lianlianpay.com/338505m0)                                        | 现金    | 日本                                                                                         | konbini           |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338298/image-preview) |       |                                                                                            |                   |        |
+| [Pay Easy](https://doc.lianlianpay.com/338514m0)                                       | 现金    | 日本                                                                                         | pay_easy          |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338294/image-preview) |       |                                                                                            |                   |        |
+| [Kakao Pay](https://doc.lianlianpay.com/338503m0)                                      | 电子钱包  | 韩国                                                                                         | kakaopay          |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338292/image-preview) |       |                                                                                            |                   |        |
+| [Naver Pay](https://doc.lianlianpay.com/338510m0)                                      | 电子钱包  | 韩国                                                                                         | naver_pay         |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338309/image-preview) |       |                                                                                            |                   |        |
+| [PAYCO](https://doc.lianlianpay.com/338513m0)                                          | 电子钱包  | 韩国                                                                                         | payco             |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338304/image-preview) |       |                                                                                            |                   |        |
+| [Akulaku](https://doc.lianlianpay.com/338489m0)                                        | 先买后付  | 印度尼西亚                                                                                      | akulaku_paylater  |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338317/image-preview) |       |                                                                                            |                   |        |
+| [BNI](https://doc.lianlianpay.com/338493m0)                                            | 银行转账  | 印度尼西亚                                                                                      | bni               |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338320/image-preview) |       |                                                                                            |                   |        |
+| [BRI](https://doc.lianlianpay.com/338497m0)                                            | 银行转账  | 印度尼西亚                                                                                      | bri               |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338299/image-preview) |       |                                                                                            |                   |        |
+| [CIMB Clicks](https://doc.lianlianpay.com/338499m0)                                    | 银行转账  | 印度尼西亚                                                                                      | cimb_clicks       |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338319/image-preview) |       |                                                                                            |                   |        |
+| [DANA](https://doc.lianlianpay.com/338500m0)                                           | 电子钱包  | 印度尼西亚                                                                                      | dana              |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338300/image-preview) |       |                                                                                            |                   |        |
+| [Mandiri](https://doc.lianlianpay.com/338507m0)                                        | 现金    | 印度尼西亚                                                                                      | mandiri           |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338297/image-preview) |       |                                                                                            |                   |        |
+| [Maybank](https://doc.lianlianpay.com/338508m0)                                        | 银行转账  | 印度尼西亚                                                                                      | maybank           |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338314/image-preview) |       |                                                                                            |                   |        |
+| [Nobu Bank QRIS](https://doc.lianlianpay.com/338511m0)                                 | 二维码支付 | 印度尼西亚                                                                                      | nobu_bank_qris    |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338306/image-preview) |       |                                                                                            |                   |        |
+| [OVO](https://doc.lianlianpay.com/338512m0)                                            | 电子钱包  | 印度尼西亚                                                                                      | ovo               |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338289/image-preview) |       |                                                                                            |                   |        |
+| [Permata](https://doc.lianlianpay.com/338515m0)                                        | 银行转账  | 印度尼西亚                                                                                      | permata           |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338293/image-preview) |       |                                                                                            |                   |        |
+| [Boost](https://doc.lianlianpay.com/338495m0)                                          | 电子钱包  | 马来西亚                                                                                       | boost             |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338316/image-preview) |       |                                                                                            |                   |        |
+| [Mcash](https://doc.lianlianpay.com/338509m0)                                          | 现金    | 马来西亚                                                                                       | mcash             |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338310/image-preview) |       |                                                                                            |                   |        |
+| [Touch n Go](https://doc.lianlianpay.com/338519m0)                                     | 电子钱包  | 马来西亚                                                                                       | tng               |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338285/image-preview) |       |                                                                                            |                   |        |
+| [BPI](https://doc.lianlianpay.com/338496m0)                                            | 电子钱包  | 菲律宾                                                                                        | bpi               |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338296/image-preview) |       |                                                                                            |                   |        |
+| [GCash](https://doc.lianlianpay.com/338501m0)                                          | 电子钱包  | 菲律宾                                                                                        | gcash             |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338284/image-preview) |       |                                                                                            |                   |        |
+| [Bualuang iBanking](https://doc.lianlianpay.com/338498m0)                              | 银行转账  | 泰国                                                                                         | bualuang_banking  |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338318/image-preview) |       |                                                                                            |                   |        |
+| [Krungsri Online](https://doc.lianlianpay.com/338506m0)                                | 银行转账  | 泰国                                                                                         | krungsri_online   |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338303/image-preview) |       |                                                                                            |                   |        |
+| [Prompt Pay](https://doc.lianlianpay.com/338517m0)                                     | 银行转账  | 泰国                                                                                         | prompt_pay        |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338295/image-preview) |       |                                                                                            |                   |        |
+| [Rabbit LINE Pay](https://doc.lianlianpay.com/338518m0)                                | 电子钱包  | 泰国                                                                                         | rabbit_line_pay   |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338288/image-preview) |       |                                                                                            |                   |        |
+| [TrueMoney](https://doc.lianlianpay.com/338520m0)                                      | 电子钱包  | 泰国                                                                                         | truemoney         |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338279/image-preview) |       |                                                                                            |                   |        |
+| [Boleto](https://doc.lianlianpay.com/338494m0)                                         | 现金    | 巴西                                                                                         | boleto            |        |
+| ![](https://doc.lianlianpay.com/api/v1/projects/345279/resources/338313/image-preview) |       |                                                                                            |                   |        |
+| [Pix](https://doc.lianlianpay.com/338516m0)                                            | 银行转账  | 巴西                                                                                         | pix               |        |

Haina/项目/支付中心/连连支付.md

@@ -0,0 +1,96 @@
+---
+Created: 2025-03-09 Sun
+Updated: 2025-03-17 13:50 Mon
+---
+
+## 入驻
+
+1. 平台入驻审核：  
+   参见主体材料要求并通过此链接提交： <https://gakycmerchant.lianlianpay.com/user/register?inviteCode=jiangyd  >
+2. 测试账户开通：  
+   请通过链接内方式申请测试账户：<https://doc.lianlianpay.com/pay-guide/flow-step/apply-account >
+   测试文档：<https://doc.lianlianpay.com/pay-guide/pay-scene/checkout/card>
+
+- [登录](https://global.lianlianpay.com/):
+  18174165315
+  cits@123
+  <fgy@hainatravel.com>
+- 费率
+
+![left|800](Haina/项目/支付中心/atta/lQLPJw8dv5ySusPNAV7NA8uwek4kWToQUq4Hqa0F3J8sAA_971_350.png)
+
+## 测试账号
+
+iFrame2.0模式的测试账号信息
+商户名:桂林海纳国际旅行社有限公司
+商户号`merchant_id`:202503100003060003
+二级商户号`sub_merchant_id`:1020250310968002
+商户站:<https://gpdashboard.lianlianpay-inc.com/user/login>
+登录账号:<lyt@hainatravel.com>
+登录密码:hml123
+私钥信息:<https://doc.lianlianpay.com/pay-guide/flow-step/lianlian-key-config>
+测试信息:<https://doc.lianlianpay.com/pay-guide/flow-step/check-test-case>
+验收指南:<https://doc.lianlianpay.com/download/testreport>
+
+支付域名: <https://celer-api.lianlianpay-inc.com/>
+商户后台: <https://gpdashboard.lianlianpay-inc.com/user/login>
+
+> [!info]- 公钥
+>
+> ```plain
+> MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo3Vy+gy/w6ygPREJb4gRWMtA/PfaPMqiTdcHngeSDoGuCAN/9PqufDIc83F1PE2s+6nNXtj0uJT8mRVjwWoh96eDpVcxAC0Y3NIB+2Z/sx3EsTB0kRyLxE+ZBcl2ms8jXGf/IQSUb8FrEBBvS6WWaDcKjfDYsEM5AJP3npnIZXW2h/wlslmEh8FJJqi0Ne2wR+Q0zzZKCERcxSrwSXKL2sRusc7MOZxUVE+1EcmTkwAl1lxY2s/DQAVAZBT/DXo5plODIwyzIFyW9aNGm2YIVofITnFtWxNoXL0BlFFnfGVncvohmRwA5zCPCxtIYmM3zdE+n9he7n/jnVWEGoXTDQIDAQAB
+> ```
+
+> [!info]- 账号绑定
+> 手机: +86 13557032060
+> 邮箱: <lyt@hainatravel.com>
+
+### 测试卡
+
+| 验证场景       | 品牌                                                                                          | 卡号                  | cvv    | 日期      | 付款结果 | 绑卡结果        |
+| ---------- | ------------------------------------------------------------------------------------------- | ------------------- | ------ | ------- | ---- | ----------- |
+| 国际卡        | Visa                                                                                        | 4200 0000 0000 0000 | 任意3位数字 | 任意未来的日期 | 成功   | 成功          |
+|            | Visa（3DS无感验证）                                                                               | 4066 3300 0000 0004 | 任意3位数字 | 任意未来的日期 | 成功   | 成功          |
+|            | Visa（3DS挑战验证）                                                                               | 4938 7300 0000 0001 | 任意3位数字 | 任意未来的日期 | 成功   | 成功          |
+|            | Visa                                                                                        | 4556 9839 3320 5368 | 任意3位数字 | 任意未来的日期 | 成功   | 成功(5min后失效) |
+|            | MasterCard                                                                                  | 5271 2844 1024 2128 | 任意3位数字 | 任意未来的日期 | 成功   | 成功          |
+|            | MasterCard                                                                                  | 5289 0916 8055 4763 | 任意3位数字 | 任意未来的日期 | 失败   | 失败          |
+|            | AMEX                                                                                        | 3415 0209 8634 895  | 任意4位数字 | 任意未来的日期 | 成功   | 成功          |
+|            | JCB                                                                                         | 3530 1113 3330 0000 | 任意3位数字 | 任意未来的日期 | 成功   | 成功          |
+|            | Diners Club                                                                                 | 3613 4900 7331 01   | 任意3位数字 | 任意未来的日期 | 成功   | 成功          |
+|            | MasterCard                                                                                  | 5424 1840 4982 1670 | 任意3位数字 | 任意未来的日期 | 失败   | 成功          |
+| Google Pay | Visa                                                                                        | 4242 4242 4242 4242 | 任意3位数字 | 任意未来的日期 | 成功   | /           |
+|            | MasterCard                                                                                  | 5555 5555 5555 4444 | 任意3位数字 | 任意未来的日期 | 成功   | /           |
+| Apple Pay  | Visa                                                                                        | 4051 0693 0220 0121 | 340    | 01/27   | 成功   | /           |
+|            | Visa（借记卡）                                                                                   | 4761 1200 1000 0492 | 480    | 01/27   | 成功   | /           |
+|            | Mastercard                                                                                  | 5204 2452 5046 0049 | 111    | 12/24   | 成功   | /           |
+|            | Apple Pay更多测试卡号可查看[Apple test card](https://developer.apple.com/apple-pay/sandbox-testing/) |                     |        |         |      |             |
+
+### 支付成功url
+
+`redirect_url` length 512
+支付成功后，用户跳转到支付成功地址，默认POST请求，注意此参数中不允许出现“#”符号
+
+```json
+// 3DS
+{
+    "ll_transaction_id": "2025031703559307",
+    "merchant_transaction_id": "System190813046_T1--6889",
+    "payment_data": {
+        "account_date": "20250317",
+        "exchange_rate": "1.00000000",
+        "installments": "1",
+        "payment_amount": "0.20",
+        "payment_currency_code": "USD",
+        "payment_status": "PS",
+        "payment_time": "20250317134731",
+        "settlement_amount": "0.20",
+        "settlement_currency_code": "USD"
+    },
+    "payment_url": "https://gacashier.lianlianpay-inc.com/3ds?tdsKey=28d255f6c23c4c29b7ea3c071e1ce1be"
+}
+```
+
+## 线上环境
+
+支付域名：[https://gpapi.lianlianpay.com](https://gpapi.lianlianpay.com/)