diff --git a/Haina/INFO.md b/Haina/INFO.md index c11d925..5adfeb1 100644 --- a/Haina/INFO.md +++ b/Haina/INFO.md @@ -1,2 +1,9 @@ -**代理** + +### 代理 + [haina2](https://fbapiv1.fbsublink.com/flydsubal/dveqh1oyf0z86tm5?sub=2&extend=1) +2024-07-19: [haina2](https://helloworld.mycht.cn/fly) + +[TB](https://bed868b8.no-mad-world.club/link/45Pw4l9Wro8NMrTR?sub=3&extend=1) +[sanfen: 10G](https://www.igogonet.cc/link/So1xNcJLtAfNKTJn?sub=3) +[一元](https://s1.byte33.com/api/v1/client/subscribe?token=7c3e2edf2b1d897dc41781b7bc9c9ae8) \ No newline at end of file diff --git a/Haina/Weekly/2024/2024-W25.md b/Haina/Weekly/2024/2024-W25.md index 5effb8b..f0cb68e 100644 --- a/Haina/Weekly/2024/2024-W25.md +++ b/Haina/Weekly/2024/2024-W25.md @@ -18,12 +18,16 @@ tags: #### WebHT 基础信息价格管理 1. #文档 录入/编辑页面交互调整 +2. invoice 迁移zustand +3. 产品管理 + 1. 客服首页, 搜索产品 + 2. 审核供应商产品价格页 ### 维护工作 #### TS -1. 垃圾订单处理 +1. 垃圾订单处理: 缺少后端验证 1. 无结果页面的contact表单 2. 国际火车 @@ -34,7 +38,7 @@ tags: #### HT 统计 -1. [x] 销售的老客户订单数据 ✅ 2024-06-14 +1. [x] #新增 销售的老客户订单数据 ✅ 2024-06-14 ## 本周计划 diff --git a/Haina/Weekly/2024/2024-W26.md b/Haina/Weekly/2024/2024-W26.md new file mode 100644 index 0000000..4165bf6 --- /dev/null +++ b/Haina/Weekly/2024/2024-W26.md @@ -0,0 +1,117 @@ +--- +Created: 2024-06-19 Wed +Updated: +tags: + - 周报 +--- +[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q2|Q2]] / [[Haina/Monthly/2024-06|June]] / ❮ [[Haina/Weekly/2024/2024-W25|Week 25]] | Week 26 | [[Haina/Weekly/2024/2024-W27|Week 27]] ❯ / [[Haina/Daily/2024-06-17|17 Mon]] - [[Haina/Daily/2024-06-18|18 Tue]] - [[Haina/Daily/2024-06-19|19 Wed]] - [[Haina/Daily/2024-06-20|20 Thu]] - [[Haina/Daily/2024-06-21|21 Fri]] - [[Haina/Daily/2024-06-22|22 Sat]] - [[Haina/Daily/2024-06-23|23 Sun]] ❯ [[Haina/Daily/2024-06-24|24 Mon]] - [[Haina/Daily/2024-06-25|25 Tue]] - + +--- + +*2024-06-25 Tue* + +## 上周工作 + +### 重点工作 +#### WebHT 基础信息价格管理 +1. 产品管理: + 1. 客服操作: 审核价格; 审核产品 + 2. 产品附加项目: 添加; 删除; 获取; 搜索项目 + +### 维护工作 +#### 支付中心 +1. 确定PayPal API退款的方案 + +## 本周计划 +1. + + + +--- + +> [!todo] Not done +> +> ```tasks +> not done +> path includes Haina +> path includes Weekly/2024 +> (path includes W24) OR (path includes W25 ) +> (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 +> ``` diff --git a/Haina/Weekly/2024/2024-W27.md b/Haina/Weekly/2024/2024-W27.md new file mode 100644 index 0000000..27988b0 --- /dev/null +++ b/Haina/Weekly/2024/2024-W27.md @@ -0,0 +1,152 @@ +--- +Created: 2024-07-01 Mon +Updated: 2024-07-19 15:09 Fri +tags: + - 周报 +--- + +[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q3|Q3]] / [[Haina/Monthly/2024-07|July]] / ❮ [[Haina/Weekly/2024/2024-W26|Week 26]] | Week 27 | [[Haina/Weekly/2024/2024-W28|Week 28]] ❯ / [[Haina/Daily/2024-06-24|24 Mon]] - [[Haina/Daily/2024-06-25|25 Tue]] - [[Haina/Daily/2024-06-26|26 Wed]] - [[Haina/Daily/2024-06-27|27 Thu]] - [[Haina/Daily/2024-06-28|28 Fri]] - [[Haina/Daily/2024-06-29|29 Sat]] - [[Haina/Daily/2024-06-30|30 Sun]] ❯ [[Haina/Daily/2024-07-01|01 Mon]] - [[Haina/Daily/2024-07-02|02 Tue]] - + +--- + +*2024-07-02 Tue* + +## 上周工作 + +### 重点工作 + +#### WebHT 基础信息价格管理 + +1. 产品: 绑定项目: + 1. 搜索供应商的产品, 已审核发布的 + 2. 新增; 删除; 读取 +2. 获取默认语言, 相应的HT编码 +3. 产品管理的权限配置 +4. 客服: 复制供应商产品 +5. 客服首页: 修改搜索 +6. 处理成人儿童价 +7. 修改审核价格页面 +8. 阶段会议和细节沟通确认 + +### 维护工作 + +#### 支付中心 + +1. #新增 PayPal API退款 + 1. [x] 处理交易记录的API地址 ✅ 2024-07-02 + 2. [x] 退款接口 ✅ 2024-07-02 + 1. [x] 切换账户 ✅ 2024-07-03 + 2. [/] 排查仍然是V1版本的PayPal + 1. Elena240624161_T--4179 + 2. Trippest: 催款信: 是cgi_bin 按钮 + 3. [ ] 退款结果返回财务系统 + 4. [?] PayPal通知不全 + 1. webhook没有发送 + 1. `9BU18513BH318232S` + 2. `5NP174266F735682P` `CW231214017_T` + 3. ~~`4NW74413KE195510H` `SHX240325005_T`~~ + 4. ~~`49N102461W2482132` `CA240704075_T`~~ + 2. IPN没有发送 + 1. `39G25248JF041404J` Upsell, 自动转账到账户 + 3. 两个通知都没有 + +#### GHH + +1. #优化 修改质量评分页面 + +#### HT 统计 + +1. #新增 销售-老客户: 合并顾问账户 + +## 本周计划 + +1. + +--- + +> [!todo] Not done +> +> ```tasks +> not done +> path includes Haina +> path includes Weekly/2024 +> (path includes W25) OR (path includes W26 ) +> (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 +> ``` diff --git a/Haina/Weekly/2024/2024-W28.md b/Haina/Weekly/2024/2024-W28.md new file mode 100644 index 0000000..3651013 --- /dev/null +++ b/Haina/Weekly/2024/2024-W28.md @@ -0,0 +1,141 @@ +--- +Created: 2024-07-03 Wed +Updated: 2024-07-04 17:13 Thu +tags: + - 周报 +--- + +[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q3|Q3]] / [[Haina/Monthly/2024-07|July]] / ❮ [[Haina/Weekly/2024/2024-W27|Week 27]] | Week 28 | [[Haina/Weekly/2024/2024-W29|Week 29]] ❯ / [[Haina/Daily/2024-07-01|01 Mon]] - [[Haina/Daily/2024-07-02|02 Tue]] - [[Haina/Daily/2024-07-03|03 Wed]] - [[Haina/Daily/2024-07-04|04 Thu]] - [[Haina/Daily/2024-07-05|05 Fri]] - [[Haina/Daily/2024-07-06|06 Sat]] - [[Haina/Daily/2024-07-07|07 Sun]] ❯ [[Haina/Daily/2024-07-08|08 Mon]] - [[Haina/Daily/2024-07-09|09 Tue]] - + +--- + +*2024-07-09 Tue* + +## 上周工作 + +### 重点工作 + +#### WebHT 基础信息价格管理 + +1. [ ] 年份, +2. [x] 绑定产品的显示 ✅ 2024-07-09 +3. [x] 绑定的搜索, 接口和表格 ✅ 2024-07-09 +4. [x] 地接的审核结果页面 ✅ 2024-07-10 +5. [x] 跳转代理录入 ✅ 2024-07-10 +6. [ ] 权限整理 + 1. 代理录入 + 2. 审核页面 + 3. 绑定, 录入 + +### 维护工作 + +#### 支付中心 + +1. [x] #新增 PayPal API退款 ✅ 2024-07-04 +2. #优化 PayPal退款结果处理没有外联 + +#### HT 统计 + +1. 销售-老客户数据导出 + +## 本周计划 + +1. + +--- + +> [!todo] Not done +> +> ```tasks +> not done +> path includes Haina +> path includes Weekly/2024 +> (path includes W26) OR (path includes W27 ) +> (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 +> ``` + +> [!check] Latest month +> +> ```tasks +> done in last month +> path includes Haina +> 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 +> ``` diff --git a/Haina/Weekly/2024/2024-W29.md b/Haina/Weekly/2024/2024-W29.md new file mode 100644 index 0000000..b86101e --- /dev/null +++ b/Haina/Weekly/2024/2024-W29.md @@ -0,0 +1,130 @@ +--- +Created: 2024-07-10 Wed +Updated: 2024-07-17 17:01 Wed +tags: + - 周报 +--- + +[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q3|Q3]] / [[Haina/Monthly/2024-07|July]] / ❮ [[Haina/Weekly/2024/2024-W28|Week 28]] | Week 29 | [[Haina/Weekly/2024/2024-W30|Week 30]] ❯ / [[Haina/Daily/2024-07-08|08 Mon]] - [[Haina/Daily/2024-07-09|09 Tue]] - [[Haina/Daily/2024-07-10|10 Wed]] - [[Haina/Daily/2024-07-11|11 Thu]] - [[Haina/Daily/2024-07-12|12 Fri]] - [[Haina/Daily/2024-07-13|13 Sat]] - [[Haina/Daily/2024-07-14|14 Sun]] ❯ [[Haina/Daily/2024-07-15|15 Mon]] - [[Haina/Daily/2024-07-16|16 Tue]] - + +--- + +*2024-07-16 Tue* + +## 上周工作 + +### 重点工作 + +#### WebHT 基础信息价格管理 + +1. [x] 复制产品价格操作 ✅ 2024-07-10 + 1. [x] 供应商页面 ✅ 2024-07-10 +2. [x] 客服: 审核页面切换年份; 切换供应商 ✅ 2024-07-15 + +### 维护工作 + +#### 支付中心 + +1. PayPal 信用卡网关付款 +2. PayPal退款: 试用, 排查 + 1. `2KN514407M419305D` 有记录payee, 没传到接口 + > 没有导入 + 2. `99591415PB504994G` App收款, 不从支付中心, 版本是*V1* `web_accept` +3. paypal note 增加字段 + +#### Sales CRM + +1. #优化 新建会话不自动关联订单; 老客人推荐WA号码不需要关联订单 + +## 本周计划 + +1. + +--- + +> [!todo] Not done +> +> ```tasks +> not done +> path includes Haina +> path includes Weekly/2024 +> (path includes W27) OR (path includes W28 ) +> (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 +> ``` diff --git a/Haina/Weekly/2024/2024-W30.md b/Haina/Weekly/2024/2024-W30.md new file mode 100644 index 0000000..cfe80e6 --- /dev/null +++ b/Haina/Weekly/2024/2024-W30.md @@ -0,0 +1,130 @@ +--- +Created: 2024-07-15 Mon +Updated: 2024-07-18 14:53 Thu +tags: + - 周报 +--- + +[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q3|Q3]] / [[Haina/Monthly/2024-07|July]] / ❮ [[Haina/Weekly/2024/2024-W29|Week 29]] | Week 30 | [[Haina/Weekly/2024/2024-W31|Week 31]] ❯ / [[Haina/Daily/2024-07-15|15 Mon]] - [[Haina/Daily/2024-07-16|16 Tue]] - [[Haina/Daily/2024-07-17|17 Wed]] - [[Haina/Daily/2024-07-18|18 Thu]] - [[Haina/Daily/2024-07-19|19 Fri]] - [[Haina/Daily/2024-07-20|20 Sat]] - [[Haina/Daily/2024-07-21|21 Sun]] ❯ [[Haina/Daily/2024-07-22|22 Mon]] - [[Haina/Daily/2024-07-23|23 Tue]] - + +--- + +*2024-07-23 Tue* + +## 上周工作 + +### 重点工作 + +#### WebHT 基础信息价格管理 + +1. SearchForm 初始化同时获取数据 + +### 维护工作 + +#### 支付中心 + +1. #新增 PayPal 信用卡网关付款. 已开发好, 后续根据需求上线[待定] +2. #优化 收款记录`处理时间`, `收款账户`等 +3. #优化 PayPal退款: 处理缺少参数的旧数据, 从capture查询(多账户); 复用token + +#### HT 统计 + +1. #新增 订单统计: 增加`站外渠道` +2. #新增 订单统计: 增加`客运类别` + +#### Sales CRM + +1. [ ] 文件上传改为前端直接传到OSS + +## 本周计划 + +1. + +--- + +> [!todo] Not done +> +> ```tasks +> not done +> path includes Haina +> path includes Weekly/2024 +> (path includes W28) OR (path includes W29 ) +> (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 +> ``` diff --git a/Haina/项目/PayPal Merchant SERVER API.md b/Haina/项目/PayPal Merchant SERVER API.md index 26aa48b..16e3ae4 100644 --- a/Haina/项目/PayPal Merchant SERVER API.md +++ b/Haina/项目/PayPal Merchant SERVER API.md @@ -1,6 +1,6 @@ --- Created: 2024-04-24 Wed -Updated: 2024-04-25 16:05 Thu +Updated: 2024-07-19 15:09 Fri --- **Do NOT invoke PP API from client side directly** @@ -11,3 +11,15 @@ Updated: 2024-04-25 16:05 Thu 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. 两个通知都没有 diff --git a/Haina/项目/价格平台/价格平台.md b/Haina/项目/价格平台/价格平台.md index 6577f76..e7a5ff6 100644 --- a/Haina/项目/价格平台/价格平台.md +++ b/Haina/项目/价格平台/价格平台.md @@ -1,12 +1,33 @@ --- Created: 2024-05-31 Fri -Updated: 2024-06-03 12:06 Mon +Updated: 2024-07-10 17:17 Wed --- 计划上线: 2024.08.01 需求: 2024.06.10 +#### 我的任务安排 + +1. [x] 用户界面国际化: 默认使用浏览器语言、用户可更换语言 📅 2024-06-07 ✅ 2024-06-01 +2. [x] 客服组搜索供应商产品 ✅ 2024-06-21 +3. [-] 客服组/产品组审核描述 +4. [x] 客服组审核价格内容 ✅ 2024-06-21 +5. 给产品添加附加项目 + 1. ["] 读取已绑定: 需要`adult_cost` + 2. [x] 如何显示价格表: ✅ 2024-07-10 + +> 不显示, 仅类型, 名称 + +6. [ ] 通知客服产品变更,变更字段使用红色显示,审核通过后恢复 +7. [ ] 生成价格合同PDF +8. [x] 审核页面权限, 跳转 ✅ 2024-07-10 +9. [x] 复制产品价格操作 ✅ 2024-07-10 + 1. [x] 供应商页面 ✅ 2024-07-10 +10. [x] 审核页面切换年份; 切换供应商 ✅ 2024-07-15 + +--- + ```mermaid --- title: GHHub 开发管理 - 机票和价格管理