xyvcard-settle 0.0.23 → 0.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{history-B8rLL6cg.mjs → history-C3l8NaI6.mjs} +1 -1
- package/dist/{history-GWPuNly4.mjs → history-DQ0J8NCy.mjs} +1 -1
- package/dist/{history.vue_vue_type_script_setup_true_lang-CbfsFzBk.mjs → history.vue_vue_type_script_setup_true_lang-B8FBizdu.mjs} +17 -18
- package/dist/{history.vue_vue_type_script_setup_true_lang-Bu1bLQpr.mjs → history.vue_vue_type_script_setup_true_lang-DB8PERVD.mjs} +33 -33
- package/dist/index--l5ns2E2.mjs +690 -0
- package/dist/{index-C3Kdmtt0.mjs → index-B1h4IWy4.mjs} +2 -2
- package/dist/{index-CEE_6GTV.mjs → index-BwZZ71lS.mjs} +118 -104
- package/dist/{index-Cb7J-gqJ.mjs → index-C9xiSbGi.mjs} +117 -100
- package/dist/{index-by_iuKQb.mjs → index-D0mKdcOp.mjs} +2 -2
- package/dist/index-DXSCg5PP.mjs +102 -0
- package/dist/{index-CGm_qU0S.mjs → index-DsYV-De4.mjs} +165 -140
- package/dist/{index-Cd659aKC.mjs → index-Gj815brY.mjs} +145 -144
- package/dist/index.mjs +69 -65
- package/dist/style.css +1 -0
- package/dist/{today-BYQ_Njq5.mjs → today-DK4xzzKV.mjs} +1 -1
- package/dist/{today-CGeC5FRK.mjs → today-DX1djaLC.mjs} +1 -1
- package/dist/{today.vue_vue_type_script_setup_true_lang-DQ0U1jh1.mjs → today.vue_vue_type_script_setup_true_lang-BBSo18Bt.mjs} +71 -81
- package/dist/{today.vue_vue_type_script_setup_true_lang-DI-SW_RJ.mjs → today.vue_vue_type_script_setup_true_lang-C7uvcmd6.mjs} +10 -10
- package/dts/src/api/settle/index.d.ts +1 -0
- package/dts/src/api/settle/pay-trade/types.d.ts +1 -0
- package/dts/src/api/settle/pay-trade-personal/types.d.ts +1 -0
- package/dts/src/api/settle/settle-trade-analysis/types.d.ts +1 -0
- package/dts/src/api/settle/settle-trade-merchant/types.d.ts +3 -0
- package/dts/src/api/settle/settle-trade-merchant-personal/types.d.ts +2 -0
- package/dts/src/constant.d.ts +1 -0
- package/dts/src/lang/settle/en.d.ts +0 -89
- package/dts/src/lang/settle/zh-cn.d.ts +6 -0
- package/package.json +61 -61
- package/dist/index-NM7NGo1Y.mjs +0 -534
- package/dist/index-q_VWJKNr.mjs +0 -99
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { defineComponent as
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import { channelApi as
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
1
|
+
import { defineComponent as G, getCurrentInstance as X, ref as h, resolveComponent as s, createElementBlock as S, openBlock as y, createVNode as n, withCtx as a, withKeys as V, unref as l, Fragment as Z, renderList as ee, createBlock as k, createTextVNode as c, toDisplayString as p, createSlots as te, createCommentVNode as ae, isRef as M } from "vue";
|
|
2
|
+
import { useI18n as ne } from "vue-i18n";
|
|
3
|
+
import { useRoute as le } from "vue-router";
|
|
4
|
+
import { useUserStore as v, clearEmpty as oe, request as re, useTableHooks as se } from "jmash-core";
|
|
5
|
+
import { channelApi as ue } from "xyvcard-merchant";
|
|
6
|
+
import { D as d } from "./index-DXSCg5PP.mjs";
|
|
7
|
+
import { tokenExt as de } from "xyvcard-agent";
|
|
8
8
|
class ie {
|
|
9
9
|
getKey(i) {
|
|
10
10
|
return {
|
|
@@ -14,20 +14,20 @@ class ie {
|
|
|
14
14
|
// 查询翻页信息划款信息查询-今日到账
|
|
15
15
|
findPage(i) {
|
|
16
16
|
const I = v().user.tenant;
|
|
17
|
-
return
|
|
17
|
+
return oe(i), re({
|
|
18
18
|
url: "/v1/settle/receipt/today/" + I,
|
|
19
19
|
method: "get",
|
|
20
20
|
params: i
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */
|
|
24
|
+
const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ G({
|
|
25
25
|
__name: "today",
|
|
26
|
-
setup(
|
|
27
|
-
const { t: i } =
|
|
26
|
+
setup(z) {
|
|
27
|
+
const { t: i } = ne(), A = le().query.tenant;
|
|
28
28
|
d.instsBizDict.useValues(), d.merchantBizDict.useValues(), d.agentBizDict.useValues();
|
|
29
|
-
const { proxy:
|
|
30
|
-
tokenExt:
|
|
29
|
+
const { proxy: N } = X(), C = h([]), T = h(""), o = h({
|
|
30
|
+
tokenExt: de.getTokenExt(v().user.tenant),
|
|
31
31
|
channelId: T.value
|
|
32
32
|
}), $ = h(
|
|
33
33
|
JSON.parse(
|
|
@@ -35,8 +35,8 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
35
35
|
)
|
|
36
36
|
);
|
|
37
37
|
function B() {
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
o.value.channelId = "", ue.findList({ merchantId: o.value.merchantId }).then((r) => {
|
|
39
|
+
C.value = r.data.results, T.value = r.data.results.map((t) => t.channelId);
|
|
40
40
|
});
|
|
41
41
|
}
|
|
42
42
|
const {
|
|
@@ -46,7 +46,7 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
46
46
|
listLoading: x,
|
|
47
47
|
tableData: R,
|
|
48
48
|
total: b
|
|
49
|
-
} =
|
|
49
|
+
} = se(i, me, o);
|
|
50
50
|
let f = h([
|
|
51
51
|
// 序号
|
|
52
52
|
{
|
|
@@ -59,18 +59,8 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
59
59
|
{
|
|
60
60
|
label: "settleTradeReceipt.merchantName",
|
|
61
61
|
prop: "merchantName",
|
|
62
|
-
width: "200",
|
|
63
62
|
sortable: "custom",
|
|
64
|
-
|
|
65
|
-
},
|
|
66
|
-
// 渠道
|
|
67
|
-
{
|
|
68
|
-
label: "settleTradeReceipt.channelId",
|
|
69
|
-
prop: "instsId",
|
|
70
|
-
sortable: "custom",
|
|
71
|
-
slotName: "instsId",
|
|
72
|
-
columnType: "slot",
|
|
73
|
-
width: "150",
|
|
63
|
+
minWidth: "200",
|
|
74
64
|
isColumn: !0
|
|
75
65
|
},
|
|
76
66
|
// 连锁号
|
|
@@ -135,42 +125,42 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
135
125
|
}
|
|
136
126
|
]);
|
|
137
127
|
function L() {
|
|
138
|
-
|
|
128
|
+
o.value.merchantId = "", o.value.channelId = "", R.value = [];
|
|
139
129
|
}
|
|
140
|
-
function P(
|
|
141
|
-
u.selectionRows.value =
|
|
130
|
+
function P(r) {
|
|
131
|
+
u.selectionRows.value = r;
|
|
142
132
|
}
|
|
143
|
-
function E(
|
|
144
|
-
u.handleSort(
|
|
133
|
+
function E(r) {
|
|
134
|
+
u.handleSort(r.prop, r.order);
|
|
145
135
|
}
|
|
146
136
|
function Q() {
|
|
147
137
|
u.handleQuery(), u.getList();
|
|
148
138
|
}
|
|
149
|
-
return (
|
|
150
|
-
const q =
|
|
139
|
+
return (r, t) => {
|
|
140
|
+
const q = s("jmash-select"), _ = s("el-form-item"), g = s("el-col"), H = s("el-option"), K = s("el-select"), w = s("el-button"), D = s("el-row"), Y = s("el-form"), F = s("jmash-column-select"), J = s("jmash-table"), O = s("jmash-pagination"), W = s("el-card");
|
|
151
141
|
return y(), S("div", ce, [
|
|
152
|
-
|
|
142
|
+
n(Y, {
|
|
153
143
|
ref_key: "queryFormRef",
|
|
154
144
|
ref: U,
|
|
155
|
-
model:
|
|
145
|
+
model: o.value,
|
|
156
146
|
inline: !0
|
|
157
147
|
}, {
|
|
158
148
|
default: a(() => [
|
|
159
|
-
|
|
149
|
+
n(D, null, {
|
|
160
150
|
default: a(() => [
|
|
161
|
-
|
|
151
|
+
n(g, { span: 6 }, {
|
|
162
152
|
default: a(() => [
|
|
163
|
-
|
|
164
|
-
label:
|
|
153
|
+
n(_, {
|
|
154
|
+
label: r.$t("payTrade.merchantId"),
|
|
165
155
|
prop: "version"
|
|
166
156
|
}, {
|
|
167
157
|
default: a(() => [
|
|
168
|
-
|
|
169
|
-
modelValue:
|
|
170
|
-
"onUpdate:modelValue": t[0] || (t[0] = (e) =>
|
|
171
|
-
placeholder:
|
|
172
|
-
data:
|
|
173
|
-
onKeyup: t[1] || (t[1] = V((e) =>
|
|
158
|
+
n(q, {
|
|
159
|
+
modelValue: o.value.merchantId,
|
|
160
|
+
"onUpdate:modelValue": t[0] || (t[0] = (e) => o.value.merchantId = e),
|
|
161
|
+
placeholder: r.$t("payTrade.merchantIdRead"),
|
|
162
|
+
data: l(d).merchantBizDict.values,
|
|
163
|
+
onKeyup: t[1] || (t[1] = V((e) => l(u).handleQuery(), ["enter"])),
|
|
174
164
|
class: "!w-[203px]",
|
|
175
165
|
filterable: "",
|
|
176
166
|
clearable: "",
|
|
@@ -182,18 +172,18 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
182
172
|
]),
|
|
183
173
|
_: 1
|
|
184
174
|
}),
|
|
185
|
-
|
|
175
|
+
n(g, { span: 6 }, {
|
|
186
176
|
default: a(() => [
|
|
187
|
-
|
|
188
|
-
label:
|
|
177
|
+
n(_, {
|
|
178
|
+
label: r.$t("settleTradeAnalysis.channelId"),
|
|
189
179
|
prop: "channelId"
|
|
190
180
|
}, {
|
|
191
181
|
default: a(() => [
|
|
192
|
-
|
|
193
|
-
modelValue:
|
|
194
|
-
"onUpdate:modelValue": t[2] || (t[2] = (e) =>
|
|
195
|
-
placeholder:
|
|
196
|
-
onKeyup: t[3] || (t[3] = V((e) =>
|
|
182
|
+
n(K, {
|
|
183
|
+
modelValue: o.value.channelId,
|
|
184
|
+
"onUpdate:modelValue": t[2] || (t[2] = (e) => o.value.channelId = e),
|
|
185
|
+
placeholder: r.$t("settleTradeAnalysis.channelIdRead"),
|
|
186
|
+
onKeyup: t[3] || (t[3] = V((e) => l(u).handleQuery(), ["enter"])),
|
|
197
187
|
class: "!w-[203px]",
|
|
198
188
|
filterable: "",
|
|
199
189
|
clearable: ""
|
|
@@ -201,7 +191,7 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
201
191
|
default: a(() => [
|
|
202
192
|
(y(!0), S(Z, null, ee(C.value, (e) => (y(), k(H, {
|
|
203
193
|
key: e.channelId,
|
|
204
|
-
label:
|
|
194
|
+
label: l(d).instsBizDict.getValue(e.instsId) || e.instsId,
|
|
205
195
|
value: e.channelId
|
|
206
196
|
}, null, 8, ["label", "value"]))), 128))
|
|
207
197
|
]),
|
|
@@ -213,24 +203,24 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
213
203
|
]),
|
|
214
204
|
_: 1
|
|
215
205
|
}),
|
|
216
|
-
|
|
206
|
+
n(g, { span: 12 }, {
|
|
217
207
|
default: a(() => [
|
|
218
|
-
|
|
208
|
+
n(_, { class: "search-btn" }, {
|
|
219
209
|
default: a(() => [
|
|
220
|
-
|
|
210
|
+
n(w, {
|
|
221
211
|
type: "primary",
|
|
222
212
|
onClick: t[4] || (t[4] = (e) => Q())
|
|
223
213
|
}, {
|
|
224
214
|
default: a(() => [
|
|
225
|
-
c(p(
|
|
215
|
+
c(p(r.$t("common.search")), 1)
|
|
226
216
|
]),
|
|
227
217
|
_: 1
|
|
228
218
|
}),
|
|
229
|
-
|
|
219
|
+
n(w, {
|
|
230
220
|
onClick: t[5] || (t[5] = (e) => L())
|
|
231
221
|
}, {
|
|
232
222
|
default: a(() => [
|
|
233
|
-
c(p(
|
|
223
|
+
c(p(r.$t("common.reset")), 1)
|
|
234
224
|
]),
|
|
235
225
|
_: 1
|
|
236
226
|
})
|
|
@@ -246,20 +236,20 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
246
236
|
]),
|
|
247
237
|
_: 1
|
|
248
238
|
}, 8, ["model"]),
|
|
249
|
-
|
|
239
|
+
n(W, {
|
|
250
240
|
shadow: "never",
|
|
251
241
|
class: "table-container"
|
|
252
242
|
}, {
|
|
253
243
|
header: a(() => [
|
|
254
|
-
|
|
244
|
+
n(D, null, {
|
|
255
245
|
default: a(() => [
|
|
256
|
-
|
|
246
|
+
n(g, {
|
|
257
247
|
span: 24,
|
|
258
248
|
class: "container-float"
|
|
259
249
|
}, {
|
|
260
250
|
default: a(() => [
|
|
261
|
-
|
|
262
|
-
modelValue:
|
|
251
|
+
n(F, {
|
|
252
|
+
modelValue: l(f),
|
|
263
253
|
"onUpdate:modelValue": t[6] || (t[6] = (e) => M(f) ? f.value = e : f = e),
|
|
264
254
|
"label-name": "settle/settle-trade-receipt"
|
|
265
255
|
}, null, 8, ["modelValue"])
|
|
@@ -271,43 +261,43 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
271
261
|
})
|
|
272
262
|
]),
|
|
273
263
|
footer: a(() => [
|
|
274
|
-
|
|
264
|
+
l(b) > 0 ? (y(), k(O, {
|
|
275
265
|
key: 0,
|
|
276
|
-
total:
|
|
266
|
+
total: l(b),
|
|
277
267
|
"onUpdate:total": t[7] || (t[7] = (e) => M(b) ? b.value = e : null),
|
|
278
|
-
"current-page":
|
|
279
|
-
"onUpdate:currentPage": t[8] || (t[8] = (e) =>
|
|
280
|
-
"page-size":
|
|
281
|
-
"onUpdate:pageSize": t[9] || (t[9] = (e) =>
|
|
282
|
-
onPagination: t[10] || (t[10] = (e) =>
|
|
268
|
+
"current-page": o.value.curPage,
|
|
269
|
+
"onUpdate:currentPage": t[8] || (t[8] = (e) => o.value.curPage = e),
|
|
270
|
+
"page-size": o.value.pageSize,
|
|
271
|
+
"onUpdate:pageSize": t[9] || (t[9] = (e) => o.value.pageSize = e),
|
|
272
|
+
onPagination: t[10] || (t[10] = (e) => l(u).getList())
|
|
283
273
|
}, null, 8, ["total", "current-page", "page-size"])) : ae("", !0)
|
|
284
274
|
]),
|
|
285
275
|
default: a(() => {
|
|
286
276
|
var e;
|
|
287
277
|
return [
|
|
288
|
-
|
|
278
|
+
n(J, {
|
|
289
279
|
ref_key: "multipleTableRef",
|
|
290
280
|
ref: j,
|
|
291
281
|
"row-key": "receiptId",
|
|
292
282
|
isSelection: !1,
|
|
293
|
-
"list-loading":
|
|
294
|
-
data:
|
|
295
|
-
"table-label":
|
|
283
|
+
"list-loading": l(x),
|
|
284
|
+
data: l(R),
|
|
285
|
+
"table-label": l(f),
|
|
296
286
|
onSelectionChange: P,
|
|
297
287
|
onSortChange: E
|
|
298
288
|
}, te({
|
|
299
289
|
transferMoneyDate: a((m) => [
|
|
300
|
-
c(p(
|
|
290
|
+
c(p(l(N).$moment.formatDate(
|
|
301
291
|
m.data.row.transferMoneyDate,
|
|
302
292
|
"YYYY-MM-DD HH:mm"
|
|
303
293
|
)), 1)
|
|
304
294
|
]),
|
|
305
295
|
instsId: a((m) => [
|
|
306
|
-
c(p(
|
|
296
|
+
c(p(l(d).instsBizDict.getValue(m.data.row.instsId)), 1)
|
|
307
297
|
]),
|
|
308
298
|
_: 2
|
|
309
299
|
}, [
|
|
310
|
-
(e =
|
|
300
|
+
(e = l(A)) != null && e.includes("@") ? {
|
|
311
301
|
name: "agentCode",
|
|
312
302
|
fn: a((m) => [
|
|
313
303
|
c(p($.value.agentAlias), 1)
|
|
@@ -316,7 +306,7 @@ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ W({
|
|
|
316
306
|
} : {
|
|
317
307
|
name: "agentCode",
|
|
318
308
|
fn: a((m) => [
|
|
319
|
-
c(p(
|
|
309
|
+
c(p(l(d).agentBizDict.getValue(m.data.row.agentCode)), 1)
|
|
320
310
|
]),
|
|
321
311
|
key: "0"
|
|
322
312
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { defineComponent as Y, getCurrentInstance as q, ref as y, resolveComponent as s, createElementBlock as R, openBlock as h, createVNode as a, withCtx as l, withKeys as w, unref as o, Fragment as J, renderList as O, createBlock as D, createTextVNode as m, toDisplayString as p, createCommentVNode as G, isRef as S } from "vue";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import { channelApi as
|
|
6
|
-
import {
|
|
2
|
+
import { useI18n as W } from "vue-i18n";
|
|
3
|
+
import { useUserStore as v, clearEmpty as X, request as Z, useTableHooks as ee } from "jmash-core";
|
|
4
|
+
import { tokenExt as te } from "xyvcard-agent";
|
|
5
|
+
import { channelApi as le } from "xyvcard-merchant";
|
|
6
|
+
import { D as c } from "./index-DXSCg5PP.mjs";
|
|
7
7
|
class ae {
|
|
8
8
|
getKey(d) {
|
|
9
9
|
return {
|
|
@@ -13,7 +13,7 @@ class ae {
|
|
|
13
13
|
// 查询翻页信息划款信息查询-今日到账
|
|
14
14
|
findPage(d) {
|
|
15
15
|
const g = v().user.tenant;
|
|
16
|
-
return
|
|
16
|
+
return X(d), Z({
|
|
17
17
|
url: "/v1/settle/receipt/today/my/" + g,
|
|
18
18
|
method: "get",
|
|
19
19
|
params: d
|
|
@@ -23,16 +23,16 @@ class ae {
|
|
|
23
23
|
const ne = new ae(), oe = { class: "app-container" }, pe = /* @__PURE__ */ Y({
|
|
24
24
|
__name: "today",
|
|
25
25
|
setup(k) {
|
|
26
|
-
const { t: d } =
|
|
26
|
+
const { t: d } = W();
|
|
27
27
|
c.instsBizDict.useValues(), c.merchantBizDict.useValues();
|
|
28
28
|
const { proxy: g } = q(), I = y([]), r = y({
|
|
29
|
-
tokenExt:
|
|
29
|
+
tokenExt: te.getTokenExt(v().user.tenant)
|
|
30
30
|
}), V = y(
|
|
31
31
|
JSON.parse(
|
|
32
32
|
sessionStorage.getItem("SelectAgent:" + v().user.tenant) || "{}"
|
|
33
33
|
)
|
|
34
34
|
);
|
|
35
|
-
|
|
35
|
+
le.myFindList({}).then((n) => {
|
|
36
36
|
I.value = n.data.results;
|
|
37
37
|
});
|
|
38
38
|
const {
|
|
@@ -42,7 +42,7 @@ const ne = new ae(), oe = { class: "app-container" }, pe = /* @__PURE__ */ Y({
|
|
|
42
42
|
listLoading: A,
|
|
43
43
|
tableData: $,
|
|
44
44
|
total: f
|
|
45
|
-
} =
|
|
45
|
+
} = ee(d, ne, r);
|
|
46
46
|
let i = y([
|
|
47
47
|
// 序号
|
|
48
48
|
{
|
|
@@ -66,6 +66,7 @@ export interface PaymentTradePage extends EntityPage {
|
|
|
66
66
|
export interface PaymentTradeModelTotal extends EntityTotal {
|
|
67
67
|
totalSize: number;
|
|
68
68
|
totalAmount?: number;
|
|
69
|
+
tradeAmount?: number;
|
|
69
70
|
paidOrder?: number;
|
|
70
71
|
paidAmount?: number;
|
|
71
72
|
discountAmount?: number;
|
|
@@ -66,6 +66,7 @@ export interface MyPaymentTradePage extends EntityPage {
|
|
|
66
66
|
export interface MyPaymentTradeModelTotal extends EntityTotal {
|
|
67
67
|
totalSize: number;
|
|
68
68
|
totalAmount?: number;
|
|
69
|
+
tradeAmount?: number;
|
|
69
70
|
paidOrder?: number;
|
|
70
71
|
paidAmount?: number;
|
|
71
72
|
discountAmount?: number;
|
|
@@ -35,6 +35,7 @@ export interface SettleTradeAnalysisModelTotal extends EntityTotal {
|
|
|
35
35
|
totalOrderAmount?: string;
|
|
36
36
|
totalFeeAmt?: string;
|
|
37
37
|
totalSettleAmount?: string;
|
|
38
|
+
totalTradeAmount?: string;
|
|
38
39
|
}
|
|
39
40
|
export interface SettleTradeAnalysisKey extends EntityKey {
|
|
40
41
|
tenant?: string;
|
|
@@ -45,6 +45,9 @@ export interface SettleTradeAnalysisModelTotal extends EntityTotal {
|
|
|
45
45
|
totalSize: number;
|
|
46
46
|
totalOrderCount?: number;
|
|
47
47
|
totalOrderAmount?: string;
|
|
48
|
+
/** 交易金额 */
|
|
49
|
+
totalTradeAmount?: string;
|
|
50
|
+
totalDiscountAmount?: string;
|
|
48
51
|
totalFeeAmt?: string;
|
|
49
52
|
totalSettleAmount?: string;
|
|
50
53
|
}
|
|
@@ -47,6 +47,8 @@ export interface MySettleTradeAnalysisModelTotal extends EntityTotal {
|
|
|
47
47
|
totalOrderAmount?: string;
|
|
48
48
|
totalFeeAmt?: string;
|
|
49
49
|
totalSettleAmount?: string;
|
|
50
|
+
totalTradeAmount?: string;
|
|
51
|
+
totalDiscountAmount?: string;
|
|
50
52
|
}
|
|
51
53
|
export interface MySettleTradeAnalysisKey extends EntityKey {
|
|
52
54
|
tenant?: string;
|
package/dts/src/constant.d.ts
CHANGED
|
@@ -4,5 +4,6 @@ export declare class Constant {
|
|
|
4
4
|
static readonly PAY_MODE = "xyvcard.payment.protobuf.PayMode";
|
|
5
5
|
static readonly TRADE_TYPE = "xyvcard.payment.protobuf.TradeType";
|
|
6
6
|
static readonly ORDER_STATUS = "xyvcard.payment.protobuf.OrderStatus";
|
|
7
|
+
static readonly TRADE_STATUS = "xyvcard.payment.protobuf.TradeStatus";
|
|
7
8
|
static readonly AGENT_AGREE = "AGENT_AGREE";
|
|
8
9
|
}
|
|
@@ -1,89 +0,0 @@
|
|
|
1
|
-
declare const _default: {
|
|
2
|
-
payTrade: {
|
|
3
|
-
merchantId: string;
|
|
4
|
-
merchantIdRead: string;
|
|
5
|
-
orderNo: string;
|
|
6
|
-
orderNoRead: string;
|
|
7
|
-
termNo: string;
|
|
8
|
-
termNoRead: string;
|
|
9
|
-
view: string;
|
|
10
|
-
index: string;
|
|
11
|
-
merchantNo: string;
|
|
12
|
-
tradeType: string;
|
|
13
|
-
tradeTypeRead: string;
|
|
14
|
-
agentCode: string;
|
|
15
|
-
likeMerchantNoRead: string;
|
|
16
|
-
createTime: string;
|
|
17
|
-
startCreateTime: string;
|
|
18
|
-
endCreateTime: string;
|
|
19
|
-
totalAmount: string;
|
|
20
|
-
discountAmount: string;
|
|
21
|
-
payMode: string;
|
|
22
|
-
payModeRead: string;
|
|
23
|
-
commission: string;
|
|
24
|
-
feeRatePct: string;
|
|
25
|
-
channelId: string;
|
|
26
|
-
instsId: string;
|
|
27
|
-
instsIdRead: string;
|
|
28
|
-
createTimes: string;
|
|
29
|
-
tradeAmount: string;
|
|
30
|
-
orderStatus: string;
|
|
31
|
-
orderStatusRead: string;
|
|
32
|
-
tradeNo: string;
|
|
33
|
-
};
|
|
34
|
-
settleTradeAnalysis: {
|
|
35
|
-
name: string;
|
|
36
|
-
index: string;
|
|
37
|
-
createTime: string;
|
|
38
|
-
channelId: string;
|
|
39
|
-
channelIdRead: string;
|
|
40
|
-
agentCode: string;
|
|
41
|
-
agentCodeRead: string;
|
|
42
|
-
agentCodes: string;
|
|
43
|
-
agentCodesRead: string;
|
|
44
|
-
merchantNum: string;
|
|
45
|
-
orderCount: string;
|
|
46
|
-
orderAmount: string;
|
|
47
|
-
settleAmount: string;
|
|
48
|
-
feeAmt: string;
|
|
49
|
-
analysisTime: string;
|
|
50
|
-
view: string;
|
|
51
|
-
likeMerchantNo: string;
|
|
52
|
-
likeMerchantNoRead: string;
|
|
53
|
-
merchantId: string;
|
|
54
|
-
merchantIdRead: string;
|
|
55
|
-
likeMerchantNos: string;
|
|
56
|
-
likeMerchantNosRead: string;
|
|
57
|
-
termNo: string;
|
|
58
|
-
termNoRead: string;
|
|
59
|
-
payMode: string;
|
|
60
|
-
payModeRead: string;
|
|
61
|
-
analysisTimeStart: string;
|
|
62
|
-
analysisTimeEnd: string;
|
|
63
|
-
tradeType: string;
|
|
64
|
-
tradeTypeRead: string;
|
|
65
|
-
};
|
|
66
|
-
settleTradeReceipt: {
|
|
67
|
-
name: string;
|
|
68
|
-
likeMerchantName: string;
|
|
69
|
-
likeMerchantNo: string;
|
|
70
|
-
likeMerchantNoRead: string;
|
|
71
|
-
likeMerchantNameRead: string;
|
|
72
|
-
createTime: string;
|
|
73
|
-
transferMoneyDateStart: string;
|
|
74
|
-
transferMoneyDateEnd: string;
|
|
75
|
-
agentCode: string;
|
|
76
|
-
agentCodeRead: string;
|
|
77
|
-
channelId: string;
|
|
78
|
-
index: string;
|
|
79
|
-
merchantName: string;
|
|
80
|
-
transferMoneyTime: string;
|
|
81
|
-
transferMoneyAmount: string;
|
|
82
|
-
feeAmt: string;
|
|
83
|
-
transferMoneyStatus: string;
|
|
84
|
-
chnlRespMsg: string;
|
|
85
|
-
termNo: string;
|
|
86
|
-
termNoRead: string;
|
|
87
|
-
};
|
|
88
|
-
};
|
|
89
|
-
export default _default;
|
|
@@ -12,6 +12,7 @@ declare const _default: {
|
|
|
12
12
|
tradeType: string;
|
|
13
13
|
tradeTypeRead: string;
|
|
14
14
|
agentCode: string;
|
|
15
|
+
agentName: string;
|
|
15
16
|
likeMerchantNoRead: string;
|
|
16
17
|
likeMerchantNo: string;
|
|
17
18
|
createTime: string;
|
|
@@ -29,7 +30,9 @@ declare const _default: {
|
|
|
29
30
|
createTimes: string;
|
|
30
31
|
tradeAmount: string;
|
|
31
32
|
orderStatus: string;
|
|
33
|
+
tradeStatus: string;
|
|
32
34
|
orderStatusRead: string;
|
|
35
|
+
tradeStatusRead: string;
|
|
33
36
|
tradeNo: string;
|
|
34
37
|
};
|
|
35
38
|
settleTradeAnalysis: {
|
|
@@ -40,12 +43,15 @@ declare const _default: {
|
|
|
40
43
|
channelId: string;
|
|
41
44
|
channelIdRead: string;
|
|
42
45
|
agentCode: string;
|
|
46
|
+
agentName: string;
|
|
43
47
|
agentCodeRead: string;
|
|
44
48
|
agentCodes: string;
|
|
45
49
|
agentCodesRead: string;
|
|
46
50
|
merchantNum: string;
|
|
47
51
|
orderCount: string;
|
|
48
52
|
orderAmount: string;
|
|
53
|
+
tradeAmount: string;
|
|
54
|
+
discountAmount: string;
|
|
49
55
|
settleAmount: string;
|
|
50
56
|
feeAmt: string;
|
|
51
57
|
analysisTime: string;
|