Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 1 месяц назад
Родитель
Сommit
b9af694815

+ 7 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/product/ProductOrderController.java

@@ -96,11 +96,17 @@ private QrCodeService qrCodeService;
 
 
     @PostMapping("/vendor-confirm")
     @PostMapping("/vendor-confirm")
     public Result<String> vendorConfirm(@RequestBody Map<String, Object> params,
     public Result<String> vendorConfirm(@RequestBody Map<String, Object> params,
-                                        @RequestAttribute("userId") Long userId) {
+                                         @RequestAttribute("userId") Long userId) {
         String orderNo = (String) params.get("orderNo");
         String orderNo = (String) params.get("orderNo");
         return orderService.vendorConfirm(orderNo, userId);
         return orderService.vendorConfirm(orderNo, userId);
     }
     }
 
 
+    @PostMapping("/review/update")
+    public Result<Map<String, Object>> reviewUpdate(@RequestBody Map<String, Object> params,
+                                                     @RequestAttribute("userId") Long userId) {
+        return orderService.reviewUpdate(params, userId);
+    }
+
     @PostMapping("/ship")
     @PostMapping("/ship")
     public Result<String> ship(@RequestBody Map<String, Object> params) {
     public Result<String> ship(@RequestBody Map<String, Object> params) {
         String orderNo = (String) params.get("orderNo");
         String orderNo = (String) params.get("orderNo");

+ 10 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/ProductOrderService.java

@@ -10,6 +10,8 @@ import com.etotem.cfc.dto.ProductOrderDTO;
 import com.etotem.cfc.entity.AfterSalesRequest;
 import com.etotem.cfc.entity.AfterSalesRequest;
 import com.etotem.cfc.entity.AssessmentProduct;
 import com.etotem.cfc.entity.AssessmentProduct;
 import com.etotem.cfc.entity.Consignee;
 import com.etotem.cfc.entity.Consignee;
+import com.etotem.cfc.entity.Coupon;
+import com.etotem.cfc.entity.FamilyCoupon;
 import com.etotem.cfc.entity.Product;
 import com.etotem.cfc.entity.Product;
 import com.etotem.cfc.entity.ProductBundleItem;
 import com.etotem.cfc.entity.ProductBundleItem;
 import com.etotem.cfc.entity.ProductGiftRule;
 import com.etotem.cfc.entity.ProductGiftRule;
@@ -26,6 +28,8 @@ import com.etotem.cfc.mapper.AfterSalesRequestMapper;
 import com.etotem.cfc.entity.SupplySystemMember;
 import com.etotem.cfc.entity.SupplySystemMember;
 import com.etotem.cfc.mapper.SupplySystemMemberMapper;
 import com.etotem.cfc.mapper.SupplySystemMemberMapper;
 import com.etotem.cfc.service.SupplyHierarchyService;
 import com.etotem.cfc.service.SupplyHierarchyService;
+import com.etotem.cfc.mapper.CouponMapper;
+import com.etotem.cfc.mapper.FamilyCouponMapper;
 import com.etotem.cfc.mapper.ProductMapper;
 import com.etotem.cfc.mapper.ProductMapper;
 import com.etotem.cfc.mapper.ProductOrderMapper;
 import com.etotem.cfc.mapper.ProductOrderMapper;
 import com.etotem.cfc.mapper.UserMapper;
 import com.etotem.cfc.mapper.UserMapper;
@@ -163,6 +167,12 @@ public class ProductOrderService {
     @Resource
     @Resource
     private ProductGiftService productGiftService;
     private ProductGiftService productGiftService;
 
 
+    @Resource
+    private CouponMapper couponMapper;
+
+    @Resource
+    private FamilyCouponMapper familyCouponMapper;
+
     public Result<ProductOrderDTO> create(CreateProductOrderDTO dto, Long buyerId) {
     public Result<ProductOrderDTO> create(CreateProductOrderDTO dto, Long buyerId) {
         if (buyerId == null) {
         if (buyerId == null) {
             return Result.error("请先登录");
             return Result.error("请先登录");

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-7128d7419cf9bcfb291bbb2b050d6bdab7d4bc12
+494f64d351f2aed3b5800fcda547decbfdfdb69e

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
 {
   "name": "cfc-web",
   "name": "cfc-web",
-  "version": "1.0.1380",
+  "version": "1.0.1381",
   "lockfileVersion": 3,
   "lockfileVersion": 3,
   "requires": true,
   "requires": true,
   "packages": {
   "packages": {
     "": {
     "": {
       "name": "cfc-web",
       "name": "cfc-web",
-      "version": "1.0.1380",
+      "version": "1.0.1381",
       "dependencies": {
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",
         "@wangeditor/editor-for-vue": "^1.0.2",

+ 1 - 1
cfc-web/package.json

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

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

@@ -4,6 +4,21 @@
 
 
 ---
 ---
 
 
+## v1.0.1382 (2026-09-12)
+
+### 新功能
+- BASIC体验会员 (9.9元/月) 核心实现
+
+### 其他
+- - 后端: BasicQuotaService/ActivationQuotaService + 4业务入口配额扣减
+- - 定时任务: BasicQuotaScheduledTasks(月度刷新+到期提醒)
+- - Controller: BasicQuotaController + AdminBasicQuotaController
+- - 前端: QuotaProgressBar/UpgradeGuideModal组件 + 会员页/升级页BASIC支持
+- - AI对话页集成配额显示和软引导
+- 
+- plan: BASIC体验会员实施计划(9.9元/月)
+
+
 ## v1.0.1381 (2026-09-12)
 ## v1.0.1381 (2026-09-12)
 
 
 ### Bug 修复
 ### Bug 修复

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

@@ -1,6 +1,6 @@
 # 更新日志
 # 更新日志
 
 
-> 当前版本: v1.0.1381
+> 当前版本: v1.0.1382
 
 
 ## 历史版本
 ## 历史版本
 
 
@@ -8,6 +8,21 @@
 
 
 ---
 ---
 
 
+## v1.0.1382 (2026-09-12)
+
+### 新功能
+- BASIC体验会员 (9.9元/月) 核心实现
+
+### 其他
+- - 后端: BasicQuotaService/ActivationQuotaService + 4业务入口配额扣减
+- - 定时任务: BasicQuotaScheduledTasks(月度刷新+到期提醒)
+- - Controller: BasicQuotaController + AdminBasicQuotaController
+- - 前端: QuotaProgressBar/UpgradeGuideModal组件 + 会员页/升级页BASIC支持
+- - AI对话页集成配额显示和软引导
+- 
+- plan: BASIC体验会员实施计划(9.9元/月)
+
+
 ## v1.0.1381 (2026-09-12)
 ## v1.0.1381 (2026-09-12)
 
 
 ### Bug 修复
 ### Bug 修复