xyvcard-settle 0.0.22 → 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.
Files changed (30) hide show
  1. package/dist/{history-B8rLL6cg.mjs → history-C3l8NaI6.mjs} +1 -1
  2. package/dist/{history-DOq3Euuf.mjs → history-DQ0J8NCy.mjs} +1 -1
  3. package/dist/{history.vue_vue_type_script_setup_true_lang-CbfsFzBk.mjs → history.vue_vue_type_script_setup_true_lang-B8FBizdu.mjs} +17 -18
  4. package/dist/{history.vue_vue_type_script_setup_true_lang-BcoBU5uq.mjs → history.vue_vue_type_script_setup_true_lang-DB8PERVD.mjs} +64 -63
  5. package/dist/index--l5ns2E2.mjs +690 -0
  6. package/dist/{index-BgQiV0cV.mjs → index-B1h4IWy4.mjs} +2 -2
  7. package/dist/{index-CEE_6GTV.mjs → index-BwZZ71lS.mjs} +118 -104
  8. package/dist/{index-0UYX9qoK.mjs → index-C9xiSbGi.mjs} +118 -101
  9. package/dist/{index-C3Kdmtt0.mjs → index-D0mKdcOp.mjs} +2 -2
  10. package/dist/index-DXSCg5PP.mjs +102 -0
  11. package/dist/{index-DEjceLAF.mjs → index-DsYV-De4.mjs} +166 -141
  12. package/dist/{index-Cd659aKC.mjs → index-Gj815brY.mjs} +145 -144
  13. package/dist/index.mjs +73 -66
  14. package/dist/style.css +1 -0
  15. package/dist/{today-CGeC5FRK.mjs → today-DK4xzzKV.mjs} +1 -1
  16. package/dist/{today-CjR56HHC.mjs → today-DX1djaLC.mjs} +1 -1
  17. package/dist/{today.vue_vue_type_script_setup_true_lang-Cv8Zmnrj.mjs → today.vue_vue_type_script_setup_true_lang-BBSo18Bt.mjs} +90 -99
  18. 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
  19. package/dts/src/api/settle/index.d.ts +1 -0
  20. package/dts/src/api/settle/pay-trade/types.d.ts +1 -0
  21. package/dts/src/api/settle/pay-trade-personal/types.d.ts +1 -0
  22. package/dts/src/api/settle/settle-trade-analysis/types.d.ts +1 -0
  23. package/dts/src/api/settle/settle-trade-merchant/types.d.ts +3 -0
  24. package/dts/src/api/settle/settle-trade-merchant-personal/types.d.ts +2 -0
  25. package/dts/src/constant.d.ts +1 -0
  26. package/dts/src/lang/settle/en.d.ts +0 -89
  27. package/dts/src/lang/settle/zh-cn.d.ts +9 -0
  28. package/package.json +61 -61
  29. package/dist/index-NM7NGo1Y.mjs +0 -534
  30. package/dist/index-q_VWJKNr.mjs +0 -99
@@ -1,33 +1,33 @@
1
- import { defineComponent as W, getCurrentInstance as X, ref as h, resolveComponent as s, createElementBlock as k, openBlock as y, createVNode as l, withCtx as a, withKeys as S, unref as o, Fragment as Z, renderList as ee, createBlock as V, createTextVNode as m, toDisplayString as p, createSlots as te, createCommentVNode as ae, isRef as M } from "vue";
2
- import { useUserStore as v, clearEmpty as le, request as ne, useTableHooks as oe } from "jmash-core";
3
- import { useI18n as re } from "vue-i18n";
4
- import { D as c } from "./index-q_VWJKNr.mjs";
5
- import { channelApi as se } from "xyvcard-merchant";
6
- import { tokenExt as ue } from "xyvcard-agent";
7
- import { useRoute as de } from "vue-router";
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
- getKey(d) {
9
+ getKey(i) {
10
10
  return {
11
- receiptId: d.receiptId
11
+ receiptId: i.receiptId
12
12
  };
13
13
  }
14
14
  // 查询翻页信息划款信息查询-今日到账
15
- findPage(d) {
15
+ findPage(i) {
16
16
  const I = v().user.tenant;
17
- return le(d), ne({
17
+ return oe(i), re({
18
18
  url: "/v1/settle/receipt/today/" + I,
19
19
  method: "get",
20
- params: d
20
+ params: i
21
21
  });
22
22
  }
23
23
  }
24
- const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
24
+ const me = new ie(), ce = { class: "app-container" }, ve = /* @__PURE__ */ G({
25
25
  __name: "today",
26
- setup(N) {
27
- const { t: d } = re(), A = de().query.tenant;
28
- c.instsBizDict.useValues(), c.merchantBizDict.useValues();
29
- const { proxy: z } = X(), C = h([]), T = h(""), r = h({
30
- tokenExt: ue.getTokenExt(v().user.tenant),
26
+ setup(z) {
27
+ const { t: i } = ne(), A = le().query.tenant;
28
+ d.instsBizDict.useValues(), d.merchantBizDict.useValues(), d.agentBizDict.useValues();
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(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
35
35
  )
36
36
  );
37
37
  function B() {
38
- r.value.channelId = "", se.findList({ merchantId: r.value.merchantId }).then((n) => {
39
- console.log(n, "=> res1231"), C.value = n.data.results, T.value = n.data.results.map((t) => t.channelId);
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(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
46
46
  listLoading: x,
47
47
  tableData: R,
48
48
  total: b
49
- } = oe(d, me, r);
49
+ } = se(i, me, o);
50
50
  let f = h([
51
51
  // 序号
52
52
  {
@@ -59,24 +59,15 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
59
59
  {
60
60
  label: "settleTradeReceipt.merchantName",
61
61
  prop: "merchantName",
62
- width: "300",
63
62
  sortable: "custom",
64
- isColumn: !0
65
- },
66
- // 渠道
67
- {
68
- label: "settleTradeReceipt.channelId",
69
- prop: "instsId",
70
- slotName: "instsId",
71
- columnType: "slot",
72
- width: "150",
63
+ minWidth: "200",
73
64
  isColumn: !0
74
65
  },
75
66
  // 连锁号
76
67
  {
77
- label: "settleTradeReceipt.likeMerchantNo",
68
+ label: "settleTradeReceipt.merchantNo",
78
69
  prop: "merchantNo",
79
- width: "300",
70
+ width: "150",
80
71
  sortable: "custom",
81
72
  isColumn: !0
82
73
  },
@@ -86,7 +77,7 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
86
77
  prop: "transferMoneyDate",
87
78
  slotName: "transferMoneyDate",
88
79
  columnType: "slot",
89
- width: "200",
80
+ width: "120",
90
81
  sortable: "custom",
91
82
  isColumn: !0
92
83
  },
@@ -94,7 +85,7 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
94
85
  {
95
86
  label: "settleTradeReceipt.transferMoneyAmount",
96
87
  prop: "transferMoneyAmount",
97
- width: "150",
88
+ width: "120",
98
89
  sortable: "custom",
99
90
  isColumn: !0
100
91
  },
@@ -102,7 +93,7 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
102
93
  {
103
94
  label: "settleTradeReceipt.feeAmt",
104
95
  prop: "feeAmt",
105
- width: "150",
96
+ width: "120",
106
97
  sortable: "custom",
107
98
  isColumn: !0
108
99
  },
@@ -110,7 +101,7 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
110
101
  {
111
102
  label: "settleTradeReceipt.transferMoneyStatusName",
112
103
  prop: "transferMoneyStatusName",
113
- width: "150",
104
+ width: "120",
114
105
  sortable: "custom",
115
106
  isColumn: !0
116
107
  },
@@ -134,42 +125,42 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
134
125
  }
135
126
  ]);
136
127
  function L() {
137
- r.value.merchantId = "", r.value.channelId = "", R.value = [];
128
+ o.value.merchantId = "", o.value.channelId = "", R.value = [];
138
129
  }
139
- function P(n) {
140
- u.selectionRows.value = n;
130
+ function P(r) {
131
+ u.selectionRows.value = r;
141
132
  }
142
- function E(n) {
143
- u.handleSort(n.prop, n.order);
133
+ function E(r) {
134
+ u.handleSort(r.prop, r.order);
144
135
  }
145
136
  function Q() {
146
137
  u.handleQuery(), u.getList();
147
138
  }
148
- return (n, t) => {
149
- 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"), G = s("el-card");
150
- return y(), k("div", pe, [
151
- l(Y, {
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");
141
+ return y(), S("div", ce, [
142
+ n(Y, {
152
143
  ref_key: "queryFormRef",
153
144
  ref: U,
154
- model: r.value,
145
+ model: o.value,
155
146
  inline: !0
156
147
  }, {
157
148
  default: a(() => [
158
- l(D, null, {
149
+ n(D, null, {
159
150
  default: a(() => [
160
- l(g, { span: 6 }, {
151
+ n(g, { span: 6 }, {
161
152
  default: a(() => [
162
- l(_, {
163
- label: n.$t("payTrade.merchantId"),
153
+ n(_, {
154
+ label: r.$t("payTrade.merchantId"),
164
155
  prop: "version"
165
156
  }, {
166
157
  default: a(() => [
167
- l(q, {
168
- modelValue: r.value.merchantId,
169
- "onUpdate:modelValue": t[0] || (t[0] = (e) => r.value.merchantId = e),
170
- placeholder: n.$t("payTrade.merchantIdRead"),
171
- data: o(c).merchantBizDict.values,
172
- onKeyup: t[1] || (t[1] = S((e) => o(u).handleQuery(), ["enter"])),
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"])),
173
164
  class: "!w-[203px]",
174
165
  filterable: "",
175
166
  clearable: "",
@@ -181,26 +172,26 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
181
172
  ]),
182
173
  _: 1
183
174
  }),
184
- l(g, { span: 6 }, {
175
+ n(g, { span: 6 }, {
185
176
  default: a(() => [
186
- l(_, {
187
- label: n.$t("settleTradeAnalysis.channelId"),
177
+ n(_, {
178
+ label: r.$t("settleTradeAnalysis.channelId"),
188
179
  prop: "channelId"
189
180
  }, {
190
181
  default: a(() => [
191
- l(K, {
192
- modelValue: r.value.channelId,
193
- "onUpdate:modelValue": t[2] || (t[2] = (e) => r.value.channelId = e),
194
- placeholder: n.$t("settleTradeAnalysis.channelIdRead"),
195
- onKeyup: t[3] || (t[3] = S((e) => o(u).handleQuery(), ["enter"])),
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"])),
196
187
  class: "!w-[203px]",
197
188
  filterable: "",
198
189
  clearable: ""
199
190
  }, {
200
191
  default: a(() => [
201
- (y(!0), k(Z, null, ee(C.value, (e) => (y(), V(H, {
192
+ (y(!0), S(Z, null, ee(C.value, (e) => (y(), k(H, {
202
193
  key: e.channelId,
203
- label: o(c).instsBizDict.getValue(e.instsId) || e.instsId,
194
+ label: l(d).instsBizDict.getValue(e.instsId) || e.instsId,
204
195
  value: e.channelId
205
196
  }, null, 8, ["label", "value"]))), 128))
206
197
  ]),
@@ -212,24 +203,24 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
212
203
  ]),
213
204
  _: 1
214
205
  }),
215
- l(g, { span: 12 }, {
206
+ n(g, { span: 12 }, {
216
207
  default: a(() => [
217
- l(_, { class: "search-btn" }, {
208
+ n(_, { class: "search-btn" }, {
218
209
  default: a(() => [
219
- l(w, {
210
+ n(w, {
220
211
  type: "primary",
221
212
  onClick: t[4] || (t[4] = (e) => Q())
222
213
  }, {
223
214
  default: a(() => [
224
- m(p(n.$t("common.search")), 1)
215
+ c(p(r.$t("common.search")), 1)
225
216
  ]),
226
217
  _: 1
227
218
  }),
228
- l(w, {
219
+ n(w, {
229
220
  onClick: t[5] || (t[5] = (e) => L())
230
221
  }, {
231
222
  default: a(() => [
232
- m(p(n.$t("common.reset")), 1)
223
+ c(p(r.$t("common.reset")), 1)
233
224
  ]),
234
225
  _: 1
235
226
  })
@@ -245,20 +236,20 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
245
236
  ]),
246
237
  _: 1
247
238
  }, 8, ["model"]),
248
- l(G, {
239
+ n(W, {
249
240
  shadow: "never",
250
241
  class: "table-container"
251
242
  }, {
252
243
  header: a(() => [
253
- l(D, null, {
244
+ n(D, null, {
254
245
  default: a(() => [
255
- l(g, {
246
+ n(g, {
256
247
  span: 24,
257
248
  class: "container-float"
258
249
  }, {
259
250
  default: a(() => [
260
- l(F, {
261
- modelValue: o(f),
251
+ n(F, {
252
+ modelValue: l(f),
262
253
  "onUpdate:modelValue": t[6] || (t[6] = (e) => M(f) ? f.value = e : f = e),
263
254
  "label-name": "settle/settle-trade-receipt"
264
255
  }, null, 8, ["modelValue"])
@@ -270,52 +261,52 @@ const me = new ie(), pe = { class: "app-container" }, ve = /* @__PURE__ */ W({
270
261
  })
271
262
  ]),
272
263
  footer: a(() => [
273
- o(b) > 0 ? (y(), V(O, {
264
+ l(b) > 0 ? (y(), k(O, {
274
265
  key: 0,
275
- total: o(b),
266
+ total: l(b),
276
267
  "onUpdate:total": t[7] || (t[7] = (e) => M(b) ? b.value = e : null),
277
- "current-page": r.value.curPage,
278
- "onUpdate:currentPage": t[8] || (t[8] = (e) => r.value.curPage = e),
279
- "page-size": r.value.pageSize,
280
- "onUpdate:pageSize": t[9] || (t[9] = (e) => r.value.pageSize = e),
281
- onPagination: t[10] || (t[10] = (e) => o(u).getList())
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())
282
273
  }, null, 8, ["total", "current-page", "page-size"])) : ae("", !0)
283
274
  ]),
284
275
  default: a(() => {
285
276
  var e;
286
277
  return [
287
- l(J, {
278
+ n(J, {
288
279
  ref_key: "multipleTableRef",
289
280
  ref: j,
290
281
  "row-key": "receiptId",
291
282
  isSelection: !1,
292
- "list-loading": o(x),
293
- data: o(R),
294
- "table-label": o(f),
283
+ "list-loading": l(x),
284
+ data: l(R),
285
+ "table-label": l(f),
295
286
  onSelectionChange: P,
296
287
  onSortChange: E
297
288
  }, te({
298
- transferMoneyDate: a((i) => [
299
- m(p(o(z).$moment.formatDate(
300
- i.data.row.transferMoneyDate,
289
+ transferMoneyDate: a((m) => [
290
+ c(p(l(N).$moment.formatDate(
291
+ m.data.row.transferMoneyDate,
301
292
  "YYYY-MM-DD HH:mm"
302
293
  )), 1)
303
294
  ]),
304
- instsId: a((i) => [
305
- m(p(o(c).instsBizDict.getValue(i.data.row.instsId)), 1)
295
+ instsId: a((m) => [
296
+ c(p(l(d).instsBizDict.getValue(m.data.row.instsId)), 1)
306
297
  ]),
307
298
  _: 2
308
299
  }, [
309
- (e = o(A)) != null && e.includes("@") ? {
300
+ (e = l(A)) != null && e.includes("@") ? {
310
301
  name: "agentCode",
311
- fn: a((i) => [
312
- m(p($.value.agentAlias), 1)
302
+ fn: a((m) => [
303
+ c(p($.value.agentAlias), 1)
313
304
  ]),
314
305
  key: "1"
315
306
  } : {
316
307
  name: "agentCode",
317
- fn: a((i) => [
318
- m(p(o(c).agentBizDict.getValue(i.data.row.agentCode)), 1)
308
+ fn: a((m) => [
309
+ c(p(l(d).agentBizDict.getValue(m.data.row.agentCode)), 1)
319
310
  ]),
320
311
  key: "0"
321
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 { useUserStore as v, clearEmpty as W, request as X, useTableHooks as Z } from "jmash-core";
3
- import { useI18n as ee } from "vue-i18n";
4
- import { D as c } from "./index-q_VWJKNr.mjs";
5
- import { channelApi as te } from "xyvcard-merchant";
6
- import { tokenExt as le } from "xyvcard-agent";
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 W(d), X({
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 } = ee();
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: le.getTokenExt(v().user.tenant)
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
- te.myFindList({}).then((n) => {
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
- } = Z(d, ne, r);
45
+ } = ee(d, ne, r);
46
46
  let i = y([
47
47
  // 序号
48
48
  {
@@ -7,4 +7,5 @@ export declare class Dict {
7
7
  static readonly payModeBizDict: EnumDict;
8
8
  static readonly tradeTypeBizDict: EnumDict;
9
9
  static readonly orderStatusBizDict: EnumDict;
10
+ static readonly tradeStatusBizDict: EnumDict;
10
11
  }
@@ -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;
@@ -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,7 +12,9 @@ declare const _default: {
12
12
  tradeType: string;
13
13
  tradeTypeRead: string;
14
14
  agentCode: string;
15
+ agentName: string;
15
16
  likeMerchantNoRead: string;
17
+ likeMerchantNo: string;
16
18
  createTime: string;
17
19
  startCreateTime: string;
18
20
  endCreateTime: string;
@@ -28,22 +30,28 @@ declare const _default: {
28
30
  createTimes: string;
29
31
  tradeAmount: string;
30
32
  orderStatus: string;
33
+ tradeStatus: string;
31
34
  orderStatusRead: string;
35
+ tradeStatusRead: string;
32
36
  tradeNo: string;
33
37
  };
34
38
  settleTradeAnalysis: {
39
+ merchantNo: string;
35
40
  name: string;
36
41
  index: string;
37
42
  createTime: string;
38
43
  channelId: string;
39
44
  channelIdRead: string;
40
45
  agentCode: string;
46
+ agentName: string;
41
47
  agentCodeRead: string;
42
48
  agentCodes: string;
43
49
  agentCodesRead: string;
44
50
  merchantNum: string;
45
51
  orderCount: string;
46
52
  orderAmount: string;
53
+ tradeAmount: string;
54
+ discountAmount: string;
47
55
  settleAmount: string;
48
56
  feeAmt: string;
49
57
  analysisTime: string;
@@ -67,6 +75,7 @@ declare const _default: {
67
75
  name: string;
68
76
  likeMerchantName: string;
69
77
  likeMerchantNo: string;
78
+ merchantNo: string;
70
79
  likeMerchantNoRead: string;
71
80
  likeMerchantNameRead: string;
72
81
  createTime: string;