REVIEW 支付应用、支付订单

This commit is contained in:
shizhong 2023-06-13 12:22:27 +08:00
parent bfec37fdf1
commit 9b00e33ddb
3 changed files with 22 additions and 13 deletions

View File

@ -39,9 +39,9 @@ export const getMerchantApi = (id: number) => {
} }
// 根据商户名称搜索商户列表 // 根据商户名称搜索商户列表
export const getMerchantListByNameApi = (name: string) => { export const getMerchantListByNameApi = (name?: string) => {
return request.get({ return request.get({
url: '/pay/merchant/list-by-name?id=', url: '/pay/merchant/list-by-name',
params: { params: {
name: name name: name
} }
@ -67,6 +67,7 @@ export const deleteMerchantApi = (id: number) => {
export const exportMerchantApi = (params: MerchantExportReqVO) => { export const exportMerchantApi = (params: MerchantExportReqVO) => {
return request.download({ url: '/pay/merchant/export-excel', params }) return request.download({ url: '/pay/merchant/export-excel', params })
} }
// 支付商户状态修改 // 支付商户状态修改
export const changeMerchantStatusApi = (id: number, status: number) => { export const changeMerchantStatusApi = (id: number, status: number) => {
const data = { const data = {

View File

@ -88,6 +88,11 @@ export const getOrderApi = async (id: number) => {
return await request.get({ url: '/pay/order/get?id=' + id }) return await request.get({ url: '/pay/order/get?id=' + id })
} }
// 获得支付订单的明细
export const getOrderDetailApi = async (id: number) => {
return await request.get({ url: '/pay/order/get-detail?id=' + id })
}
// 新增支付订单 // 新增支付订单
export const createOrderApi = async (data: OrderVO) => { export const createOrderApi = async (data: OrderVO) => {
return await request.post({ url: '/pay/order/create', data }) return await request.post({ url: '/pay/order/create', data })

View File

@ -188,7 +188,13 @@
<!-- <div id="js-properties-panel" class="panel"></div> --> <!-- <div id="js-properties-panel" class="panel"></div> -->
<!-- <div class="my-process-designer__canvas" ref="bpmn-canvas"></div> --> <!-- <div class="my-process-designer__canvas" ref="bpmn-canvas"></div> -->
</div> </div>
<XModal title="预览" width="80%" height="90%" v-model="previewModelVisible" destroy-on-close> <Dialog
title="预览"
v-model="previewModelVisible"
width="80%"
:scroll="true"
max-height="600px"
>
<!-- append-to-body --> <!-- append-to-body -->
<div v-highlight> <div v-highlight>
<code class="hljs"> <code class="hljs">
@ -196,10 +202,7 @@
{{ previewResult }} {{ previewResult }}
</code> </code>
</div> </div>
<!-- <pre> </Dialog>
<code class="hljs" v-html="highlightedCode(previewType, previewResult)"></code>
</pre> -->
</XModal>
</div> </div>
</template> </template>
@ -231,7 +234,7 @@ import activitiModdleExtension from './plugins/extension-moddle/activiti'
import flowableModdleExtension from './plugins/extension-moddle/flowable' import flowableModdleExtension from './plugins/extension-moddle/flowable'
// json // json
// import xml2js from 'xml-js' // import xml2js from 'xml-js'
import xml2js from 'fast-xml-parser' // import xml2js from 'fast-xml-parser'
import { XmlNode, XmlNodeType, parseXmlString } from 'steady-xml' import { XmlNode, XmlNodeType, parseXmlString } from 'steady-xml'
// //
// import hljs from 'highlight.js/lib/highlight' // import hljs from 'highlight.js/lib/highlight'
@ -626,7 +629,7 @@ const elementsAlign = (align) => {
const previewProcessXML = () => { const previewProcessXML = () => {
console.log(bpmnModeler.saveXML, 'bpmnModeler') console.log(bpmnModeler.saveXML, 'bpmnModeler')
bpmnModeler.saveXML({ format: true }).then(({ xml }) => { bpmnModeler.saveXML({ format: true }).then(({ xml }) => {
console.log(xml, 'xml111111') // console.log(xml, 'xml111111')
previewResult.value = xml previewResult.value = xml
previewType.value = 'xml' previewType.value = 'xml'
previewModelVisible.value = true previewModelVisible.value = true
@ -634,7 +637,7 @@ const previewProcessXML = () => {
} }
const previewProcessJson = () => { const previewProcessJson = () => {
bpmnModeler.saveXML({ format: true }).then(({ xml }) => { bpmnModeler.saveXML({ format: true }).then(({ xml }) => {
console.log(xml, 'xml') // console.log(xml, 'xml')
// const rootNode = parseXmlString(xml) // const rootNode = parseXmlString(xml)
// console.log(rootNode, 'rootNoderootNode') // console.log(rootNode, 'rootNoderootNode')
@ -644,9 +647,9 @@ const previewProcessJson = () => {
// console.log(JSON.stringify(rootNodes.parent.toJsObject()), 'rootNodes.toJSON()') // console.log(JSON.stringify(rootNodes.parent.toJsObject()), 'rootNodes.toJSON()')
// console.log(JSON.stringify(rootNodes.parent.toJSON()), 'rootNodes.toJSON()') // console.log(JSON.stringify(rootNodes.parent.toJSON()), 'rootNodes.toJSON()')
const parser = new xml2js.XMLParser() // const parser = new xml2js.XMLParser()
let jObj = parser.parse(xml) // let jObj = parser.parse(xml)
console.log(jObj, 'jObjjObjjObjjObjjObj') // console.log(jObj, 'jObjjObjjObjjObjjObj')
// const builder = new xml2js.XMLBuilder(xml) // const builder = new xml2js.XMLBuilder(xml)
// const xmlContent = builder // const xmlContent = builder
// console.log(xmlContent, 'xmlContent') // console.log(xmlContent, 'xmlContent')