scottpan/integral-shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72 Commits 13 Branches 0 Tags
czleilei240
Commit Graph

72 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
danaisuiyuan
ede01c06d2 docs: add ops and merchandise status repair guides 2026-05-27 13:00:32 +08:00
danaisuiyuan
9b4020d44f fix(points): prevent stale integral balance updates 
Use atomic integral updates during balance payment so older user snapshots cannot overwrite newer self-bonus rewards.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-19 08:57:13 +08:00
danaisuiyuan
8c3ff509fc merge: 合并远程 czleilei240 部署配置并统一 leilei 环境域名 
整合 monorepo 侧 Docker 部署改动，冲突处保留 czleilei240 合同 PDF、API 域名与抢购跳转地址。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-18 10:55:57 +08:00
danaisuiyuan
93d6a58a2b feat(czleilei240): 配置池州雷蕾商贸积分商城环境 
新增 czleilei240 Spring profile、合同 PDF 与部署文档，并将前后端域名、合同落库前缀和后台 API 地址切换到 leilei 环境。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-18 10:54:24 +08:00
danaisuiyuan
cef4398a5a feat(deploy): configure czleilei240 integral shop 
Add czleilei240 runtime profiles, frontend domains, contract paths, and Docker deployment updates so the integral shop can run against the Leilei environment.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-17 19:13:01 +08:00
danaisuiyuan
fb76270882 feat(deploy): 完整 Docker 部署方案 — 寄卖商城 + 积分商城 
新增两步独立 Docker 部署方案（czleilei240 环境）：

步骤一 寄卖商城（integral-resell）
- step1-integral/docker-compose.yml：redis(Alpine自建) + houtai(webman PHP8) + h5(Nginx)
- houtai.Dockerfile：PHP 8.0 + 阿里云镜像源 + webman.bin entrypoint
- h5.Dockerfile：Nginx + configs.js 环境变量动态重写
- redis.Dockerfile：Alpine + apk 构建，绕过 DockerHub 镜像源问题
- 宿主机 bind-mount：/www/wwwroot/leileiadmin.czchunfang.com（FTP可直接更新程序）

步骤二 积分商城（single-shop-22）
- step2-single-shop/docker-compose.yml：redis + admin-api + front-api + admin-web + h5
- Java Dockerfiles：OpenJDK 17 + --add-opens Spring Boot 2.2.6 兼容

公共配置
- nginx/：四个域名宝塔 Nginx 反代配置（HTTP→HTTPS 301、SSL 终止）
- scripts/：sync-to-server.sh / deploy-step1.sh / remote-up.sh
- DOCKER_DEPLOY.md：完整部署文档

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-17 17:24:08 +08:00
danaisuiyuan
a89825e23c docs(dashboard): 从 shjjy153 合并 dashboard 相关文档 
补充 docs/dashboard/ 目录，包含：
- dashboard-frontend-dev-spec.md
- dashboard-frontend-technical-architecture.md
- boss-dashboard-development-guide.md
- crmeb-front-mysql-remote-connections.md

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-16 19:30:13 +08:00
danaisuiyuan
ccb70ca10e Merge branch 'sxsy80' into czleilei240 2026-05-16 18:36:18 +08:00
danaisuiyuan
ee32ecc995 feat(dashboard-frontend): 新增 dashboard 前端目录与构建产物 
- 引入 dashboard-frontend/dist 静态资源占位（Vite 产物：assets + favicon + index.html + mockServiceWorker.js）
- .gitignore 排除 dashboard-frontend/node_modules 及日志，避免误入库（~304MB）
- src 暂留占位待后续接入

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-16 18:31:47 +08:00
danaisuiyuan
fd4255d982 docs(xsj33): 迁移说明移入 docs/ 
与其他迁移文档（byjyw149/czrt6/sxsy80 等）同位，便于统一索引

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-16 18:31:26 +08:00
danaisuiyuan
9a4a5f2339 feat(dashboard): archive daily report from page data 
Generate the standalone daily report HTML from the dashboard data already loaded in the H5 page, keeping the archived page visually aligned with the mobile dashboard.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-11 13:21:35 +08:00
danaisuiyuan
403ffe0fde feat(dashboard): add boss dashboard H5 and APIs 
Implement the mobile dashboard frontend, admin overview APIs, report archive export, and local dev proxy so the boss dashboard can run against real backend data while preserving MSW demos.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-11 13:07:55 +08:00
danaisuiyuan
693c66c258 fix(integral): 防止个人奖金重复生成积分 
将个人奖金转积分流程改为先写唯一流水再加积分，并用 wa_selfbonus_logid 唯一索引兜底多入口并发场景；同时补充历史重复数据修复与索引落地 SQL 脚本。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-11 13:07:55 +08:00
danaisuiyuan
cf2918cfe2 chore(adminend): 开发环境改用本地 VUE_APP_BASE_API 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-11 09:30:26 +08:00
danaisuiyuan
e2d52ba4cc docs(czrt6): 0511 迁移说明写入 16 位用户 uid/id 范围 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-11 09:25:03 +08:00
danaisuiyuan
d8ad6cde20 feat(integral-external): 新增寄卖外部免认证三件套页面 2026-05-02 06:13:41 +08:00
danaisuiyuan
49900919c6 chore(admin): 恢复 crmeb-admin application-byjyw149.yml 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-02 04:30:02 +08:00
danaisuiyuan
5cbca4ba76 revert(env,uniapp): 保留 sxsy80 业务合并，恢复 byjyw149 环境与合同 PDF 
- 恢复 admin/front application.yml、admin 端 env、WaUserController 合同模板与域名
- 恢复 single_uniapp22miao 中与域名/签约相关的页面与 config
- 移除合并中新增的多客户 profile 与 sxsy80/czcf82 合同 PDF 资源

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-05-02 04:26:38 +08:00
apple
f43950eabf fix(integral-external): 外部用户列表用户 ID 筛选默认可空 
Replace el-input-number (min clamped to 1) with text uidStr and only
send uid when a valid positive integer is entered.

Made-with: Cursor
 2026-04-27 13:44:24 +08:00
apple
708bf9af48 feat(sxsy80): 外部用户 UID 筛选与积分明细展示 
User list API accepts uid; admin external pages tighten filters and
integral log maps self-bonus rows via wa_selfbonus_log for display.

Made-with: Cursor
 2026-04-27 13:30:05 +08:00
apple
5c4450c417 docs(sxsy80): 迁移文档、清理脚本与 wa_merchandise 提取工具 
补充数据迁移说明与 cleanup SQL；增加从 dump 提取保留 id 与生成 INSERT 的脚本及产物。

Made-with: Cursor
 2026-04-27 12:13:19 +08:00
apple
901bf6f500 docs(czrt6): 池州瑞棠数据迁移说明、dump 与可执行 SQL 
新增从 dump 生成的 INSERT 脚本、按主键预删后执行的 pymysql 运行器，并在文档中记录执行方式与结果摘要。

Made-with: Cursor
 2026-04-27 12:13:12 +08:00
apple
e7ffbbf302 docs(sxsy80): 补充文档、合同资源与数据清理脚本 
- 更新前后端 sign_contract_sxsy80.pdf
- 增加 com-sxsy80 说明、数据迁移与 SQL/执行脚本
- 增加 com-xsj33 数据迁移说明与 docs 下合同源文件

Made-with: Cursor
 2026-04-26 16:50:36 +08:00
apple
3c6ec4ed73 feat(sxsy80): 太原树英商贸环境与域名配置 
- 新增 application-sxsy80.yml（前后端），MySQL/Redis 指向 106.14.132.80，imagePath 与 sync shop_14
- 默认 profile 切换为 sxsy80
- 合同 PDF 与落库域名 https://sxsy.cichude.com
- uni-app：积分域 sxsy-jf、抢购跳转 sxsy、静态合同路径
- backend-adminend：VUE_APP_BASE_API 指向 sxsy-jf
- 分支 sxsy80 基于 origin/czcf82

Made-with: Cursor
 2026-04-26 16:37:46 +08:00
danaisuiyuan
eb349ffa74 chore(czcf82): Spring profiles, migration docs, and shop URLs 
Add per-shop application YAML, company data migration notes and SQL
supplements, and point admin, API, and uni-app at czcf82 endpoints.

Made-with: Cursor
 2026-04-26 15:55:22 +08:00
danaisuiyuan
18b74a131a chore(czcf82): add contract assets and environment info docs 
Add czcf82 contract PDF assets for backend and uniapp, and include company environment reference docs needed for deployment handoff.

Made-with: Cursor
 2026-04-17 13:04:14 +08:00
danaisuiyuan
43d652aa42 feat(czrt6): switch runtime domains and profile to czrt6 
Update admin/frontend profiles, contract template paths, and H5/integral routing domains to point the deployed environment from byjyw149 to czrt6.

Made-with: Cursor
 2026-04-17 12:26:19 +08:00
danaisuiyuan
58d6446a22 chore(docs): remove legacy root-level project docs 
Clean up obsolete root-level migration and company info markdown files now that documentation is being reorganized under docs.

Made-with: Cursor
 2026-04-17 10:14:19 +08:00
danaisuiyuan
770b0bcb62 chore(byjyw149): switch admin endpoints and profile settings 
Align byjyw149 environment settings by updating admin frontend API endpoints, activating the byjyw149 Spring profile, and documenting the corresponding company deployment notes.

Made-with: Cursor
 2026-04-17 10:11:22 +08:00
danaisuiyuan
5ae826d532 Merge remote-tracking branch 'origin/czc231' into byjyw149 2026-04-17 09:11:00 +08:00
danaisuiyuan
70ccfef0d2 chore(byjyw149): add czrt6 handoff assets and clean obsolete files 
Add czrt6 company handoff docs/assets and remove stale logs/config artifacts so the branch state matches current tenant delivery materials.

Made-with: Cursor
 2026-04-17 09:05:55 +08:00
danaisuiyuan
29381814ff feat(byjyw149): switch project config to jinyawen environment 
Align backend profile, contract template/domain, and uniapp mall/jump/pdf paths for the byjyw149 tenant so deployment matches the new company environment and avoids cross-tenant URLs.

Made-with: Cursor
 2026-04-17 09:04:47 +08:00
apple
cd136df685 chore: update admin env, application profiles, and migration notes 
Made-with: Cursor
 2026-04-10 11:20:38 +08:00
apple
60a06f3692 Merge branch 'feature/marketing-integral-log' into czc231 
Restore backend-adminend/src/api/integral.js (integralListApi) after modify/delete conflict with czc231.

Made-with: Cursor
 2026-04-09 16:01:43 +08:00
apple
f8ba25e7d5 feat(integral-external): order/user list, integral log, wa selfBonus 
- Fix ExternalIntegral order list (no double restPage); default 普通订单; UI columns for useIntegral and buyer uid/nickname/phone; enrich StoreOrderDetailResponse and admin query select.
- External user list: UserResponse.selfBonus and fillWaSelfBonus from wa_users.id=uid.
- Integral log: AdminIntegralSearchRequest nickName/phone; findAdminList filters and ordering; integralExternal API sends page/limit as query params.
- Integral detail page: linkType Chinese mapping including selfbonus; update docs/newpage.md.
- Dashboard grid menu entries for integral-external routes.

Made-with: Cursor
 2026-04-09 15:10:16 +08:00
apple
c6d15d8094 docs: 数据迁移说明 — 统一为「数据清理」并补充日志表规则 
- company-data-imgration.md：self/share/coupon 日志保留范围说明；去掉过时分支任务句
- company-czc231-data-imgration.md：章节标题与鹏然文档对齐

Made-with: Cursor
 2026-04-05 12:46:04 +08:00
apple
75b5339540 docs: 宝应晨召春商贸数据迁移与清理说明（czc231） 
- 规范日志表表述；补充 wa_order / wa_merchandise 与库字段对应说明

Made-with: Cursor
 2026-04-05 12:31:01 +08:00
apple
f5e8652539 feat(czc231): 宝应晨召春商贸环境 
- 新增 application-czc231.yml（front/admin），指向 8.136.120.231
- 默认 profile=czc231；合同 PDF sign_contract_chenzhaochun，域名 chenzhaochun.com
- uniapp / 后台 Vue / deploy.conf 同步文档域名与目录
- h5/static/configs.js：寄卖与积分 URL（sn_id、appStr 需部署时填写）
- 已在库内 wa_options.system_config 写入标题实体与 deploy 段落（远程库）

Made-with: Cursor
 2026-04-05 11:11:01 +08:00
apple
129fa20810 docs: 鹏然项目说明与数据迁移记录 
- company-info.md：环境与 hapr191 配置要点
- company-data-imgration.md：库清理规则与保留用户范围

Made-with: Cursor
 2026-04-05 09:54:43 +08:00
apple
945ca2d3d0 feat(hapr191): 淮安鹏然商贸环境配置 
- 新增 application-hapr191.yml（front/admin），imagePath/DB/Redis 指向 114.55.232.191
- 默认 spring.profiles.active=hapr191
- 合同 PDF 模板 sign_contract_pengran，落库域名 https://hapengran.com/
- uniapp：jf.hapengran.com、抢购/个人中心跳转 hapengran.com
- deploy.conf 增加 hapr191 段；后台 Vue API 指向 jfadmin.hapengran.com

Made-with: Cursor
 2026-04-04 16:09:42 +08:00
scott
ee0886b800 feat: 新增积分外部页面（免认证三页 + 配套基础设施） 
前端：
- 新增 EmptyLayout 空壳布局（无侧边栏/导航）
- 新增 requestNoAuth Axios 实例（不注入 token）
- 新增 integralExternal 路由模块（/integral-external/*）
- permission.js 加入 whiteListPrefixes 前缀白名单跳过登录
- 新增 phoneDesensitize 手机号脱敏过滤器
- 新增三个免认证页面：
  · 积分订单页（/integral-external/order）
  · 用户积分页（/integral-external/user，手机号脱敏）
  · 用户积分明细子页（/integral-external/user/integral-detail）

后端：
- 新增 ExternalIntegralController（无 @PreAuthorize）
  · GET  /api/external/integral/order/list
  · GET  /api/external/integral/user/list
  · POST /api/external/integral/log/list
- WebSecurityConfig 加入 /api/external/integral/** permitAll

文档与工具：
- 新增 coding plan、schedule、测试报告
- 新增 start-backend.sh / start-frontend.sh 本地启动脚本
- 新增 .mvn/wrapper/maven-wrapper.properties

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-31 10:41:30 +08:00
apple
5abbf5bc18 fix(uniapp): 积分页 H5 跳转改为 jjy.uj345.com 
Made-with: Cursor
 2026-03-25 08:43:30 +08:00
apple
67f44e9c35 fix(uniapp): 签约页跳转域名改为 jjy.uj345.com 
Made-with: Cursor
 2026-03-23 11:58:21 +08:00
apple
25409f26ce fix(front): WaUser 合同地址改为 jjy.uj345.com（shjjy153） 
Made-with: Cursor
 2026-03-23 11:57:38 +08:00
scott
fe9e1916fa feat: 重构营销模块积分日志页面 
- 优化搜索区域：支持用户昵称、用户ID、时间范围筛选
- 新增表格字段：ID、用户ID、昵称、来源/用途、积分变化、变化后积分、关联类型、状态、备注、日期
- 积分变化带颜色标识：增加(绿色+)、扣减(红色-)
- 状态标签彩色区分：订单创建/冻结期/完成/失效
- 关联类型中文映射：订单/签到/系统
- 使用已有的 integralListApi 接口
- 参考用户详情页积分明细样式
 2026-03-20 15:53:48 +08:00
scott
09946536aa feat: 添加积分日志页面 
- 新增积分日志列表页面 src/views/user/integral/index.vue
- 新增积分相关 API src/api/integral.js
- 在路由中添加积分日志菜单
 2026-03-20 10:56:53 +08:00
apple
ebd4619d65 feat: 拆分 admin 部署脚本，支持单独部署 API 或 Vue 前端 
Made-with: Cursor
 2026-03-19 17:24:15 +08:00
scott
6d3b50cebc docs: 添加 OpenClaw 多 Agent 配置方案 v2/v3 
v2 基于原始需求优化（精简 Skills、通信协议、部署审批、版本锁定）。
v3 基于本机实际环境检查修正（路径、Agent 数量、Skills 可用性等）。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-03-19 12:51:37 +08:00
apple
a2db220f19 shjjy153: 新增分支对比文档 compare-shjjy153-shccd159.md，更新 config/app.js 
Made-with: Cursor
 2026-03-19 09:48:06 +08:00
apple
40c05afb3e main: 完善 README 架构与目录说明，移除重复 frontend（使用 backend-adminend） 
Made-with: Cursor
 2026-03-18 12:40:56 +08:00