From da3498ab70b7152be032a85eaa08392b0805c06c Mon Sep 17 00:00:00 2001
From: xiaogang <825201136@qq.com>
Date: Tue, 27 Aug 2024 11:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E4=BA=8B=E4=BB=B6=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=8E=A5=E5=8F=A3=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/api.js                        |  5 +++++
 src/pages/distributor/merchant/index.jsx | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/assets/api.js b/src/assets/api.js
index d740854c..f86c05a0 100644
--- a/src/assets/api.js
+++ b/src/assets/api.js
@@ -959,6 +959,11 @@ export const deleteOrderDownload = (data) => {
   return req("get", baseurl + `/order/export/delete`, data)
 }
 
+// 查询营销事件
+export const querySubscribe = (data) => {
+  return req("get", baseurl + `/plan/marketEvent`, data)
+}
+
 // //订单下载列表-数据下载
 // export const exportDownload = (md5) => {
 //   return derive("get", download_url + `/export/excel/marketOrder/download/${md5}`)
diff --git a/src/pages/distributor/merchant/index.jsx b/src/pages/distributor/merchant/index.jsx
index e6c3aa4c..aa14b993 100644
--- a/src/pages/distributor/merchant/index.jsx
+++ b/src/pages/distributor/merchant/index.jsx
@@ -1,4 +1,4 @@
-import { generateRsaKey, setResellMerchant, getApiMode } from "@/assets/api"
+import { generateRsaKey, setResellMerchant, getApiMode,querySubscribe } from "@/assets/api"
 import FormItem from "@/components/form-item/main"
 import Form from "@/components/form/main"
 import Ipt from "@/components/input/main"
@@ -21,9 +21,10 @@ export default function Merchant() {
     merchant_public_key: "", //商户公钥 *
     secret_key: "", //api mode 为1时不传 为2时必传* 偏移量
     notify_url: "", //事件通知地址 *
-    subscribe_event: [], //事件类型 数组
     status: 1, //状态 1正常 2禁用 *
-    api_mode: 2 //对接类型 1-RSA+标准接口返回 【默认】2-兴业银行模式 *
+    api_mode: 2, //对接类型 1-RSA+标准接口返回 【默认】2-兴业银行模式 *
+    subscribe_event: [], //事件类型 数组
+    marketEvent:[]
   })
   const fromRef = useRef()
   const rules = {
@@ -51,6 +52,9 @@ export default function Merchant() {
     getApiMode().then(({ data }) => {
       setState({ apiMode: data, reseller_id: id, ...merchant })
     })
+    querySubscribe().then(({data}) => {
+      setState({ marketEvent:data })
+    })
   }, [])
 
   /* 获取密钥 */
@@ -258,8 +262,13 @@ export default function Merchant() {
                   })
                 }
               >
-                <Checkbox value={"KEY.USED"}>key码核销通知</Checkbox>
-                <Checkbox value={"VOUCHER.USED"}>立减金核销通知</Checkbox>
+                {
+                  state.marketEvent?.map((item) => (
+                    <Checkbox value={item.event}>{item.name}</Checkbox>
+                  ))
+                }
+                {/* <Checkbox value={"KEY.USED"}>key码核销通知</Checkbox>
+                <Checkbox value={"VOUCHER.USED"}>立减金核销通知</Checkbox> */}
               </Checkbox.Group>
             </FormItem>
           </Form>