changelog: 334bcdc - feat: 产品状态和审核状态分离，上下架都走企微审批

.swagger/dict_data.json

@@ -3663,6 +3663,49 @@
       }
     ]
   },
+  "product_approval_status": {
+    "name": "\u4ea7\u54c1\u5ba1\u6838\u72b6\u6001",
+    "category": "BUSINESS",
+    "remark": "",
+    "items": [
+      {
+        "value": "NONE",
+        "label": "\u65e0\u5ba1\u6838",
+        "sort": 0,
+        "status": "ACTIVE"
+      },
+      {
+        "value": "PENDING",
+        "label": "\u5ba1\u6838\u4e2d",
+        "sort": 1,
+        "status": "ACTIVE"
+      },
+      {
+        "value": "PUBLISH_APPROVED",
+        "label": "\u4e0a\u67b6\u901a\u8fc7",
+        "sort": 2,
+        "status": "ACTIVE"
+      },
+      {
+        "value": "PUBLISH_REJECTED",
+        "label": "\u4e0a\u67b6\u9a73\u56de",
+        "sort": 3,
+        "status": "ACTIVE"
+      },
+      {
+        "value": "UNPUBLISH_APPROVED",
+        "label": "\u4e0b\u67b6\u901a\u8fc7",
+        "sort": 4,
+        "status": "ACTIVE"
+      },
+      {
+        "value": "UNPUBLISH_REJECTED",
+        "label": "\u4e0b\u67b6\u9a73\u56de",
+        "sort": 5,
+        "status": "ACTIVE"
+      }
+    ]
+  },
   "product_category": {
     "name": "\u4ea7\u54c1\u5206\u7c7b",
     "category": "BUSINESS",
@@ -4356,14 +4399,14 @@
         "status": "ACTIVE"
       },
       {
-        "value": "KING",
+        "value": "DELUXE",
-        "label": "\u8c6a\u534e\u5927\u5e8a",
+        "label": "\u8c6a\u534e\u623f",
         "sort": 5,
         "status": "ACTIVE"
       },
       {
-        "value": "DELUXE",
+        "value": "KING",
-        "label": "\u8c6a\u534e\u623f",
+        "label": "\u8c6a\u534e\u5927\u5e8a",
         "sort": 5,
         "status": "ACTIVE"
       },
@@ -4404,18 +4447,6 @@
     "category": "BUSINESS",
     "remark": "Room-level facilities",
     "items": [
-      {
-        "value": "slippers",
-        "label": "\u62d6\u978b",
-        "sort": 1,
-        "status": "ACTIVE"
-      },
-      {
-        "value": "wardrobe",
-        "label": "\u8863\u67dc/\u8863\u67b6",
-        "sort": 1,
-        "status": "ACTIVE"
-      },
       {
         "value": "baby_bed",
         "label": "\u5a74\u513f\u5e8a",
@@ -4441,15 +4472,15 @@
         "status": "ACTIVE"
       },
       {
-        "value": "air_cond",
+        "value": "slippers",
-        "label": "\u7a7a\u8c03",
+        "label": "\u62d6\u978b",
-        "sort": 2,
+        "sort": 1,
         "status": "ACTIVE"
       },
       {
-        "value": "shower",
+        "value": "wardrobe",
-        "label": "\u72ec\u7acb\u6dcb\u6d74\u82b1\u6d12",
+        "label": "\u8863\u67dc/\u8863\u67b6",
-        "sort": 2,
+        "sort": 1,
         "status": "ACTIVE"
       },
       {
@@ -4477,9 +4508,15 @@
         "status": "ACTIVE"
       },
       {
-        "value": "free_water",
+        "value": "air_cond",
-        "label": "\u514d\u8d39\u74f6\u88c5\u6c34",
+        "label": "\u7a7a\u8c03",
-        "sort": 3,
+        "sort": 2,
+        "status": "ACTIVE"
+      },
+      {
+        "value": "shower",
+        "label": "\u72ec\u7acb\u6dcb\u6d74\u82b1\u6d12",
+        "sort": 2,
         "status": "ACTIVE"
       },
       {
@@ -4513,15 +4550,9 @@
         "status": "ACTIVE"
       },
       {
-        "value": "minibar",
+        "value": "free_water",
-        "label": "\u8ff7\u4f60\u5427",
+        "label": "\u514d\u8d39\u74f6\u88c5\u6c34",
-        "sort": 4,
+        "sort": 3,
-        "status": "ACTIVE"
-      },
-      {
-        "value": "hairdryer",
-        "label": "\u5439\u98ce\u673a",
-        "sort": 4,
         "status": "ACTIVE"
       },
       {
@@ -4549,9 +4580,15 @@
         "status": "ACTIVE"
       },
       {
-        "value": "usb_port",
+        "value": "minibar",
-        "label": "USB\u5145\u7535\u53e3",
+        "label": "\u8ff7\u4f60\u5427",
-        "sort": 5,
+        "sort": 4,
+        "status": "ACTIVE"
+      },
+      {
+        "value": "hairdryer",
+        "label": "\u5439\u98ce\u673a",
+        "sort": 4,
         "status": "ACTIVE"
       },
       {
@@ -4579,9 +4616,9 @@
         "status": "ACTIVE"
       },
       {
-        "value": "bt_speaker",
+        "value": "usb_port",
-        "label": "\u84dd\u7259\u97f3\u7bb1",
+        "label": "USB\u5145\u7535\u53e3",
-        "sort": 6,
+        "sort": 5,
         "status": "ACTIVE"
       },
       {
@@ -4609,9 +4646,9 @@
         "status": "ACTIVE"
       },
       {
-        "value": "mirror",
+        "value": "bt_speaker",
-        "label": "\u5168\u8eab\u955c",
+        "label": "\u84dd\u7259\u97f3\u7bb1",
-        "sort": 7,
+        "sort": 6,
         "status": "ACTIVE"
       },
       {
@@ -4633,9 +4670,9 @@
         "status": "ACTIVE"
       },
       {
-        "value": "air_purifier",
+        "value": "mirror",
-        "label": "\u7a7a\u6c14\u51c0\u5316\u5668",
+        "label": "\u5168\u8eab\u955c",
-        "sort": 8,
+        "sort": 7,
         "status": "ACTIVE"
       },
       {
@@ -4657,9 +4694,9 @@
         "status": "ACTIVE"
       },
       {
-        "value": "body_wash",
+        "value": "air_purifier",
-        "label": "\u6c90\u6d74\u9732",
+        "label": "\u7a7a\u6c14\u51c0\u5316\u5668",
-        "sort": 9,
+        "sort": 8,
         "status": "ACTIVE"
       },
       {
@@ -4667,6 +4704,12 @@
         "label": "\u624b\u673a\u6295\u5c4f",
         "sort": 9,
         "status": "ACTIVE"
+      },
+      {
+        "value": "body_wash",
+        "label": "\u6c90\u6d74\u9732",
+        "sort": 9,
+        "status": "ACTIVE"
       }
     ]
   },

changelogs/2026-03/2026-03-27_1657_334bcdc_feat.md

@@ -0,0 +1,34 @@
+# 接口变更记录 — 2026-03-27 16:57
+
+> **提交** `334bcdc` · **作者** wx · **时间** 2026-03-27 16:57:30 +0800
+>
+> feat: 产品状态和审核状态分离，上下架都走企微审批
+
+## 📦 其他数据对象变更
+
+> 以下变更未直接关联到本次接口变更，但可能影响现有接口的请求/响应
+
+### 产品服务
+
+#### ✏️ ProductListVO
+
+  - 🆕 `approvalStatus` (`String`) — 审核状态：NONE/PENDING/PUBLISH_APPROVED/PUBLISH_REJECTED/UNPUBLISH_APPROVED/UNPUBLISH_REJECTED
+  - ✏️ `status`: 说明 "产品状态：DRAFT/PENDING_REVIEW/REVIEWED/REJECTED/PUBLISHED/UNPUBLISHED/COMPLETED" → "产品状态：DRAFT=草稿/PUBLISHED=上架/UNPUBLISHED=下架"
+
+#### ✏️ ProductVO
+
+  - 🆕 `approvalStatus` (`String`) — 审核状态：NONE/PENDING/PUBLISH_APPROVED/PUBLISH_REJECTED/UNPUBLISH_APPROVED/UNPUBLISH_REJECTED
+  - ✏️ `status`: 说明 "产品状态：DRAFT/PENDING_REVIEW/REVIEWED/REJECTED/PUBLISHED/UNPUBLISHED/COMPLETED" → "产品状态：DRAFT=草稿/PUBLISHED=上架/UNPUBLISHED=下架"
+
+<details>
+<summary>📁 全部变更文件 (点击展开)</summary>
+
+```
+M	hl-product-service/src/main/java/com/hulalv/product/constant/ProductConstants.java
+M	hl-product-service/src/main/java/com/hulalv/product/entity/Product.java
+M	hl-product-service/src/main/java/com/hulalv/product/service/ProductService.java
+M	hl-product-service/src/main/java/com/hulalv/product/service/ProductStatusService.java
+M	hl-product-service/src/main/java/com/hulalv/product/vo/ProductListVO.java
+M	hl-product-service/src/main/java/com/hulalv/product/vo/ProductVO.java
+```
+</details>