vault backup: 2024-08-09 22:46:28

Affected files:
.obsidian/community-plugins.json
.obsidian/plugins/obsidian-excalidraw-plugin/data.json
.obsidian/plugins/obsidian-excalidraw-plugin/main.js
.obsidian/plugins/obsidian-excalidraw-plugin/manifest.json
.obsidian/plugins/obsidian-excalidraw-plugin/styles.css
.obsidian/plugins/obsidian-tasks-plugin/main.js
.obsidian/plugins/obsidian-tasks-plugin/manifest.json
.obsidian/plugins/obsidian-tasks-plugin/styles.css
.obsidian/types.json
Excalidraw/Drawing 2024-08-09 10.18.44.excalidraw.md
Haina/.nojekyll
Haina/Todo.md
Haina/Weekly/2024/2024-W27.md
Haina/Weekly/2024/2024-W28.md
Haina/Weekly/2024/2024-W29.md
Haina/Weekly/2024/2024-W30.md
Haina/Weekly/2024/2024-W31.md
Haina/Weekly/2024/2024-W32.md
Haina/Weekly/2024/2024-W33.md
Haina/_sidebar.md
Haina/index.html
Haina/项目/PayPal Merchant SERVER API.md
Haina/项目/PayPal.md
Haina/项目/SCRM/一期总结.md
Haina/项目/价格平台/价格平台.md
breezy-weather-arm64-v8a-v5.2.2_standard.apk
main
lyt 11 months ago
parent 1fb4e6cbea
commit 3e2432e0df

@ -14,9 +14,9 @@
"dbfolder",
"dataview",
"templater-obsidian",
"obsidian-excalidraw-plugin",
"calendar",
"obsidian-tasks-plugin",
"periodic-notes",
"advanced-cursors"
"advanced-cursors",
"obsidian-excalidraw-plugin"
]

@ -1,11 +1,15 @@
{
"folder": "Excalidraw",
"cropFolder": "",
"annotateFolder": "",
"embedUseExcalidrawFolder": false,
"templateFilePath": "Excalidraw/Template.excalidraw",
"scriptFolderPath": "Excalidraw/Scripts",
"compress": false,
"compress": true,
"decompressForMDView": false,
"onceOffCompressFlagReset": true,
"onceOffGPTVersionReset": false,
"autosave": true,
"autosaveInterval": 15000,
"autosaveIntervalDesktop": 15000,
"autosaveIntervalMobile": 10000,
"drawingFilenamePrefix": "Drawing ",
@ -13,12 +17,16 @@
"drawingFilnameEmbedPostfix": " ",
"drawingFilenameDateTime": "YYYY-MM-DD HH.mm.ss",
"useExcalidrawExtension": true,
"displaySVGInPreview": true,
"cropPrefix": "cropped_",
"annotatePrefix": "annotated_",
"annotatePreserveSize": false,
"previewImageType": "SVGIMG",
"allowImageCache": true,
"allowImageCacheInScene": true,
"displayExportedImageIfAvailable": false,
"previewMatchObsidianTheme": false,
"width": "400",
"height": "",
"dynamicStyling": "colorful",
"isLeftHanded": false,
"iframeMatchExcalidrawTheme": true,
@ -27,6 +35,10 @@
"matchThemeTrigger": false,
"defaultMode": "normal",
"defaultPenMode": "never",
"penModeCrosshairVisible": true,
"renderImageInMarkdownReadingMode": false,
"renderImageInHoverPreviewForMDNotes": false,
"renderImageInMarkdownToPDF": false,
"allowPinchZoom": false,
"allowWheelZoom": false,
"zoomToFitOnOpen": true,
@ -40,6 +52,8 @@
"hoverPreviewWithoutCTRL": false,
"linkOpacity": 1,
"openInAdjacentPane": false,
"showSecondOrderLinks": true,
"focusOnFileTab": false,
"openInMainWorkspace": true,
"showLinkBrackets": true,
"allowCtrlClick": true,
@ -52,19 +66,25 @@
"exportWithTheme": true,
"exportWithBackground": true,
"exportPaddingSVG": 10,
"exportEmbedScene": false,
"keepInSync": false,
"autoexportSVG": false,
"autoexportPNG": false,
"autoExportLightAndDark": false,
"autoexportExcalidraw": false,
"embedType": "excalidraw",
"embedMarkdownCommentLinks": true,
"embedWikiLink": true,
"syncExcalidraw": false,
"experimentalFileType": false,
"experimentalFileTag": "✏️",
"experimentalLivePreview": true,
"fadeOutExcalidrawMarkup": false,
"loadPropertySuggestions": true,
"experimentalEnableFourthFont": false,
"experimantalFourthFont": "Virgil",
"addDummyTextElement": false,
"zoteroCompatibility": false,
"fieldSuggester": true,
"compatibilityMode": false,
"drawingOpenCount": 0,
@ -72,7 +92,7 @@
"library2": {
"type": "excalidrawlib",
"version": 2,
"source": "https://github.com/zsviczian/obsidian-excalidraw-plugin/releases/tag/1.9.12",
"source": "https://github.com/zsviczian/obsidian-excalidraw-plugin/releases/tag/2.3.0",
"libraryItems": []
},
"imageElementNotice": true,
@ -84,7 +104,7 @@
"mdCSS": "",
"scriptEngineSettings": {},
"defaultTrayMode": true,
"previousRelease": "1.9.25",
"previousRelease": "2.3.0",
"showReleaseNotes": true,
"showNewVersionNotification": true,
"latexBoilerplate": "\\color{blue}",
@ -407,8 +427,326 @@
"pdfScale": 4,
"pdfBorderBox": true,
"pdfGapSize": 20,
"pdfGroupPages": false,
"pdfLockAfterImport": true,
"pdfNumColumns": 1,
"pdfNumRows": 1,
"pdfDirection": "right",
"pdfImportScale": 0.3,
"mathjaxSourceURL": "https://cdn.jsdelivr.net/npm/mathjax@3.2.1/es5/tex-svg.js"
"laserSettings": {
"DECAY_LENGTH": 50,
"DECAY_TIME": 1000,
"COLOR": "#ff0000"
},
"embeddableMarkdownDefaults": {
"useObsidianDefaults": false,
"backgroundMatchCanvas": false,
"backgroundMatchElement": true,
"backgroundColor": "#fff",
"backgroundOpacity": 60,
"borderMatchElement": true,
"borderColor": "#fff",
"borderOpacity": 0,
"filenameVisible": false
},
"canvasImmersiveEmbed": true,
"startupScriptPath": "",
"openAIAPIToken": "",
"openAIDefaultTextModel": "gpt-3.5-turbo-1106",
"openAIDefaultVisionModel": "gpt-4o",
"openAIDefaultImageGenerationModel": "dall-e-3",
"openAIURL": "https://api.openai.com/v1/chat/completions",
"openAIImageGenerationURL": "https://api.openai.com/v1/images/generations",
"openAIImageEditsURL": "https://api.openai.com/v1/images/edits",
"openAIImageVariationURL": "https://api.openai.com/v1/images/variations",
"modifierKeyConfig": {
"Mac": {
"LocalFileDragAction": {
"defaultAction": "image-import",
"rules": [
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image-import"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": true,
"meta_ctrl": false,
"result": "link"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image-url"
},
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": true,
"meta_ctrl": false,
"result": "embeddable"
}
]
},
"WebBrowserDragAction": {
"defaultAction": "image-url",
"rules": [
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image-url"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": true,
"meta_ctrl": false,
"result": "link"
},
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": true,
"meta_ctrl": false,
"result": "embeddable"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image-import"
}
]
},
"InternalDragAction": {
"defaultAction": "link",
"rules": [
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "link"
},
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": true,
"result": "embeddable"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": true,
"result": "image-fullsize"
}
]
},
"LinkClickAction": {
"defaultAction": "new-tab",
"rules": [
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "active-pane"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": false,
"result": "new-tab"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": true,
"meta_ctrl": false,
"result": "new-pane"
},
{
"shift": true,
"ctrl_cmd": true,
"alt_opt": true,
"meta_ctrl": false,
"result": "popout-window"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": true,
"result": "md-properties"
}
]
}
},
"Win": {
"LocalFileDragAction": {
"defaultAction": "image-import",
"rules": [
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image-import"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": false,
"result": "link"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image-url"
},
{
"shift": true,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": false,
"result": "embeddable"
}
]
},
"WebBrowserDragAction": {
"defaultAction": "image-url",
"rules": [
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image-url"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": false,
"result": "link"
},
{
"shift": true,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": false,
"result": "embeddable"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image-import"
}
]
},
"InternalDragAction": {
"defaultAction": "link",
"rules": [
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "link"
},
{
"shift": true,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": false,
"result": "embeddable"
},
{
"shift": true,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "image"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": true,
"meta_ctrl": false,
"result": "image-fullsize"
}
]
},
"LinkClickAction": {
"defaultAction": "new-tab",
"rules": [
{
"shift": false,
"ctrl_cmd": false,
"alt_opt": false,
"meta_ctrl": false,
"result": "active-pane"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": false,
"result": "new-tab"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": true,
"meta_ctrl": false,
"result": "new-pane"
},
{
"shift": true,
"ctrl_cmd": true,
"alt_opt": true,
"meta_ctrl": false,
"result": "popout-window"
},
{
"shift": false,
"ctrl_cmd": true,
"alt_opt": false,
"meta_ctrl": true,
"result": "md-properties"
}
]
}
}
},
"slidingPanesSupport": false,
"areaZoomLimit": 1,
"longPressDesktop": 500,
"longPressMobile": 500,
"isDebugMode": false,
"rank": "Bronze"
}

File diff suppressed because one or more lines are too long

@ -1,11 +1,12 @@
{
"id": "obsidian-excalidraw-plugin",
"name": "Excalidraw",
"version": "1.9.25",
"version": "2.3.0",
"minAppVersion": "1.1.6",
"description": "An Obsidian plugin to edit and view Excalidraw drawings",
"author": "Zsolt Viczian",
"authorUrl": "https://zsolt.blog",
"fundingUrl": "https://ko-fi.com/zsolt",
"helpUrl": "https://github.com/zsviczian/obsidian-excalidraw-plugin#readme",
"isDesktopOnly": false
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,9 +1,10 @@
{
"id": "obsidian-tasks-plugin",
"name": "Tasks",
"version": "5.0.0",
"version": "7.6.1",
"minAppVersion": "1.1.1",
"description": "Task management for Obsidian",
"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",
"authorUrl": "https://github.com/obsidian-tasks-group",
"fundingUrl": "https://github.com/sponsors/claremacrae",

File diff suppressed because one or more lines are too long

@ -0,0 +1,27 @@
{
"types": {
"aliases": "aliases",
"cssclasses": "multitext",
"tags": "tags",
"excalidraw-plugin": "text",
"excalidraw-export-transparent": "checkbox",
"excalidraw-mask": "checkbox",
"excalidraw-export-dark": "checkbox",
"excalidraw-export-padding": "number",
"excalidraw-export-pngscale": "number",
"excalidraw-export-embed-scene": "checkbox",
"excalidraw-link-prefix": "text",
"excalidraw-url-prefix": "text",
"excalidraw-link-brackets": "checkbox",
"excalidraw-onload-script": "text",
"excalidraw-linkbutton-opacity": "number",
"excalidraw-default-mode": "text",
"excalidraw-font": "text",
"excalidraw-font-color": "text",
"excalidraw-border-color": "text",
"excalidraw-css": "text",
"excalidraw-autoexport": "text",
"excalidraw-embeddable-theme": "text",
"excalidraw-open-md": "checkbox"
}
}

@ -0,0 +1,31 @@
---
excalidraw-plugin: parsed
tags: [excalidraw]
---
==⚠ Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠== You can decompress Drawing data with the command palette: 'Decompress current Excalidraw file'. For more info check in plugin settings under 'Saving'
# Excalidraw Data
## Text Elements
%%
## Drawing
```compressed-json
N4KAkARALgngDgUwgLgAQQQDwMYEMA2AlgCYBOuA7hADTgQBuCpAzoQPYB2KqATLZMzYBXUtiRoIACyhQ4zZAHoFAc0JRJQgEYA6bGwC2CgF7N6hbEcK4OCtptbErHALRY8RMpWdx8Q1TdIEfARcZgRmBShcZQUebQBmbQAGGjoghH0EDihmbgBtcDBQMBKIEm4IAEkAFgAZIQQAM2ViADYAVmdSZwA5AE1iAFkAfQBpIwBVVJLIWEQKwOwojmVg
6dLMbmdqgEYATn5SmC34pKTtPb2eHYAOAHZ2w8gKEnVuHaS9i8uf39+nqQIQjKaTceJ8QqQayrcSoJIA5hQUhsADWCAAwmx8GxSBUAMQ7BCEwnrSCaXDYFHKZFCDjETHY3ESJHWZhwXCBbKkiCNQj4fAAZVgawkgg83MRyLRAHVXpJuBCZhBJaiEEKYCL0GLygCaSCOOFcmgdgC2OzsGpjsazgDqcI4JViEbUHkALoAxrkTKO7gcIT8gGEOlYCq4
FK64R0g3MZ3FJVzWHxSEAXwRCAQxHePGqrWq9z21UekIYTFYnG4NxNxcYLHYHB6nDE3Ae7XaOzuPFbgeYABF0lAM9wkQ0AZpI8QAKLBTLZZ1ugFCODEXADzPGjvxHatH5tvZFpVEDgo33+/AA7GUwdoRoEMKFVOFOOQcoSACOADV4gg4AApG49zAACsAAVNB4AAhZwJgARWIHh4j2bkE1DUhkSoAFNjQZxTgOYsrVQZweALC5cwLa52ng1p9gBF5
iDeNAiLuAFJCBEEoG4PNkh4DtC3iao7laeIbiSG5WgBaFNXhYsVTRBkcXxYkiSQUcKSpGk6Tkpl0BZDg2Q5LJ2I9PlBWFWFlSxHVpKRVVZTo+UGIRay0XVTVzPFCM/EkaNnSrJUzQpS13htYs7UXR053dYtPVwb011QP0A2LINiBDCRcB2bl1OIbzuCfWZ4FhHgUzTK9eB2ds7juPZWnggEazLLhjV2OrSzrBsOCbY1uJE3YrlwpVCF7ftSuHBBR
3HKcMgM50ErPYtF2XVd3g3Lcfl2VopIPINjzQWbzzYS84pvfAwgBOA2CDHJ8khMAChmEpNvupIbsi+67vu25FXu7Ybi4nj2j4gShJE1oXqeW6brAbNqnBsBtlaP7swB/jBOE0SwZu96ZkY2HsOqRHeJR4H0fu11IVe0p8FCKBMX0fQ1FXYCLq5NAsahu54nBoqZgpgQolIKBwOSoNlFym6MGnAyfQkGp6iaFoOi6XoBhGcYpnBnkDqEZ1zh2do7h
zdpqj3DabgB+JwQ15RcDgd4Nd5TAMyZy6T35YriyyYghbpEXXbmpVEQ5KAAEFULYCgWNwOK9o9ulQ7QyO4ogDk0O5IIxwoUrjrvEpk3AV7k7gOAhRXWE42gFjMgqIg2PWBhCAQChwNU0KNKxeSJDxRpu57uvsBETkoEqAd9CFKUMXbrSIAJJSSUOCB+9QqWR+bylW/pSeKh0vTB77gfl4yAAxYyXLM7VM3nxfB+HjIx5suUFUv/fshv0enLVUyKn
Pvel5fkeACVhD6kNHbQoC9n5DxHgAeXNIFa0j1wG/0gUfTgUBD4xT5PhfckAr4H30IfVBApCBGEKgg3Bf8MgABUsAhxro1dAwRGiGTAeQ5Bb8g7x3DonP2T8kGvwnHHMOEcQhJxTuHOuzBsDIn5AADW4O0G4nMwGSOkfgPoHEbj4zOHcSsnZ55GDYAYMWSp6AEAaO8e8vDr4APHDlCQWU67UhIEQkhPCwFOI3oyYxpRwJYiTnidEexAmBO5P/BAy
h/QcnxBOHsMSYkQEsSwiBd80QwKgHWGap555wECGYYQzAADipBnHENhDHUo0VMhhODMUlY3jIBZFwJoYIcVRoAmwEQW2aA2nFg4DFWEPS/JCCgIeAZpAGiJNKHYQCCAljMAFH0uAgw2ApQEU0lp3Bs4IHAA+SAvJgixjzsmIAA==
```
%%

@ -0,0 +1,80 @@
---
> [!todo] Not done
>
> ```tasks
> not done
> path includes Haina
> (filter by function task.status.name === 'Todo')
> sort by path reverse
> sort by heading
> ```
> [!todo] In Progress
>
> ```tasks
> not done
> path includes Haina
> (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
> filter by function task.status.name === 'forwarded'
> sort by path reverse
> sort by heading
> ```
> [!tip] Idea, Important
>
> ```tasks
> not done
> path includes Haina
> 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
> filter by function task.status.name === 'question'
> sort by path reverse
> sort by heading
> ```
> [!fail] Cancelled
>
> ```tasks
> path includes Haina
> filter by function task.status.name === 'canceled'
> sort by path reverse
> sort by heading
> ```
> [!todo] Todo
>
> ```tasks
> not done
> path includes Haina
> (filter by function task.status.type === 'TODO')
> sort by path reverse
> sort by heading
> ```

@ -36,10 +36,10 @@ tags:
1. [x] 处理交易记录的API地址 ✅ 2024-07-02
2. [x] 退款接口 ✅ 2024-07-02
1. [x] 切换账户 ✅ 2024-07-03
2. [/] 排查仍然是V1版本的PayPal
2. [-] 排查仍然是V1版本的PayPal
1. Elena240624161_T--4179
2. Trippest: 催款信: 是cgi_bin 按钮
3. [ ] 退款结果返回财务系统
3. ["] 退款结果返回财务系统
4. [?] PayPal通知不全
1. webhook没有发送
1. `9BU18513BH318232S`

@ -17,12 +17,12 @@ tags:
#### WebHT 基础信息价格管理
1. [ ] 年份,
1. [x] 年份, ✅ 2024-07-23
2. [x] 绑定产品的显示 ✅ 2024-07-09
3. [x] 绑定的搜索, 接口和表格 ✅ 2024-07-09
4. [x] 地接的审核结果页面 ✅ 2024-07-10
5. [x] 跳转代理录入 ✅ 2024-07-10
6. [ ] 权限整理
6. [x] 权限整理 ✅ 2024-07-23
1. 代理录入
2. 审核页面
3. 绑定, 录入
@ -36,7 +36,7 @@ tags:
#### HT 统计
1. 销售-老客户数据导出
1. #优化 销售-老客户数据导出
## 本周计划
@ -73,6 +73,7 @@ tags:
> done after last monday
> path includes Haina
> path includes Weekly/2024
> sort by done reverse
> sort by path reverse
> sort by heading
> ```

@ -25,12 +25,12 @@ tags:
#### 支付中心
1. PayPal 信用卡网关付款
1. #新增 PayPal 信用卡网关付款
2. PayPal退款: 试用, 排查
1. `2KN514407M419305D` 有记录payee, 没传到接口
> 没有导入
2. `99591415PB504994G` App收款, 不从支付中心, 版本是*V1* `web_accept`
3. paypal note 增加字段
3. #优化 paypal note 增加字段
#### Sales CRM

@ -17,7 +17,7 @@ tags:
#### WebHT 基础信息价格管理
1. SearchForm 初始化同时获取数据
1.
### 维护工作
@ -26,6 +26,7 @@ tags:
1. #新增 PayPal 信用卡网关付款. 已开发好, 后续根据需求上线[待定]
2. #优化 收款记录`处理时间`, `收款账户`
3. #优化 PayPal退款: 处理缺少参数的旧数据, 从capture查询(多账户); 复用token
4. #优化 PayPal Trippest模板
#### HT 统计
@ -35,6 +36,14 @@ tags:
#### Sales CRM
1. [ ] 文件上传改为前端直接传到OSS
2. 系统价值相关数据统计
1. [x] 会话数量趋势: 每月活跃 ✅ 2024-07-22
2. [x] 会话数量趋势: 每月活跃, 有回复的 ✅ 2024-07-23
3. [x] 回复率: ✅ 2024-07-23
4. [x] 首次回复周期, 按国籍 ✅ 2024-07-23
5. [x] 使用的订单成行率 ✅ 2024-07-23
6. [x] 成行周期 ✅ 2024-07-26
7. [x] 客人国际数量 ✅ 2024-07-22
## 本周计划

@ -0,0 +1,133 @@
---
Created: 2024-07-24 Wed
Updated: 2024-07-24 14:56 Wed
tags:
- 周报
---
[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q3|Q3]] / [[Haina/Monthly/2024-07|July]] - [[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q3|Q3]] / [[Haina/Monthly/2024-08|August]] / [[Haina/Weekly/2024/2024-W30|Week 30]] | Week 31 | [[Haina/Weekly/2024/2024-W32|Week 32]] / [[Haina/Daily/2024-07-22|22 Mon]] - [[Haina/Daily/2024-07-23|23 Tue]] - [[Haina/Daily/2024-07-24|24 Wed]] - [[Haina/Daily/2024-07-25|25 Thu]] - [[Haina/Daily/2024-07-26|26 Fri]] - [[Haina/Daily/2024-07-27|27 Sat]] - [[Haina/Daily/2024-07-28|28 Sun]] [[Haina/Daily/2024-07-29|29 Mon]] - [[Haina/Daily/2024-07-30|30 Tue]] -
---
*2024-07-30 Tue*
## 上周工作
### 重点工作
#### WebHT 基础信息价格管理
1. 产品管理: 头部组件
2. 产品编辑页面
### 维护工作
#### 支付中心
1. #优化 CT, SH支持PayPal ACDC
2. #优化 PayPal无法渲染新版时, 使用经典版跳转
3. 排查APP的无交易号记录.
- 从APP后台生成的PayPal直接链接(CGI), 没有IPN的原因未知
4. #修复 PayPal退款: Trippest账户的退款, 切换账户; 解决API版本不符
5. #新增 APP的支付中心模板; 跟进APP调用支付中心
#### Sales CRM
1. 数据统计
1. 每月: 回复率
2. 每月: 首次回复周期
3. 每月: 会话订单成行率
4. [x] 每月: 成团周期 ✅ 2024-07-25
2. [x] 模拟邮件功能 ✅ 2024-07-26
## 本周计划
1.
---
> [!todo] Not done
>
> ```tasks
> not done
> path includes Haina
> path includes Weekly/2024
> (path includes W29) OR (path includes W30 )
> (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/2024
> (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
> path includes Weekly/2024
> sort by path reverse
> sort by heading
> ```
> [!note] Deferred
>
> ```tasks
> not done
> path includes Haina
> path includes Weekly/2024
> 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/2024
> 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/2024
> filter by function task.status.name === 'question'
> sort by path reverse
> sort by heading
> ```
> [!fail] Cancelled
>
> ```tasks
> path includes Haina
> path includes Weekly/2024
> 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/2024
> (filter by function task.status.type === 'TODO')
> sort by path reverse
> sort by heading
> ```

@ -0,0 +1,137 @@
---
Created: 2024-07-31 Wed
Updated: 2024-08-07 01:50 Wed
tags:
- 周报
---
[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q3|Q3]] / [[Haina/Monthly/2024-08|August]] / [[Haina/Weekly/2024/2024-W31|Week 31]] | Week 32 | [[Haina/Weekly/2024/2024-W33|Week 33]] / [[Haina/Daily/2024-07-29|29 Mon]] - [[Haina/Daily/2024-07-30|30 Tue]] - [[Haina/Daily/2024-07-31|31 Wed]] - [[Haina/Daily/2024-08-01|01 Thu]] - [[Haina/Daily/2024-08-02|02 Fri]] - [[Haina/Daily/2024-08-03|03 Sat]] - [[Haina/Daily/2024-08-04|04 Sun]] [[Haina/Daily/2024-08-05|05 Mon]] - [[Haina/Daily/2024-08-06|06 Tue]] -
---
*2024-08-06 Tue*
## 上周工作
### 重点工作
#### WebHT 基础信息价格管理
1. 产品管理: 头部组件
2. 产品编辑页面
3. [?] 获取供应商数据, 为空时, err=1, 导致无法渲染
4. [x] 供应商数据: 空数据的errcode 处理 ✅ 2024-08-05
5. [x] 重复复制到26年, err=1, 目标已存在2026年价格 ✅ 2024-08-07
6. [-] 新增时, 如何编辑价格提交, 还没有info.id
7. [/] 编辑: 文字说明
8. [/] 测试和反馈处理
### 维护工作
#### 支付中心
1. [x] #优化 国际支持PayPal ACDC ✅ 2024-08-01
2. [x] #优化 西语支付中心, 排查 ✅ 2024-08-06
3. [x] #优化 CH域名支付中心跳转secure域名 ✅ 2024-08-06
4. [x] #优化 PayPal退款处理: 从收款记录查找订单号 ✅ 2024-08-06
#### 海外反馈表
1. #优化 多人提交的结果页读取
#### GA4
1. #优化 CH GTM配置站内跟踪
## 本周计划
1.
---
> [!todo] Not done
>
> ```tasks
> not done
> path includes Haina
> path includes Weekly/2024
> (path includes W30) OR (path includes W31 )
> (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/2024
> (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
> path includes Weekly/2024
> sort by path reverse
> sort by heading
> ```
> [!note] Deferred
>
> ```tasks
> not done
> path includes Haina
> path includes Weekly/2024
> 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/2024
> 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/2024
> filter by function task.status.name === 'question'
> sort by path reverse
> sort by heading
> ```
> [!fail] Cancelled
>
> ```tasks
> path includes Haina
> path includes Weekly/2024
> 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/2024
> (filter by function task.status.type === 'TODO')
> sort by path reverse
> sort by heading
> ```

@ -0,0 +1,133 @@
---
Created: 2024-08-07 Wed
Updated: 2024-08-08 11:42 Thu
tags:
- 周报
---
[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q3|Q3]] / [[Haina/Monthly/2024-08|August]] / [[Haina/Weekly/2024/2024-W32|Week 32]] | Week 33 | [[Haina/Weekly/2024/2024-W34|Week 34]] / [[Haina/Daily/2024-08-05|05 Mon]] - [[Haina/Daily/2024-08-06|06 Tue]] - [[Haina/Daily/2024-08-07|07 Wed]] - [[Haina/Daily/2024-08-08|08 Thu]] - [[Haina/Daily/2024-08-09|09 Fri]] - [[Haina/Daily/2024-08-10|10 Sat]] - [[Haina/Daily/2024-08-11|11 Sun]] [[Haina/Daily/2024-08-12|12 Mon]] - [[Haina/Daily/2024-08-13|13 Tue]] -
---
*2024-08-13 Tue*
## 上周工作
### 重点工作
#### WebHT 基础信息价格管理
1. 状态梳理.
1. [x] 新增和提交审核按钮: 无限制 ✅ 2024-08-08
2. [x] 提交审核后刷新, 提示: "" ✅ 2024-08-08
3. [x] 客服: 保存信息: 保留状态 ✅ 2024-08-08
4. [x] 地接: 价格: 只有item状态在新增和拒绝能改 ✅ 2024-08-09
### 维护工作
#### 导游小助手
1. #新增 地接统计: 导游使用情况: 上下站信息使用率
#### 海外反馈表
1. ["] 多人提交的结果页保存
#### 支付中心
1. [/] 微信退款重复录入
2. [x] PayPal ACDC和V2版本的信用卡按钮冲突 ✅ 2024-08-08
3. [ ] PayPal ACDC: Google Pay
## 本周计划
1.
---
> [!todo] Not done
>
> ```tasks
> not done
> path includes Haina
> path includes Weekly/2024
> (path includes W31) OR (path includes W32 )
> (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/2024
> (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
> path includes Weekly/2024
> sort by path reverse
> sort by heading
> ```
> [!note] Deferred
>
> ```tasks
> not done
> path includes Haina
> path includes Weekly/2024
> 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/2024
> 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/2024
> filter by function task.status.name === 'question'
> sort by path reverse
> sort by heading
> ```
> [!fail] Cancelled
>
> ```tasks
> path includes Haina
> path includes Weekly/2024
> 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/2024
> (filter by function task.status.type === 'TODO')
> sort by path reverse
> sort by heading
> ```

@ -1,2 +0,0 @@
<!-- -->
* [SCRM需求和背景](Haina/项目/SCRM/SCRM需求和背景.md)

@ -8,7 +8,8 @@
<meta name="description" content="Description">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<!-- <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css"> -->
<link rel="stylesheet" href="https://unpkg.com/docsify@4.13.1/lib/themes/vue.css">
<!-- <link rel="stylesheet" href="https://unpkg.com/docsify@4.13.1/lib/themes/vue.css"> -->
<link rel="stylesheet" href="vue.css">
</head>
<body>
@ -46,9 +47,11 @@
</script>
<!-- Docsify v4 -->
<!-- <script src="//cdn.jsdelivr.net/npm/docsify@4"></script> -->
<script src="https://unpkg.com/docsify@4.13.1/lib/docsify.min.js"></script>
<script src="docsify@4.js"></script>
<!-- <script src="//cdn.jsdelivr.net/npm/docsify/lib/docsify.min.js"></script> -->
<!-- <script src="https://unpkg.com/docsify@4.13.1/lib/docsify.min.js"></script> -->
<!-- <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script> -->
<script src="https://unpkg.com/docsify@4.13.1/lib/plugins/zoom-image.min.js"></script>
<!-- <script src="https://unpkg.com/docsify@4.13.1/lib/plugins/zoom-image.min.js"></script> -->
<!-- <script src="https://unpkg.com/@h-hg/docsify-image-caption/dist/docsify-image-caption.min.js"></script> -->
</body>

@ -1,26 +0,0 @@
---
Created: 2024-04-24 Wed
Updated: 2024-07-19 15:09 Fri
---
**Do NOT invoke PP API from client side directly**
- **方案1**: 数据由后端管理
1. 保存生成的链接
2. 支付中心页面, 请求后端生成PayPal订单
3. 后端使用保存的信息, 生成PayPal请求订单: *createOrder*
- **方案2**: 数据由链接管理
1. 将链接原文发送后端
#### PayPal
1. [?] PayPal通知不全
1. webhook没有发送
1. `9BU18513BH318232S`
2. `5NP174266F735682P` `CW231214017_T`
3. ~~`4NW74413KE195510H` `SHX240325005_T`~~
4. ~~`49N102461W2482132` `CA240704075_T`~~
2. IPN没有发送
1. `39G25248JF041404J` Upsell, 自动转账到账户
3. 两个通知都没有
1. `2SX71059RU3114540`

@ -0,0 +1,35 @@
---
Created: 2024-04-24 Wed
Updated: 2024-07-23 13:39 Tue
---
### Merchant SERVER API
**Do NOT invoke PP API from client side directly**
- **方案1**: 数据由后端管理
1. 保存生成的链接
2. 支付中心页面, 请求后端生成PayPal订单
3. 后端使用保存的信息, 生成PayPal请求订单: *createOrder*
- **方案2**: 数据由链接管理
1. 将链接原文发送后端
### Available
[支持的国家和地区](https://www.paypal.com/ng/webapps/mpp/country-worldwide)
[PayPal API Status](https://www.paypal-status.com/api/production)
### PayPal Notify
> [!faq] 通知不全
>
> 1. webhook没有发送
> 1. `9BU18513BH318232S`
> 2. `5NP174266F735682P` `CW231214017_T`
> 3. ~~`4NW74413KE195510H` `SHX240325005_T`~~
> 4. ~~`49N102461W2482132` `CA240704075_T`~~
> 2. IPN没有发送
> 1. `39G25248JF041404J` Upsell, 自动转账到账户
> 3. 两个通知都没有
> 1. `2SX71059RU3114540`

@ -1,8 +1,21 @@
---
Created: 2024-07-23 Tue
Updated: 2024-07-23 17:07 Tue
---
## 项目目标和成果
### 三个目标
## 项目过程和管理
## 技术实施和挑战
## 改进和优化
> [!faq] 待解决
>
> 1. [?] 与地接沟通, 地接主动发回来时, 会指向最新的外联, 却不一定是正确的接收人.`84979380502`
> 2. [-] 客人发起的新会话, 找coco, 客运回复. session已分配到coco, 消息记录没有迁移. `66899199007`
> - 不用
> 3. [ ]

@ -25,6 +25,13 @@ Updated: 2024-07-10 17:17 Wed
9. [x] 复制产品价格操作 ✅ 2024-07-10
1. [x] 供应商页面 ✅ 2024-07-10
10. [x] 审核页面切换年份; 切换供应商 ✅ 2024-07-15
11. 编辑页面
1. [ ] 获取数据
2. [ ] 头部操作
3. [ ] 产品列表
4. [ ] 信息编辑
5. [ ] 价格修改
6. [ ] 绑定项目
---
@ -50,15 +57,19 @@ gitGraph TB:
checkout main
commit
commit
commit id: "账户体系"
checkout feature/price_manager
commit
commit id: "完成价格"
commit
commit
checkout main
merge feature/price_manager id: "合并价格" type:HIGHLIGHT
commit
commit
commit tag: "1.1.0" id: "完成机票"
branch pre-release
merge feature/price_manager id: "合并机票+价格" type:HIGHLIGHT
checkout main
merge pre-release id: "合并发布" tag: "1.2.0"
commit
commit
commit id: "pre-release" tag: "pre-release" type:HIGHLIGHT
commit
```

Loading…
Cancel
Save