From 7585c4d59b3c342d168a902325538fe033970889 Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Sun, 8 Sep 2024 09:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=88=97=E8=A1=A8=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 24 ++++++++++++++++---
 .../market/controller/AliPayController.java   |  3 ++-
 .../market/controller/MyApiController.java    | 11 +++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb4f64e..082d945 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="72651396-d9d2-4022-b080-e21d75d1bedb" name="更改" comment="企业列表出来了">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/controller/AliPayController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/controller/AliPayController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/cloud-system/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-system/error.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/cloud-system/info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-system/info.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -95,9 +97,10 @@
       <recent name="E:\桌面\cloud-modules-market\cloud-market-server\src\main\java\com\muyu" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.muyu.market.controller" />
       <recent name="com.muyu.market.config" />
-      <recent name="com.muyu.market" />
       <recent name="com.muyu.market.domain" />
+      <recent name="com.muyu.market" />
       <recent name="com.muyu" />
     </key>
   </component>
@@ -182,6 +185,7 @@
       <workItem from="1725605672086" duration="3347000" />
       <workItem from="1725621072988" duration="7858000" />
       <workItem from="1725671427915" duration="175000" />
+      <workItem from="1725706338514" duration="6144000" />
     </task>
     <task id="LOCAL-00001" summary="初始化">
       <created>1724047244829</created>
@@ -512,7 +516,21 @@
       <option name="project" value="LOCAL" />
       <updated>1725626544998</updated>
     </task>
-    <option name="localTasksCounter" value="48" />
+    <task id="LOCAL-00048" summary="企业列表出来了">
+      <created>1725709119803</created>
+      <option name="number" value="00048" />
+      <option name="presentableId" value="LOCAL-00048" />
+      <option name="project" value="LOCAL" />
+      <updated>1725709119803</updated>
+    </task>
+    <task id="LOCAL-00049" summary="企业列表出来了">
+      <created>1725711863337</created>
+      <option name="number" value="00049" />
+      <option name="presentableId" value="LOCAL-00049" />
+      <option name="project" value="LOCAL" />
+      <updated>1725711863337</updated>
+    </task>
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/cloud-market-server/src/main/java/com/muyu/market/controller/AliPayController.java b/cloud-market-server/src/main/java/com/muyu/market/controller/AliPayController.java
index 8bedea0..309afad 100644
--- a/cloud-market-server/src/main/java/com/muyu/market/controller/AliPayController.java
+++ b/cloud-market-server/src/main/java/com/muyu/market/controller/AliPayController.java
@@ -60,12 +60,13 @@ public class AliPayController {
 
         }
         httpResponse.setContentType("text/html;charset=" + CHARSET);
+        System.out.println(form);
         // 直接将完整的表单html输出到页面
         httpResponse.getWriter().write(form);
         httpResponse.getWriter().flush();
         httpResponse.getWriter().close();
 
-        return Result.success(form);
+        return Result.success(aliPay);
     }
 
     @PostMapping("/notify")  // 注意这里必须是POST接口
diff --git a/cloud-market-server/src/main/java/com/muyu/market/controller/MyApiController.java b/cloud-market-server/src/main/java/com/muyu/market/controller/MyApiController.java
index 20f60f4..bd5c428 100644
--- a/cloud-market-server/src/main/java/com/muyu/market/controller/MyApiController.java
+++ b/cloud-market-server/src/main/java/com/muyu/market/controller/MyApiController.java
@@ -119,4 +119,15 @@ public class MyApiController extends BaseController
         myApiService.removeBatchByIds(Arrays.asList(myIds));
         return success();
     }
+
+
+
+    @PostMapping("/addOrUpd")
+    public Result<Integer> addOrUpd(@Validated @RequestBody MyApi myApi)
+    {
+        if (myApiService.checkIdUnique(myApi)) {
+            return toAjax(myApiService.updateById(myApi));
+        }
+        return toAjax(myApiService.save(myApi));
+    }
 }