From ed7b9d8bb67f1ce832fac8ecf8b02bee8c7b3fff Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 5 May 2022 09:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E4=B8=8B=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=20API=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/controller/WxMaterialController.java   | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java
index 1d63352f3..68e56aaf3 100644
--- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java
+++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java
@@ -11,8 +11,12 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpDraftService;
 import me.chanjar.weixin.mp.api.WxMpMaterialService;
 import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.draft.WxMpAddDraft;
+import me.chanjar.weixin.mp.bean.draft.WxMpDraftArticles;
+import me.chanjar.weixin.mp.bean.draft.WxMpUpdateDraft;
 import me.chanjar.weixin.mp.bean.material.*;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -95,15 +99,14 @@ public class WxMaterialController {
 	public R materialNewsUpload(@RequestBody JSONObject data) {
 		try {
 			JSONArray jSONArray = data.getJSONArray("articles");
-			List<WxMpNewsArticle> articles = jSONArray.toList(WxMpNewsArticle.class);
-			WxMpMaterialNews news = new WxMpMaterialNews();
-			news.setArticles(articles);
+			List<WxMpDraftArticles> articles = jSONArray.toList(WxMpDraftArticles.class);
 
+			WxMpAddDraft draft = new WxMpAddDraft();
+			draft.setArticles(articles);
 			String appId = data.getStr("appId");
 			WxMpService wxMpService = WxMpInitConfigRunner.getMpServices().get(appId);
-			WxMpMaterialService wxMpMaterialService = wxMpService.getMaterialService();
-			WxMpMaterialUploadResult wxMpMaterialUploadResult = wxMpMaterialService.materialNewsUpload(news);
-			return R.ok(wxMpMaterialUploadResult);
+			WxMpDraftService draftService = wxMpService.getDraftService();
+			return R.ok(draftService.addDraft(draft));
 		}
 		catch (WxErrorException e) {
 			log.warn("新增图文失败: {}", e.getMessage());
@@ -126,17 +129,18 @@ public class WxMaterialController {
 		try {
 			String mediaId = data.getStr("mediaId");
 			JSONArray jSONArray = data.getJSONArray("articles");
-			List<WxMpNewsArticle> articles = jSONArray.toList(WxMpNewsArticle.class);
+			List<WxMpDraftArticles> articles = jSONArray.toList(WxMpDraftArticles.class);
 			String appId = data.getStr("appId");
 			WxMpService wxMpService = WxMpInitConfigRunner.getMpServices().get(appId);
-			WxMpMaterialService wxMpMaterialService = wxMpService.getMaterialService();
-			WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate = new WxMpMaterialArticleUpdate();
-			wxMpMaterialArticleUpdate.setMediaId(mediaId);
+			WxMpDraftService draftService = wxMpService.getDraftService();
+
+			WxMpUpdateDraft mpUpdateDraft = new WxMpUpdateDraft();
+			mpUpdateDraft.setMediaId(mediaId);
 			int index = 0;
-			for (WxMpNewsArticle article : articles) {
-				wxMpMaterialArticleUpdate.setIndex(index);
-				wxMpMaterialArticleUpdate.setArticles(article);
-				wxMpMaterialService.materialNewsUpdate(wxMpMaterialArticleUpdate);
+			for (WxMpDraftArticles article : articles) {
+				mpUpdateDraft.setIndex(index);
+				mpUpdateDraft.setArticles(article);
+				draftService.updateDraft(mpUpdateDraft);
 				index++;
 			}
 			return R.ok();