From 564bd43692bf980aaf65314f44d3e6c0b9590579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Tue, 19 Aug 2025 01:39:18 +0800
Subject: [PATCH] 1

---
 .../web/controller/erp/ProductController.java | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/erp/ProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/erp/ProductController.java
index f58fb0b..aac3fac 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/erp/ProductController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/erp/ProductController.java
@@ -15,6 +15,7 @@ import com.ruoyi.erp.request.ProductCreateRequest;
 import com.ruoyi.erp.request.ProductCategoryListQueryRequest;
 import com.ruoyi.erp.request.ProductPropertyListQueryRequest;
 import com.ruoyi.erp.request.AuthorizeListQueryRequest;
+import com.ruoyi.erp.request.ProductPublishRequest;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -135,6 +136,25 @@ public class ProductController extends BaseController {
         }
     }
 
+    /**
+     * 上架商品
+     */
+    @PostMapping("/publish")
+    public R<?> publish(@RequestBody @Validated PublishRequest req) {
+        try {
+            ERPAccount account = resolveAccount(req.getAppid());
+            ProductPublishRequest publishRequest = new ProductPublishRequest(account);
+            publishRequest.setProductId(req.getProductId());
+            publishRequest.setUserName(req.getUserName());
+            publishRequest.setSpecifyPublishTime(req.getSpecifyPublishTime());
+            String resp = publishRequest.getResponseBody();
+            com.alibaba.fastjson2.JSONObject jo = com.alibaba.fastjson2.JSONObject.parseObject(resp);
+            return R.ok(jo);
+        } catch (Exception e) {
+            return R.fail("上架失败: " + e.getMessage());
+        }
+    }
+
     /**
      * 获取类目下拉
      */
@@ -503,6 +523,27 @@ public class ProductController extends BaseController {
         public String getAppid() { return appid; }
         public void setAppid(String appid) { this.appid = appid; }
     }
+
+    /**
+     * 上架请求体
+     */
+    public static class PublishRequest {
+        @NotNull
+        private Long productId;
+        @NotBlank
+        private String userName;
+        private String specifyPublishTime;
+        private String appid;
+
+        public Long getProductId() { return productId; }
+        public void setProductId(Long productId) { this.productId = productId; }
+        public String getUserName() { return userName; }
+        public void setUserName(String userName) { this.userName = userName; }
+        public String getSpecifyPublishTime() { return specifyPublishTime; }
+        public void setSpecifyPublishTime(String specifyPublishTime) { this.specifyPublishTime = specifyPublishTime; }
+        public String getAppid() { return appid; }
+        public void setAppid(String appid) { this.appid = appid; }
+    }
 }