订单对接

src/pages/sellManage/common/confirmMixin.js

@@ -66,7 +66,7 @@ export default {
       return this.$localStore.get('scenicName') || this.$store.state.user.scenicName
     },
     maxNum () {
-      return this.$store.state.app.systemConfig.find(i => i.config_key === 'ticket_checkNum_limit').config_value
+      return this.$store.state.app.systemConfig?.find(i => i.config_key === 'ticket_checkNum_limit').config_value
     }
   },
   data () {
@@ -267,9 +267,9 @@ export default {
             this.$message.warning(res.msg)
             return
           }
-          this.$log.warn(`下单成功,订单号ID：${res?.data}`)
+          this.$log.warn(`下单成功,订单号ID：${res.data.order}`)
           this.createOrderStatus = 1
-          this.orderTempInfo = res
+          this.orderTempInfo = res.data.order
           handlePay(this.params, res, this, () => { })
           if (this.payStatus !== 1) {
             this.getSingleOrder(res, params)

src/pages/sellManage/common/handlePay.js

@@ -17,6 +17,7 @@ export function getPayType (payChannel) {
 }
 
 export default (params, res, vue, callback) => {
+  debugger
   const logData = JSON.parse(JSON.stringify(params))
 
   try {
@@ -51,18 +52,18 @@ export default (params, res, vue, callback) => {
 
           try {
             if (isJSON(data)) {
-              params.boc_pos_id = JSON.parse(data).terminal || JSON.parse(data).terminalID
+              params.bocPosId = JSON.parse(data).terminal || JSON.parse(data).terminalID
               // 设置本地pos终端号
-              localStore.set('termId', params.boc_pos_id)
+              localStore.set('termId', params.bocPosId)
             } else {
               const terminalNo = getPayResponse(data)?.terminalNo
 
               terminalNo && localStore.set('termId', terminalNo)
-              params.boc_pos_id = localStore.get('termId')
+              params.bocPosId = localStore.get('termId')
             }
             // 更新终端号
-            if (params.boc_pos_id) {
-              store.commit('SET_TERMAINAL_NO', params.boc_pos_id)
+            if (params.bocPosId) {
+              store.commit('SET_TERMAINAL_NO', params.bocPosId)
             }
           } catch (e) {
             log.error(JSON.stringify(e))
@@ -70,9 +71,9 @@ export default (params, res, vue, callback) => {
           vue.payStatus = 1
           callback && callback(params)
           const posParams = {
-            id: res?.data,
+            id: res?.id,
             payChannel: getPosPayChannel(params.boc_trade_no),
-            posId: params.boc_pos_id,
+            posId: params.bocPosId,
             tradeInfo: params.boc_trade_no,
             type: params.memberTrade ? 'MEMBER' : 'TICKET'
           }

src/pages/sellManage/returnTickets.vue

@@ -242,7 +242,7 @@
         </el-table-column>
         <el-table-column
           width="120"
-          prop="boc_pos_id"
+          prop="bocPosId"
           label="终端号"
         >
         </el-table-column>

src/pages/sellManage/returnTickets/RefundOrder.vue

@@ -380,15 +380,15 @@ export default {
           this.$message.success('退款成功')
           if (isJSON(data)) {
             params.boc_trade_no = data
-            params.boc_pos_id = JSON.parse(data).terminal || JSON.parse(data).terminalID
+            params.bocPosId = JSON.parse(data).terminal || JSON.parse(data).terminalID
             // 设置本地pos终端号
             this.refundPOS(params)
-            this.$localStore.set('termId', params.boc_pos_id)
+            this.$localStore.set('termId', params.bocPosId)
           } else {
             params.boc_trade_no = data
-            params.boc_pos_id = getPayResponse(data).terminalNo
+            params.bocPosId = getPayResponse(data).terminalNo
             this.refundPOS(params)
-            this.$localStore.set('termId', params.boc_pos_id)
+            this.$localStore.set('termId', params.bocPosId)
           }
         }
       }).finally(() => {
@@ -400,7 +400,7 @@ export default {
       const paramsData = {
         list: params.tickets.map(i => { return { id: i.id } }),
         refund_info: params.boc_trade_no,
-        refund_pos_id: params.boc_pos_id,
+        refund_pos_id: params.bocPosId,
         type: 'TICKET'
       }
 

src/pages/sellManage/returnTickets/RefundOrderPart/index.vue

@@ -371,15 +371,15 @@ export default {
           this.$message.success('退款成功')
           if (isJSON(data)) {
             params.boc_trade_no = data
-            params.boc_pos_id = JSON.parse(data).terminal || JSON.parse(data).terminalID
+            params.bocPosId = JSON.parse(data).terminal || JSON.parse(data).terminalID
             // 设置本地pos终端号
             this.refundPOS(params)
-            this.$localStore.set('termId', params.boc_pos_id)
+            this.$localStore.set('termId', params.bocPosId)
           } else {
             params.boc_trade_no = data
-            params.boc_pos_id = getPayResponse(data).terminalNo
+            params.bocPosId = getPayResponse(data).terminalNo
             this.refundPOS(params)
-            this.$localStore.set('termId', params.boc_pos_id)
+            this.$localStore.set('termId', params.bocPosId)
           }
         }
       }).finally(() => {
@@ -391,7 +391,7 @@ export default {
       const paramsData = {
         list: params.tickets.map(i => { return { id: i.id } }),
         refund_info: params.boc_trade_no,
-        refund_pos_id: params.boc_pos_id,
+        refund_pos_id: params.bocPosId,
         type: 'TICKET'
       }
 

src/pages/sellManage/returnTickets/TicketList.vue

@@ -752,13 +752,13 @@ export default {
           // this.cancelTicket(ticket)
           if (isJSON(data)) {
             params.boc_trade_no = data
-            params.boc_pos_id = JSON.parse(data).terminal || JSON.parse(data).terminalID
+            params.bocPosId = JSON.parse(data).terminal || JSON.parse(data).terminalID
             // 设置本地pos终端号
             this.refundPOS(params)
             this.$localStore.set('termId', JSON.parse(data).terminal)
           } else {
             params.boc_trade_no = data
-            params.boc_pos_id = getPayResponse(data).terminalNo
+            params.bocPosId = getPayResponse(data).terminalNo
             this.refundPOS(params)
             this.$localStore.set('termId', JSON.parse(data).terminal)
           }
@@ -772,7 +772,7 @@ export default {
       refundPOS({
         list: params.tickets.map(i => { return { id: i.id } }),
         refund_info: params.boc_trade_no,
-        refund_pos_id: params.boc_pos_id,
+        refund_pos_id: params.bocPosId,
         type: 'TICKET'
       }).then(res => {
         this.$emit('updateList')

src/pages/sellManage/returnTickets/TicketListPart/index.vue

@@ -706,13 +706,13 @@ export default {
           // this.cancelTicket(ticket)
           if (isJSON(data)) {
             params.boc_trade_no = data
-            params.boc_pos_id = JSON.parse(data).terminal || JSON.parse(data).terminalID
+            params.bocPosId = JSON.parse(data).terminal || JSON.parse(data).terminalID
             // 设置本地pos终端号
             this.refundPOS(params)
             this.$localStore.set('termId', JSON.parse(data).terminal)
           } else {
             params.boc_trade_no = data
-            params.boc_pos_id = getPayResponse(data).terminalNo
+            params.bocPosId = getPayResponse(data).terminalNo
             this.refundPOS(params)
             this.$localStore.set('termId', JSON.parse(data).terminal)
           }
@@ -726,7 +726,7 @@ export default {
       refundPOS({
         list: params.tickets.map(i => { return { id: i.id } }),
         refund_info: params.boc_trade_no,
-        refund_pos_id: params.boc_pos_id,
+        refund_pos_id: params.bocPosId,
         type: 'TICKET'
       }).then(res => {
         this.$emit('updateList')