Преглед изворни кода

chore: auto bump version and changelog [skip ci]

iwt пре 1 месец
родитељ
комит
ee86981e83

+ 1 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/ProductService.java

@@ -9,6 +9,7 @@ import com.etotem.cfc.dto.ProductDTO;
 import com.etotem.cfc.dto.ProductListQueryDTO;
 import com.etotem.cfc.entity.AssessmentProduct;
 import com.etotem.cfc.entity.Product;
+import com.etotem.cfc.entity.ProductGiftRule;
 import com.etotem.cfc.entity.User;
 import com.etotem.cfc.mapper.ProductMapper;
 import com.etotem.cfc.mapper.UserMapper;

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-9e5265f6286b92eddedd377e7f2c84d03f722743
+17b99c66a5489710f8ed6fcce214ec53a0e630ca

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.761",
+  "version": "1.0.762",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 43 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,49 @@
 
 ---
 
+## v1.0.762 (2026-08-03)
+
+### 其他
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- - 首页能量沙盘下方新增会员入口卡(非会员开通 / 会员≤30天续费)
+- - 活动详情页非会员显示会员价引流链接
+- - 活动列表会员价点击跳转开通
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- (list(Map,Long) / create(Activity,Long) / update(Activity,Long,String) / end(Map,Long,String))
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+
+### 新功能
+- 会员中心页与会员价引导交互
+- 活动/商城会员价展示、分转元显示与未登录会员状态处理
+- 活动详情支持游客浏览与会员价 - detail(id,userId) 解析会员价
+
+### Bug 修复
+- ActivityControllerTest 适配活动模块升级后的接口签名
+- 上传存储路径统一 upload.base-dir - 修复 transferTo 相对路径落盘失败与 /uploads URL 404
+- VirtualGoodsConfig.save() 重命名 saveConfig() 避免 saveOrUpdate 递归 StackOverflow
+- 会员接口匿名访问返回 FREE 空数据 + getMemberLevel 查询 LIMIT 1
+
+### 重构
+- 健康报告上传页 report-upload.vue 重构
+
+
 ## v1.0.761 (2026-08-03)
 
 ### Bug 修复

+ 44 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.761
+> 当前版本: v1.0.762
 
 ## 历史版本
 
@@ -8,6 +8,49 @@
 
 ---
 
+## v1.0.762 (2026-08-03)
+
+### 其他
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- - 首页能量沙盘下方新增会员入口卡(非会员开通 / 会员≤30天续费)
+- - 活动详情页非会员显示会员价引流链接
+- - 活动列表会员价点击跳转开通
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- (list(Map,Long) / create(Activity,Long) / update(Activity,Long,String) / end(Map,Long,String))
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+
+### 新功能
+- 会员中心页与会员价引导交互
+- 活动/商城会员价展示、分转元显示与未登录会员状态处理
+- 活动详情支持游客浏览与会员价 - detail(id,userId) 解析会员价
+
+### Bug 修复
+- ActivityControllerTest 适配活动模块升级后的接口签名
+- 上传存储路径统一 upload.base-dir - 修复 transferTo 相对路径落盘失败与 /uploads URL 404
+- VirtualGoodsConfig.save() 重命名 saveConfig() 避免 saveOrUpdate 递归 StackOverflow
+- 会员接口匿名访问返回 FREE 空数据 + getMemberLevel 查询 LIMIT 1
+
+### 重构
+- 健康报告上传页 report-upload.vue 重构
+
+
 ## v1.0.761 (2026-08-03)
 
 ### Bug 修复

+ 11 - 1
cfc-web/src/views/admin/ProductEdit.vue

@@ -197,6 +197,13 @@
           </div>
         </el-form-item>
 
+        <el-form-item label="赠送会员">
+          <el-switch v-model="giftRuleEnabled" active-text="启用" inactive-text="停用" />
+          <el-select v-if="giftRuleEnabled" v-model="giftRuleLevel" placeholder="选择赠送等级" style="margin-left: 12px; width: 200px">
+            <el-option v-for="lv in membershipLevels" :key="lv.levelCode" :label="lv.levelName" :value="lv.levelCode" />
+          </el-select>
+        </el-form-item>
+
         <el-form-item>
           <el-button type="primary" :loading="saving" @click="handleSave">
 {{ isEdit ? '保存修改' : '创建商品' }}
@@ -209,7 +216,7 @@
 </template>
 
 <script>
-import { getProduct, createProduct, updateProduct, listAllSupplySystems, getPredefinedPurchaseFields, getProductPurchaseFields, saveProductPurchaseFields, getMySupplySystem } from '@/api/admin'
+import { getProduct, createProduct, updateProduct, listAllSupplySystems, getPredefinedPurchaseFields, getProductPurchaseFields, saveProductPurchaseFields, getMySupplySystem, saveProductGiftRule, listProductGiftRules, listMembershipLevels } from '@/api/admin'
 import { saveDimensionWeights, getDimensionWeights } from '@/api/dimension-weight'
 import DimensionWeightPicker from '@/components/DimensionWeightPicker.vue'
 import ProductSkuEditor from './components/ProductSkuEditor.vue'
@@ -246,6 +253,9 @@ export default {
       },
       imageList: [],
       supplySystems: [],
+      giftRuleEnabled: false,
+      giftRuleLevel: '',
+      membershipLevels: [],
       rules: {
         name: [{ required: true, message: '请输入商品名称', trigger: 'blur' }],
         productType: [{ required: true, message: '请选择商品类型', trigger: 'change' }],