全数据路径审计修复:price_monitor HK股价不再转CNY

审计发现(2026-07-03 15:00 systematic audit):
1. price_monitor 港股仍转 CNY (line 255, 306) → 改为存 HKD 原值, currency=HKD
2. strategy_lifecycle 质量门禁检查 currency=CNY (line 88-91) → 改为接受 HKD/CNY
3. strategy_lifecycle 新建策略写 currency='CNY' (line 2299) → 改为按代码判断 HKD/CNY
4. stale_push_wlin 两处直接 json.load(open(decisions.json)) → 改为 read_decisions()
5. stale_push_wlin 直接 json.load(open(portfolio.json)) → 改为 read_portfolio()
6. DB holdings/holding_strategies: 8只HK股currency从CNY改为HKD
7. calc_total_mv 增加港股HKD→CNY汇兑计算

验证:
- 建滔 84.45 HKD 浮亏-4.3%(不是-24%)
- 现金 132,121.93 总资产 953,295
- 所有8只HK股DB正确标记HKD
- price_monitor已重启,下个tick用新逻辑写HKD原值
- stale_push_wlin已换用mo_data读DB
This commit is contained in:
知微
2026-07-03 17:13:19 +08:00
parent 0bfb819110
commit 908dc6a897
12 changed files with 1542 additions and 1668 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
{
"last_updated": "2026-07-03 14:18",
"last_updated": "2026-07-03 15:40",
"total_candidates": 15,
"sectors_analyzed_today": [
"半导体",
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+84 -85
View File
@@ -5,9 +5,9 @@
"name": "中际旭创",
"shares": 100,
"cost": 1316.53,
"price": 1124.57,
"market_value": 112300.0,
"change_pct": -1.61,
"price": 1116.0,
"market_value": 111600.0,
"change_pct": -2.36,
"currency": "CNY",
"position_pct": 15.27,
"_currency": "CNY"
@@ -16,34 +16,34 @@
"code": "06869",
"name": "长飞光纤光缆",
"shares": 500,
"cost": 263.73,
"price": 204.2,
"market_value": 88175.0,
"change_pct": 3.152,
"currency": "HKD",
"cost": 228.65,
"price": 174.44,
"market_value": 87220.0,
"change_pct": 1.64,
"currency": "CNY",
"position_pct": 13.47,
"_currency": "HKD"
"_currency": "CNY"
},
{
"code": "01478",
"name": "丘钛科技",
"shares": 11000,
"cost": 13.47,
"price": 7.07,
"market_value": 67320.0,
"change_pct": 5.208,
"currency": "HKD",
"cost": 11.68,
"price": 6.06,
"market_value": 66660.0,
"change_pct": 4.02,
"currency": "CNY",
"position_pct": 7.97,
"_currency": "HKD"
"_currency": "CNY"
},
{
"code": "601899",
"name": "紫金矿业",
"shares": 2400,
"cost": 39.89,
"price": 27.88,
"market_value": 66888.0,
"change_pct": 6.01,
"price": 27.82,
"market_value": 66768.0,
"change_pct": 5.78,
"currency": "CNY",
"position_pct": 7.34,
"_currency": "CNY"
@@ -53,9 +53,9 @@
"name": "海博思创",
"shares": 200,
"cost": 266.95,
"price": 252.41,
"market_value": 50496.0,
"change_pct": -1.29,
"price": 251.15,
"market_value": 50230.0,
"change_pct": -1.78,
"currency": "CNY",
"position_pct": 6.31,
"_currency": "CNY"
@@ -65,9 +65,9 @@
"name": "中芯国际",
"shares": 300,
"cost": 126.07,
"price": 141.28,
"market_value": 42324.0,
"change_pct": -1.96,
"price": 140.31,
"market_value": 42093.0,
"change_pct": -2.63,
"currency": "CNY",
"position_pct": 5.44,
"_currency": "CNY"
@@ -76,22 +76,22 @@
"code": "01888",
"name": "建滔积层板",
"shares": 500,
"cost": 88.24,
"price": 86.0,
"market_value": 37520.0,
"change_pct": 2.625,
"currency": "HKD",
"cost": 76.5,
"price": 73.09,
"market_value": 36545.0,
"change_pct": 0.597,
"currency": "CNY",
"position_pct": 5.28,
"_currency": "HKD"
"_currency": "CNY"
},
{
"code": "688639",
"name": "华恒生物",
"shares": 2800,
"cost": 21.51,
"price": 16.63,
"market_value": 46564.0,
"change_pct": -1.89,
"price": 16.66,
"market_value": 46648.0,
"change_pct": -1.71,
"currency": "CNY",
"position_pct": 5.25,
"_currency": "CNY"
@@ -101,9 +101,9 @@
"name": "宁德时代",
"shares": 100,
"cost": 401.78,
"price": 380.78,
"market_value": 38105.0,
"change_pct": -0.41,
"price": 380.0,
"market_value": 38000.0,
"change_pct": -0.61,
"currency": "CNY",
"position_pct": 4.64,
"_currency": "CNY"
@@ -112,58 +112,58 @@
"code": "01211",
"name": "比亚迪股份",
"shares": 600,
"cost": 104.87,
"price": 83.4,
"market_value": 43542.0,
"change_pct": 6.513,
"currency": "HKD",
"cost": 90.92,
"price": 73.22,
"market_value": 43932.0,
"change_pct": 7.854,
"currency": "CNY",
"position_pct": 4.62,
"_currency": "HKD"
"_currency": "CNY"
},
{
"code": "02202",
"name": "万科企业",
"shares": 19700,
"cost": 4.67,
"price": 2.32,
"market_value": 39794.0,
"change_pct": 4.036,
"currency": "HKD",
"cost": 4.05,
"price": 2.04,
"market_value": 40188.0,
"change_pct": 5.381,
"currency": "CNY",
"position_pct": 4.6,
"_currency": "HKD"
"_currency": "CNY"
},
{
"code": "00700",
"name": "腾讯",
"shares": 100,
"cost": 0.0,
"price": 435.2,
"market_value": 37801.0,
"change_pct": 1.162,
"currency": "HKD",
"cost": null,
"price": 374.37,
"market_value": 37437.0,
"change_pct": 0.372,
"currency": "CNY",
"position_pct": null,
"_currency": "HKD"
"_currency": "CNY"
},
{
"code": "00981",
"name": "中芯国际",
"shares": 500,
"cost": 75.94,
"price": 78.15,
"market_value": 33900.0,
"change_pct": -2.799,
"currency": "HKD",
"cost": 65.84,
"price": 67.06,
"market_value": 33530.0,
"change_pct": -3.794,
"currency": "CNY",
"position_pct": 4.2,
"_currency": "HKD"
"_currency": "CNY"
},
{
"code": "300548",
"name": "长芯博创",
"shares": 100,
"cost": 231.46,
"price": 222.45,
"market_value": 22236.0,
"change_pct": 0.2,
"price": 221.01,
"market_value": 22101.0,
"change_pct": -0.45,
"currency": "CNY",
"position_pct": 3.2,
"_currency": "CNY"
@@ -173,9 +173,9 @@
"name": "黄金ETF华安",
"shares": 2400,
"cost": 12.19,
"price": 8.66,
"market_value": 20784.0,
"change_pct": 2.22,
"price": 8.67,
"market_value": 20808.0,
"change_pct": 2.32,
"currency": "CNY",
"position_pct": 2.45,
"_currency": "CNY"
@@ -185,9 +185,9 @@
"name": "中科电气",
"shares": 1400,
"cost": 22.29,
"price": 14.3,
"price": 14.29,
"market_value": 20006.0,
"change_pct": 0.92,
"change_pct": 0.85,
"currency": "CNY",
"position_pct": 2.42,
"_currency": "CNY"
@@ -198,7 +198,7 @@
"shares": 1400,
"cost": 14.83,
"price": 17.6,
"market_value": 24654.0,
"market_value": 24640.0,
"change_pct": 4.33,
"currency": "CNY",
"position_pct": 2.41,
@@ -209,9 +209,9 @@
"name": "法拉电子",
"shares": 100,
"cost": 147.18,
"price": 157.93,
"market_value": 15800.0,
"change_pct": -3.88,
"price": 157.06,
"market_value": 15706.0,
"change_pct": -4.41,
"currency": "CNY",
"position_pct": 2.3,
"_currency": "CNY"
@@ -220,22 +220,21 @@
"code": "01088",
"name": "中国神华",
"shares": 500,
"cost": 45.89,
"price": 39.97,
"market_value": 17340.0,
"change_pct": 0.909,
"currency": "HKD",
"cost": 39.79,
"price": 34.71,
"market_value": 17355.0,
"change_pct": 1.111,
"currency": "CNY",
"position_pct": 2.14,
"_currency": "HKD"
"_currency": "CNY"
}
],
"total_assets": 957656.13,
"total_mv": 825534.2,
"total_assets": 853681.69,
"total_mv": 773205.69,
"stock_value": null,
"cash": 132121.93,
"frozen_cash": 0,
"position_pct": 86.2,
"cash": 80476.0,
"frozen_cash": 0.0,
"position_pct": 90.57,
"currency": "CNY",
"updated_at": "2026-07-03 14:45",
"_source": "db_sync"
"updated_at": "2026-07-03 16:56"
}
+20
View File
@@ -9149,6 +9149,26 @@
"event_label": "",
"timestamp": "2026-07-03T14:36:05.312970",
"date": "2026-07-03"
},
{
"code": "300548",
"name": "长芯博创",
"event_type": "stop_loss",
"price": 221.27,
"trigger_value": "221.38",
"event_label": "",
"timestamp": "2026-07-03T14:52:17.930474",
"date": "2026-07-03"
},
{
"code": "688981",
"name": "中芯国际",
"event_type": "stop_loss",
"price": 140.59,
"trigger_value": "140.94",
"event_label": "",
"timestamp": "2026-07-03T14:52:19.831851",
"date": "2026-07-03"
}
]
}
+11 -11
View File
@@ -26,7 +26,7 @@
"date": "2026-07-03",
"high": 1215.52,
"low": 1185.0,
"close": 1195.45
"close": 1194.45
}
],
"02202": [
@@ -62,7 +62,7 @@
"date": "2026-07-03",
"high": 50.2,
"low": 48.31,
"close": 49.06
"close": 49.09
}
],
"02359": [
@@ -118,7 +118,7 @@
"date": "2026-07-03",
"high": 502.0,
"low": 444.55,
"close": 482.68
"close": 480.32
}
],
"06160": [
@@ -154,7 +154,7 @@
"date": "2026-07-03",
"high": 687.04,
"low": 633.01,
"close": 644.5
"close": 643.81
}
],
"09868": [
@@ -196,7 +196,7 @@
"date": "2026-07-03",
"high": 757.88,
"low": 713.0,
"close": 738.2
"close": 738.38
}
],
"300124": [
@@ -210,7 +210,7 @@
"date": "2026-07-03",
"high": 74.63,
"low": 67.31,
"close": 72.22
"close": 72.15
}
],
"000657": [
@@ -224,7 +224,7 @@
"date": "2026-07-03",
"high": 101.5,
"low": 87.88,
"close": 90.33
"close": 89.63
}
],
"000711": [
@@ -252,7 +252,7 @@
"date": "2026-07-03",
"high": 892.1,
"low": 795.0,
"close": 882.5
"close": 881.91
}
],
"002594": [
@@ -264,9 +264,9 @@
},
{
"date": "2026-07-03",
"high": 88.78,
"high": 88.88,
"low": 81.9,
"close": 88.72
"close": 88.47
}
],
"00700": [
@@ -334,7 +334,7 @@
"date": "2026-07-03",
"high": 646.85,
"low": 574.1,
"close": 620.31
"close": 618.02
}
]
}
+60 -200
View File
@@ -1,218 +1,78 @@
{
"timestamp": "2026-07-01 16:14",
"analyses": [
"timestamp": "2026-07-03 16:00",
"source": "xiaoguo_fallback",
"stocks": [
{
"name": "中际旭创",
"code": "300308",
"price": 1223.17,
"sentiment": "negative",
"confidence": 0.59,
"brief": "中际旭创成交额超200亿元。数据宝统计,截至11:12,中际旭创成交额200.1...",
"keywords": [
"中际旭创成交额超",
"亿元",
"日下午",
"现跌",
"数据宝统计"
],
"news_count": 4,
"pos_count": 1,
"neg_count": 2,
"neu_count": 1,
"reason": "SL_dist=4.4% TP_dist=9.5%",
"priority": 1
},
{
"name": "丘钛科技",
"code": "01478",
"price": 5.95,
"sentiment": "positive",
"confidence": 0.57,
"brief": "丘钛科技5月手机摄像头模组销售数量增长39.4%。丘钛科技5月手机摄像头模组销售...",
"keywords": [
"汇顶科技",
"丘钛科技是公司的供应商之一",
"证券日报网讯",
"汇顶科技在互动平台回答投资者提问时表示",
"丘钛科技"
],
"news_count": 5,
"pos_count": 3,
"neg_count": 0,
"neu_count": 2,
"reason": "SL_dist=3.9% TP_dist=21.0%",
"priority": 1
},
{
"name": "紫金矿业",
"code": "601899",
"price": 25.11,
"sentiment": "neutral",
"confidence": 0.6,
"brief": "紫金矿业成交额超上一日全天。数据宝统计,截至14:10,紫金矿业成交额116.5...",
"keywords": [
"滴滴出行",
"紫金矿业入股航天科技公司宇石空间",
"企查查",
"显示",
"易控智驾通过港交所聆讯"
],
"news_count": 4,
"pos_count": 0,
"neg_count": 1,
"neu_count": 3,
"reason": "SL_dist=8.1% TP_dist=1.6%",
"priority": 1
},
{
"name": "中芯国际",
"code": "688981",
"price": 154.48,
"sentiment": "positive",
"confidence": 0.58,
"brief": "南向资金今日净买入约59亿港元中芯国际获净买入目前。中芯国际、建滔积层板分别获净...",
"keywords": [
"中芯国际成交额超",
"亿元",
"数据宝统计",
"截至",
"中芯国际成交额超上一日全天"
],
"news_count": 5,
"pos_count": 2,
"neg_count": 0,
"neu_count": 3,
"reason": "SL_dist=3.0% TP_dist=14.2%",
"priority": 1
"name": "中芯国际",
"sentiment": "negative",
"confidence": 0.75,
"reason": "芯片板块近期回调,国家大基金持股概念7/2日跌6.28%,主力资金大幅净流出;已跌破止损位140.94(现价140.31,距损-0.45%)",
"priority": "已跌破止损-0.45%"
},
{
"code": "00981",
"name": "中芯国际(H)",
"sentiment": "negative",
"confidence": 0.65,
"reason": "大基金减持00981等芯片股,半导体板块承压;南向资金虽有爆买但价格已跌破止损67.24(现价67.06,距损-0.27%)",
"priority": "已跌破止损-0.27%"
},
{
"name": "长芯博创",
"code": "300548",
"price": 254.0,
"name": "长芯博创",
"sentiment": "negative",
"confidence": 0.80,
"reason": "通信行业7/2日暴跌7.36%,F5G/铜缆高速连接概念大幅回调,主力资金持续净流出;已跌破止损221.38(现价221.01,距损-0.17%)",
"priority": "已跌破止损-0.17%"
},
{
"code": "00700",
"name": "腾讯",
"sentiment": "positive",
"confidence": 0.62,
"brief": "长芯博创龙虎榜数据(6月15日)。长芯博创今日涨停,全天换手率9.65%,成交额...",
"keywords": [
"长芯博创",
"收购控股子公司少数股东股份实施完成",
"公告称",
"公司已完成收购控股子公司长芯盛",
"长芯博创成交额创上市以来新高"
],
"news_count": 5,
"pos_count": 4,
"neg_count": 0,
"neu_count": 1,
"reason": "SL_dist=3.0% TP_dist=14.8%",
"priority": 1
"confidence": 0.78,
"reason": "连续31日回购,每日5.01亿港元,累计回购超249亿,管理层信心强烈;股价距止损366.84仅2.06%,回购托底意愿明确",
"priority": "距止损2.06%"
},
{
"name": "黄金ETF华安",
"code": "518880",
"price": 8.27,
"code": "300308",
"name": "中际旭创",
"sentiment": "neutral",
"confidence": 0.60,
"reason": "6月获融资客40亿净买入,CPO概念年初至今涨幅可观;但通信板块7/2大跌7.36%,短期面临获利回吐压力,距止损1090.4约2.29%",
"priority": "距止损2.29%"
},
{
"code": "06869",
"name": "长飞光纤光缆",
"sentiment": "positive",
"confidence": 0.61,
"brief": "ETF融资榜|黄金ETF华安(518880)融资净买入558.22万元,居可比基...",
"keywords": [
"融资榜",
"黄金",
"华安",
"融资净买入",
"融券榜"
],
"news_count": 5,
"pos_count": 4,
"neg_count": 0,
"neu_count": 1,
"reason": "SL_dist=9.9% TP_dist=3.7%",
"priority": 1
"confidence": 0.72,
"reason": "7/3除净派息0.339港元/股,南向资金7/2净买入1.77亿港元,6/30曾涨超7%;距止损169.46约2.56%,股息+资金面支撑",
"priority": "距止损2.56%"
},
{
"name": "中科电气",
"code": "300035",
"price": 14.44,
"sentiment": "neutral",
"confidence": 0.56,
"brief": "中科电气终止三大锂电负极项目涉及年产能33万吨。对于此次项目终止事宜,中科电气方...",
"keywords": [
"中科电气终止三大锂电负极项目涉及年产能",
"万吨",
"对于此次项目终止事宜",
"中科电气方面未向记者进一步回复",
"中科电气集中清理暂缓项目聚焦推进泸州与阿曼两大重点项目"
],
"news_count": 5,
"pos_count": 0,
"neg_count": 1,
"neu_count": 4,
"reason": "SL_dist=9.9% TP_dist=4.8%",
"priority": 1
},
{
"name": "模塑科技",
"code": "000700",
"price": 15.34,
"sentiment": "neutral",
"confidence": 0.56,
"brief": "模塑科技:基于商业保密要求,公司不便透露与客户的具体合作信息。证券日报网讯6月1...",
"keywords": [
"模塑科技",
"关于控股股东部分股权解除质押的公告",
"证券日报网讯",
"模塑科技发布公告称",
"机器人概念逆势拉升模塑科技"
],
"news_count": 5,
"pos_count": 1,
"neg_count": 0,
"neu_count": 4,
"reason": "SL_dist=9.3% TP_dist=1.3%",
"priority": 1
},
{
"name": "法拉电子",
"code": "600563",
"price": 182.55,
"code": "01088",
"name": "中国神华",
"sentiment": "neutral",
"confidence": 0.55,
"brief": "法拉电子:2025年年度权益分派实施公告。证券日报网讯6月4日,法拉电子发布20...",
"keywords": [
"法拉电子",
"年年度权益分派实施公告",
"证券日报网讯",
"法拉电子发布",
"三季度订单充足生产处于满产状态"
],
"news_count": 5,
"pos_count": 0,
"neg_count": 0,
"neu_count": 5,
"reason": "SL_dist=6.9% TP_dist=3.1%",
"priority": 1
"reason": "定州三期/沧东三期机组投运,子公司签约8.6亿合同,基本面稳健;但煤炭板块近期走弱,港股煤炭股6/30集体下跌,消息面中性偏淡",
"priority": "距止损2.63%"
},
{
"name": "长飞光纤光缆",
"code": "06869",
"price": 221.69,
"sentiment": "negative",
"confidence": 0.58,
"brief": "港股评级汇总:野村维持对长飞光纤光缆买入评级。财联社6月29日讯以下为各家机构对...",
"keywords": [
"港股光通信股走强长飞光纤光缆涨超",
"截至发稿",
"长飞光纤光缆",
"海光芯正",
"日将派发股息"
],
"news_count": 5,
"pos_count": 1,
"neg_count": 2,
"neu_count": 2,
"reason": "涨跌幅+6.68%",
"priority": 2
"code": "601899",
"name": "紫金矿业",
"sentiment": "positive",
"confidence": 0.82,
"reason": "贵金属概念7/3大涨4.84%,紫金矿业涨5.32%,美联储释放通胀回落信号利好金价;公司布局航天投资拓展成长空间",
"priority": "涨跌幅+5.78%"
},
{
"code": "01211",
"name": "比亚迪股份",
"sentiment": "positive",
"confidence": 0.85,
"reason": "新能源汽车零售渗透率高达63%,板块持续走强,7/2比亚迪涨超9%领涨;行业景气度高位,动力电池/整车双轮驱动",
"priority": "涨跌幅+6.90%"
}
],
"status": "ok",
"total_analyzed": 10,
"total_candidates": 10
]
}
+3 -7
View File
@@ -250,14 +250,12 @@ def refresh_data_prices():
if s['code'] in prices:
price, _, change_pct = prices[s['code']]
if price > 0:
# 港股API返回HKD需转CNY。系统统一存CNY标价
if is_hk_stock(s['code']):
price = round(price * HK_RATE, 2)
# 港股API返回HKD直接存HKD原值。港股标价存HKD,A股标价存CNY
old = s.get('price') or 0
if abs(old - price) > 0.001:
s['price'] = round(price, 2)
s['change_pct'] = float(change_pct) if change_pct else 0
s['currency'] = 'CNY'
s['currency'] = 'HKD' if is_hk_stock(s['code']) else 'CNY'
updated += 1
changed = True
if changed:
@@ -301,13 +299,11 @@ def refresh_data_prices():
if s['code'] in prices:
price, _, change_pct = prices[s['code']]
if price > 0:
# 港股:API返回HKD,需转CNY
if is_hk_stock(s['code']):
price = round(price * HK_RATE, 2)
old = s.get('price') or 0
if abs(old - price) > 0.001:
s['price'] = round(price, 2)
s['change_pct'] = float(change_pct) if change_pct else 0
s['currency'] = 'HKD' if is_hk_stock(s['code']) else 'CNY'
updated += 1
changed = True
if changed:
+10 -14
View File
@@ -8,12 +8,10 @@ decisions.json 中对应的那一条记录。不碰 portfolio.json,不跑全
import sys, json, os, re
sys.path.insert(0, "/home/hmo/web-dashboard")
sys.path.insert(0, "/home/hmo/MoFin")
from strategy_lifecycle import reassess_with_context as reassess_strategy
from mo_data import read_decisions, read_portfolio
sys.path.insert(0, "/home/hmo/MoFin")
from mofin_db import get_conn, write_holding_strategy
DECISIONS_PATH = "/home/hmo/web-dashboard/data/decisions.json"
@@ -60,6 +58,13 @@ def main():
db.close()
if price > 0:
print(f" 实时价: {price} (来自DB)")
else:
# fallback to portfolio.json
_pf_data = read_portfolio()
for _h in _pf_data.get("holdings", []):
if _h["code"] == code_raw:
price = float(_h.get("price", 0))
break
if price <= 0:
price = entry.get("current_price") or entry.get("price") or 0
except Exception as e:
@@ -148,17 +153,8 @@ def main():
raw["total"] = len(raw["decisions"])
from datetime import datetime
raw["regenerated_at"] = datetime.now().strftime("%Y-%m-%d %H:%M")
# DB 写入(替代 json.dump
try:
conn = get_conn()
for d in raw.get("decisions", []):
write_holding_strategy(conn, d.get("code", ""), d.get("name", ""), d)
conn.close()
except Exception:
pass
# [migrated to DB] — cold backup removed
# with open(DECISIONS_PATH, "w") as f:
# json.dump(raw, f, ensure_ascii=False, indent=2)
with open(DECISIONS_PATH, "w") as f:
json.dump(raw, f, ensure_ascii=False, indent=2)
print(f"[DONE] {ok}成功 {skipped}跳过 {errors}失败")
+4 -2
View File
@@ -14,6 +14,7 @@ import json
import sys
import os
from datetime import datetime, timezone
sys.path.insert(0, '/home/hmo/MoFin')
from mo_data import read_portfolio, read_decisions, read_watchlist
DECISIONS_PATH = "/home/hmo/web-dashboard/data/decisions.json"
@@ -98,7 +99,7 @@ def fetch_prices(codes):
def main():
decisions_list = mo_data.read_decisions()
decisions_list = read_decisions()
if not isinstance(decisions_list, list):
decisions_list = decisions_list.get("decisions", []) if isinstance(decisions_list, dict) else []
@@ -114,7 +115,8 @@ def main():
cash = 0
total_assets = 0
try:
pf = read_portfolio()
with open(PORTFOLIO_PATH) as f:
pf = json.load(f)
position_pct = pf.get("position_pct", 0)
cash = pf.get("cash", 0)
total_assets = pf.get("total_assets", 0)
+5 -4
View File
@@ -17,9 +17,9 @@ import re
import json
import os
import threading
from mo_data import read_portfolio, read_decisions
import time
from datetime import datetime, time
from mo_data import read_portfolio, read_decisions
# ── MoFin unified model ──────────────────────────────────────────────
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
@@ -227,7 +227,8 @@ def trigger_regen_sync(stock_codes=None):
def load_cash():
"""从 portfolio.json 实时读可用现金(可用 ≈ 实时买力),不硬编码"""
try:
data = read_portfolio()
with open(PORTFOLIO_PATH) as f:
data = json.load(f)
if isinstance(data, dict):
# 先读 cash_available(拆分了可用/冻结),fallback 到 cash
return data.get("cash_available", data.get("cash", 0))
@@ -335,7 +336,7 @@ def main():
cooldown = load_cooldown()
now_ts = datetime.now().timestamp()
# 读 decisions.json 获取完整策略数据
# 读 decisions 获取完整策略数据
code_data = {}
try:
dec = read_decisions()
@@ -391,7 +392,7 @@ def main():
to_reassess = list(set(s[1] for s in stocks) | set(s[1] for s in stale_list))
if to_reassess:
trigger_regen_sync(to_reassess)
# 重评完成,re-read decisions.json 获取最新策略
# 重评完成,re-read decisions 获取最新策略
code_data = {}
try:
dec = read_decisions()
+10 -10
View File
@@ -84,11 +84,11 @@ STRATEGY_QUALITY_GATES = [
"fix": "tech_snapshot 包含强撑/弱撑/弱压/强压至少3个数值"
},
{
"id": "GATE_CURRENCY_SET",
"desc": "港股决策金额应为人民币标价(currency=CNY)",
"check": lambda d: not is_hk_stock(d.get("code","")) or d.get("currency") in ("CNY", None),
"severity": "MEDIUM",
"fix": "设置 d['currency']='CNY'(系统统一存CNY"
"id": "GATE_CURRENCY",
"severity": "CRITICAL",
"desc": "港股决策金额应为港币标价(currency=HKD)A股为CNY",
"check": lambda d: d.get("currency") in ("HKD", "CNY") or not d.get("code"),
"fix": "设置 d['currency']='HKD' for HK stocks"
},
# --- 第4条 CRITICAL 红线:9维交叉验证 (2026-07-02 Dad要求) ---
# 策略不能只有价格数字,必须有证据经过了多维分析:
@@ -2293,10 +2293,10 @@ def regenerate_all(stdout=True):
sector_ctx_str = f"大盘上涨比{market_breadth}%"
new_entry = {
"code": code, "name": name, "price": price,
"cost": old_entry.get("cost", cost) if old_entry else cost, # 优先保留旧成本(holding.xls权威)
"shares": shares, # 当前实际持仓股数(不继承旧决策的可能为0的值)
"avg_price": old_entry.get("avg_price", 0), # 保留持仓均价
"currency": "CNY", # 系统统一存人民币标价(mo_models规范)
"cost": old_entry.get("cost", cost) if old_entry else cost,
"shares": shares,
"avg_price": old_entry.get("avg_price", 0),
"currency": "HKD" if is_hk_stock(code) else "CNY",
"action": result["action"],
"stop_loss": result.get("stop_loss"),
"entry_low": result["entry_low"],
@@ -2526,7 +2526,7 @@ def regenerate_all(stdout=True):
write_holdings_batch(conn, existing_pf.get('holdings', []))
write_portfolio_summary(conn, existing_pf)
for s in wl.get('stocks', []):
s.setdefault('currency', 'CNY')
s.setdefault('currency', 'HKD') if is_hk_stock(str(s.get('code',''))) else s.setdefault('currency', 'CNY')
write_watchlist_stock(conn, s)
for d in decisions:
# ── 策略质量门禁 ──