第一次更新,完成了初版调整

This commit is contained in:
2026-09-07 22:05:51 +08:00
parent b5a26a8848
commit 4d6a7e7aac
198 changed files with 6142 additions and 3856 deletions
+124
View File
@@ -0,0 +1,124 @@
-- ============================================================
-- 开发/联调环境 数据库初始化清理脚本
-- 生成:2026-09-06
-- 作用:清空业务与测试流水,保留系统运行所需的账号、权限、字典、设置
-- ⚠️ 执行前务必备份:mysqldump -uroot -p oil > backup.sql
-- ============================================================
SET FOREIGN_KEY_CHECKS = 0;
-- ------------------------------------------------------------
-- 1. 企油通 / 合作商 业务流水
-- 注意:yoshop_partners(下游接口账户:orgNo/appKey/RSA密钥/回调地址)予以保留
-- ------------------------------------------------------------
TRUNCATE TABLE `yoshop_partners_order`;
TRUNCATE TABLE `yoshop_qyt_consume`;
TRUNCATE TABLE `yoshop_partners_balance_log`;
TRUNCATE TABLE `yoshop_partners_goods`;
TRUNCATE TABLE `yoshop_partners_stock_log`;
-- ------------------------------------------------------------
-- 2. 商城订单与售后
-- ------------------------------------------------------------
TRUNCATE TABLE `yoshop_order`;
TRUNCATE TABLE `yoshop_order_goods`;
TRUNCATE TABLE `yoshop_order_address`;
TRUNCATE TABLE `yoshop_order_qrcode`;
TRUNCATE TABLE `yoshop_order_record`;
TRUNCATE TABLE `yoshop_order_refund`;
TRUNCATE TABLE `yoshop_order_refund_address`;
TRUNCATE TABLE `yoshop_order_refund_image`;
TRUNCATE TABLE `yoshop_order_export`;
-- ------------------------------------------------------------
-- 3. 接口请求日志 / 已停用模块(分油公司、分油用户池)
-- ------------------------------------------------------------
TRUNCATE TABLE `yoshop_request_log`;
TRUNCATE TABLE `yoshop_account`;
TRUNCATE TABLE `yoshop_company`;
TRUNCATE TABLE `yoshop_company_balance_log`;
-- ------------------------------------------------------------
-- 4. 购物车 / 结算 / 兑换卡 / 充值
-- ------------------------------------------------------------
TRUNCATE TABLE `yoshop_cart`;
TRUNCATE TABLE `yoshop_checkout`;
TRUNCATE TABLE `yoshop_card`;
TRUNCATE TABLE `yoshop_card_log`;
TRUNCATE TABLE `yoshop_card_print`;
TRUNCATE TABLE `yoshop_recharge_order`;
TRUNCATE TABLE `yoshop_recharge_order_plan`;
TRUNCATE TABLE `yoshop_recharge_plan`;
-- ------------------------------------------------------------
-- 5. 商户 / 代理商体系(支付聚合链路)
-- ------------------------------------------------------------
TRUNCATE TABLE `yoshop_merchant`;
TRUNCATE TABLE `yoshop_merchant_balance_log`;
TRUNCATE TABLE `yoshop_merchant_order`;
-- ------------------------------------------------------------
-- 6. 小程序用户及其附属数据(保留 yoshop_user_grade 等级配置)
-- ------------------------------------------------------------
TRUNCATE TABLE `yoshop_user`;
TRUNCATE TABLE `yoshop_user_oauth`;
TRUNCATE TABLE `yoshop_user_address`;
TRUNCATE TABLE `yoshop_user_balance_log`;
TRUNCATE TABLE `yoshop_user_coupon`;
TRUNCATE TABLE `yoshop_user_grade_log`;
TRUNCATE TABLE `yoshop_user_points_log`;
TRUNCATE TABLE `yoshop_user_commission_log`;
-- ------------------------------------------------------------
-- 7. 商城基础数据(商品 / 分类 / 优惠券 / 装修页 / 文件库)
-- 注意:图片物理文件仍在磁盘,仅清库记录
-- ------------------------------------------------------------
TRUNCATE TABLE `yoshop_goods`;
TRUNCATE TABLE `yoshop_goods_sku`;
TRUNCATE TABLE `yoshop_goods_image`;
TRUNCATE TABLE `yoshop_goods_category_rel`;
TRUNCATE TABLE `yoshop_goods_service_rel`;
TRUNCATE TABLE `yoshop_goods_spec_rel`;
TRUNCATE TABLE `yoshop_goods_coupon`;
TRUNCATE TABLE `yoshop_category`;
TRUNCATE TABLE `yoshop_coupon`;
TRUNCATE TABLE `yoshop_page`;
TRUNCATE TABLE `yoshop_upload_file`;
-- ------------------------------------------------------------
-- 8. 其余业务表
-- ------------------------------------------------------------
TRUNCATE TABLE `yoshop_notify`;
TRUNCATE TABLE `yoshop_code`;
TRUNCATE TABLE `yoshop_comment`;
TRUNCATE TABLE `yoshop_comment_image`;
-- ------------------------------------------------------------
-- 9. 后台账号:只保留超级管理员 admin(store_user_id=10001)
-- ------------------------------------------------------------
DELETE FROM `yoshop_store_user` WHERE `store_user_id` <> 10001;
DELETE FROM `yoshop_store_user_role` WHERE `store_user_id` <> 10001;
-- ------------------------------------------------------------
-- 10. 恢复 yoshop 惯用的自增起始值(10001)
-- ------------------------------------------------------------
ALTER TABLE `yoshop_cart` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_category` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_coupon` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_goods` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_goods_category_rel` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_goods_image` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_goods_service_rel` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_goods_sku` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_merchant_order` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_order` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_order_goods` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_page` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_upload_file` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_user` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_user_address` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_user_balance_log` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_user_coupon` AUTO_INCREMENT = 10001;
ALTER TABLE `yoshop_user_oauth` AUTO_INCREMENT = 10001;
SET FOREIGN_KEY_CHECKS = 1;
+33
View File
@@ -0,0 +1,33 @@
; ============================================================
; 企油通配置 —— 追加到 server-tp6/.env 文件末尾
; ------------------------------------------------------------
; ⚠️ ThinkPHP 用 parse_ini_file(..., INI_SCANNER_RAW) 解析 .env:
; 值【不要加引号】,加了引号会连引号一起被读进去。
; ⚠️ RSA 密钥请去掉 -----BEGIN/END----- 头尾与所有换行,压成【一行 base64】。
; Qyt.php 会自动补回 PEM 头尾(见 loadPrivateKey / loadPublicKey)。
; ============================================================
[QYT]
; 接口域名,不含结尾斜杠(测试/正式不同,向企油通对接人索取)
BASE_URL = https://xxx.worknoya.vip
; 平台分配的 appId(业务接口用)
APP_ID =
; 我方 RSA 私钥(一行 base64,无头尾无换行)
PRIVATE_KEY =
; 企油通平台公钥(一行 base64,用于验签其响应/回调)
PLATFORM_PUBLIC_KEY =
; 我方企业营业执照编码 / 统一社会信用代码
BUSINESS_LICENSE =
; 机构号:支付宝企业码通道 7.7 必填,由企油通分配
INSTITUTION_ID =
; 全平台唯一编号前缀(batch_no / waybill_no / waybill_no_code 用,防与其他接入方撞号)
; 建议区分环境,如正式 HM、测试 HMTEST
NO_PREFIX = HM
; 7.15 H5 免登落地页地址(测试:http://dev.paytaskpage.worknoya.vip/#/)
H5_BASE_URL = https://paytaskpage.worknoya.vip/#/
; 7.15 H5 免登用的 appId(可能与业务 appId 不同,需线下确认)
H5_APP_ID =
; 我方 7.10 回调地址(此项仅作记录,实际需在企油通后台配置)
CONSUME_NOTIFY_URL = https://www.hmzkw.com/qytconsume.php
; 是否记录详细请求/响应日志到 runtime/storelog
LOG = true
+48
View File
@@ -0,0 +1,48 @@
SET NAMES utf8mb4;
DELETE FROM `yoshop_partners` WHERE `appKey` = 'qyttest0000000000000000000001';
INSERT INTO `yoshop_partners`
(`name`,`address`,`contact_name`,`contact_tel`,`orgNo`,`appKey`,`privateKey`,`publicKey`,`callback`,`balance`,`store_id`,`store_user_id`,`update_time`,`create_time`)
VALUES
('企油通联调测试商','测试地址','测试联系人','13800000000','S88888888','qyttest0000000000000000000001',
'-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDUOwdCCPSgPpR+
WsYXVz/2FQ35ybQWJK14ytDk4ITv+fQMEnMbQ8D+4cREXIydE/NOzgn+hDfHbFDf
91wti0P+1C+74wBA5xZlbhae8ZAB1hc5gmSJqE++LalfrmOIg5SDfQhtiaf4htEo
RdxEsupS964izLoXeUgIE9lY87JCqluU1thvbk601sPi2q8WnfIKN8vnSvu31YRr
86Hc4soyIdf1WZSoU4couE2QmOFm9jr55Obp+USfJg7Rjoce9ZOFj0lX3gkHqGOz
l2toxfzyZp+KqlhQLWYLmiLM3Z3G2Gz118MGjaan7zIW15Feuae1v3eNaqF7Zq6C
zDZckiwvAgMBAAECggEAWOOUSaMomkk7tqRcXYBMqMvuu5UwmSmpgnMoBQTIiR5e
igPcNCovllGG+77rogquGG6RnwlPt3X1dajL8cNnqj7C82XDQGvJZJg0X0P7tdku
hwbHByT4qUXEr++BfrblqCDhO8exE5Wb2stP03JAVJmqVKb8tkI02jU+DlSbb/HY
9G//rx1Wkbwmk1jYBu5pSuQWsQaZyijeb8JfLzGYkHyV6mrBFyFrWHoH7fmC3M6R
sLxdsj/KUIYyNHCTmRC7TG2MFQGyTRUb7Z73WgI4OzAD934sM93AMeDWtkp0Ar2r
lm5xjojrpi63IiKhR66+Tzws8bV94e99k3UcftxDQQKBgQDut5RE/srMWvv584oY
TKvVrJwm6C47QpfjY98F745cV7IYGF2ZXOcS7uavRjbI0ct3vKTJk3dfrQ9pqgIN
vrLIIxWFv+xgIzTtbpUPpd4Y6dUIZYRS2Di03WlJnlHvnq8iZbQ2cK6T3nLETVa5
sK/ab5vEIuCyEv5DF4ulmGtMYQKBgQDjmIsuRCuX7BhSSC6ZpRMPEDuTyczKAEgd
m4qzSM4YFkhVGD9LdLwbMndTZk1iNie1UkpN52zzidx/ZTUfcewJem/C6re9cMM/
xytUWz89TUYerkXpPx8K7CG3KG9v64rx3j8/pvsY82oBnJu3n0Pb0sbfpv0G0Cax
GMzv+GHCjwKBgBPHVhuZWMgxyareCNUWlS4xDQcUObBjRh5rCfF99bek9HaWnjq0
vdiNvsNK+AMPjuIu2SByfXOJ7Tr+AQmOgVWfworAah9VC2+Yt/UB8zLxPNtjPeF3
VMt3hN+6pGNMLIqXDqVsFKrfxXaKSeM8xnU8xhUsJp3agQKiEsn3pPxBAoGAJ0Gg
gBJyEno+l7KrlwTKDMcX/53HHPB/f9vcSKA+LBlr0IGmKTWxXF+QBWqX3mDI6JWR
C27nc/pLdg3W492agOgFbvFdT+erRczsxFgYyFITzibxGBIzIIcqKZVn4z4VcTKM
ZkY++UbC+hQxJ7Lo2Xm5o8oByrMMeW91qc6FzjECgYAwQX10LEqlWJDogvZP3MN9
AUrlZUGBYnjMu8vbiFY9n7DW+2gzbhL/AqzkXSgjzee+r/71aolT2gGvXPO7S290
9Ep8SF9gz1yVaYMlyj0hedF7jNkVGBRWRo0BtUqaFhthOsiD0M+/bYq0D5YCkCTZ
QOwUIF9JWN+l5JNRws+jGA==
-----END PRIVATE KEY-----
',
'-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1DsHQgj0oD6UflrGF1c/
9hUN+cm0FiSteMrQ5OCE7/n0DBJzG0PA/uHERFyMnRPzTs4J/oQ3x2xQ3/dcLYtD
/tQvu+MAQOcWZW4WnvGQAdYXOYJkiahPvi2pX65jiIOUg30IbYmn+IbRKEXcRLLq
UveuIsy6F3lICBPZWPOyQqpblNbYb25OtNbD4tqvFp3yCjfL50r7t9WEa/Oh3OLK
MiHX9VmUqFOHKLhNkJjhZvY6+eTm6flEnyYO0Y6HHvWThY9JV94JB6hjs5draMX8
8mafiqpYUC1mC5oizN2dxths9dfDBo2mp+8yFteRXrmntb93jWqhe2augsw2XJIs
LwIDAQAB
-----END PUBLIC KEY-----
',
'http://127.0.0.1/qyt_test.php?act=notify_receiver',
100000.00, 10001, 10001, UNIX_TIMESTAMP(), UNIX_TIMESTAMP());
SELECT partners_id, name, orgNo, appKey, balance, callback FROM `yoshop_partners`;
+67
View File
@@ -0,0 +1,67 @@
; ============================================================
; 企油通对接 · Supervisor 守护进程配置
; ------------------------------------------------------------
; 三个常驻队列消费者,缺一不可:
; partners:queue 下单 -> 企油通 7.7 运单油费下发(含丢单兜底巡检 reconcile)
; callback:queue 企油通 7.10 加油消费回调入队后的落库与状态更新
; notify:queue 我方 -> 下单平台 结果回调(含 60s/5min/30min 退避重试)
;
; 【使用前必改】
; 1) command 里的 PHP 路径:宝塔用 `ls /www/server/php/` 看版本,
; 如 PHP 7.4 -> /www/server/php/74/bin/php
; 2) directory:站点根目录(think 文件所在目录,不是 public)
; 3) user:宝塔站点默认运行用户一般是 www
; 4) stdout_logfile 目录需先存在:mkdir -p /www/wwwlogs/supervisor
;
; 【进程数说明】
; partners:queue 可多进程(同一订单由 RedisLock 串行,安全)
; callback:queue / notify:queue 建议保持单进程
; ============================================================
[program:qyt-partners-queue]
command=/www/server/php/74/bin/php think partners:queue
directory=/www/wwwroot/www.hmzkw.com
user=www
numprocs=1
process_name=%(program_name)s_%(process_num)02d
autostart=true
autorestart=true
startsecs=3
startretries=99
stopwaitsecs=10
redirect_stderr=true
stdout_logfile=/www/wwwlogs/supervisor/qyt-partners-queue.log
stdout_logfile_maxbytes=50MB
stdout_logfile_backups=5
[program:qyt-callback-queue]
command=/www/server/php/74/bin/php think callback:queue
directory=/www/wwwroot/www.hmzkw.com
user=www
numprocs=1
process_name=%(program_name)s_%(process_num)02d
autostart=true
autorestart=true
startsecs=3
startretries=99
stopwaitsecs=10
redirect_stderr=true
stdout_logfile=/www/wwwlogs/supervisor/qyt-callback-queue.log
stdout_logfile_maxbytes=50MB
stdout_logfile_backups=5
[program:qyt-notify-queue]
command=/www/server/php/74/bin/php think notify:queue
directory=/www/wwwroot/www.hmzkw.com
user=www
numprocs=1
process_name=%(program_name)s_%(process_num)02d
autostart=true
autorestart=true
startsecs=3
startretries=99
stopwaitsecs=10
redirect_stderr=true
stdout_logfile=/www/wwwlogs/supervisor/qyt-notify-queue.log
stdout_logfile_maxbytes=50MB
stdout_logfile_backups=5