xyvcard-settle 0.0.44 → 0.0.46

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 (36) hide show
  1. package/dist/agent-R-Ml-XTA.mjs +32 -0
  2. package/dist/{history-BAkRg2pq.mjs → history-DCwgJuDo.mjs} +1 -1
  3. package/dist/{history-Dn1bbCcI.mjs → history-DwIGzL72.mjs} +1 -1
  4. package/dist/{history.vue_vue_type_script_setup_true_lang-CgrLgBqg.mjs → history.vue_vue_type_script_setup_true_lang-DO3kL3x0.mjs} +26 -26
  5. package/dist/{history.vue_vue_type_script_setup_true_lang-Dl65zcTa.mjs → history.vue_vue_type_script_setup_true_lang-DVGITvdY.mjs} +36 -36
  6. package/dist/{index-CaaOEjHM.mjs → index-B65gCM1w.mjs} +2 -2
  7. package/dist/{index-oJY5i5R_.mjs → index-B8Y2esGZ.mjs} +2 -2
  8. package/dist/{index-vF1PDwWz.mjs → index-BJDG5RJu.mjs} +34 -33
  9. package/dist/index-BSjUBqhl.mjs +725 -0
  10. package/dist/{index-A0dvO46M.mjs → index-BpX-ZCaL.mjs} +463 -461
  11. package/dist/{index-CbEHaatk.mjs → index-CWRtxckQ.mjs} +1 -1
  12. package/dist/{index-BTCLMpHR.mjs → index-ClDxB7Ty.mjs} +39 -39
  13. package/dist/{index-DsEuGxTJ.mjs → index-DSAnrTJ1.mjs} +36 -35
  14. package/dist/{index-DzN2x713.mjs → index-DcjjaDUk.mjs} +1 -1
  15. package/dist/{index-CE4_NZLb.mjs → index-UPAK9M6D.mjs} +1 -1
  16. package/dist/{index-Dp6vdCsP.mjs → index-d-nHEHMj.mjs} +228 -217
  17. package/dist/{index-BRU67qDa.mjs → index-yQjjxDcA.mjs} +34 -33
  18. package/dist/index.mjs +1 -1
  19. package/dist/merchant-D9rtENQd.mjs +32 -0
  20. package/dist/pay-CZR9oAkw.mjs +126 -0
  21. package/dist/pay-fu3fGrJB.mjs +106 -0
  22. package/dist/style.css +1 -1
  23. package/dist/{today-C1jwQmNs.mjs → today-CLfowatL.mjs} +1 -1
  24. package/dist/{today-ZrG0UNrv.mjs → today-eDeS0zsk.mjs} +1 -1
  25. package/dist/{today.vue_vue_type_script_setup_true_lang-BPQu6Gke.mjs → today.vue_vue_type_script_setup_true_lang-Bq4NCLzD.mjs} +1 -1
  26. package/dist/{today.vue_vue_type_script_setup_true_lang-CZqnx44q.mjs → today.vue_vue_type_script_setup_true_lang-CBon7bqw.mjs} +1 -1
  27. package/dts/src/api/settle/agent.d.ts +4 -4
  28. package/dts/src/api/settle/history-pay-trade/index.d.ts +8 -0
  29. package/dts/src/api/settle/history-pay-trade/types.d.ts +83 -0
  30. package/dts/src/api/settle/merchant.d.ts +9 -0
  31. package/dts/src/lang/settle/zh-cn.d.ts +2 -0
  32. package/dts/src/views/payment/history-pay-trade/index.vue.d.ts +2 -0
  33. package/package.json +2 -2
  34. package/dist/agent-BXhE-jbg.mjs +0 -32
  35. package/dist/pay-CvwrYB4j.mjs +0 -121
  36. package/dist/pay-Db-UEae3.mjs +0 -101
@@ -1,4 +1,4 @@
1
- import { _ as f } from "./today.vue_vue_type_script_setup_true_lang-CZqnx44q.mjs";
1
+ import { _ as f } from "./today.vue_vue_type_script_setup_true_lang-CBon7bqw.mjs";
2
2
  export {
3
3
  f as default
4
4
  };
@@ -1,4 +1,4 @@
1
- import { _ as f } from "./today.vue_vue_type_script_setup_true_lang-BPQu6Gke.mjs";
1
+ import { _ as f } from "./today.vue_vue_type_script_setup_true_lang-Bq4NCLzD.mjs";
2
2
  export {
3
3
  f as default
4
4
  };
@@ -4,7 +4,7 @@ import { useUserStore as k, clearEmpty as W, request as X, useTableHooks as Z }
4
4
  import { tokenExt as ee } from "xyvcard-agent";
5
5
  import { channelApi as te } from "xyvcard-merchant";
6
6
  import { D as c } from "./index-yz18Lhpm.mjs";
7
- import { g as le } from "./agent-BXhE-jbg.mjs";
7
+ import { g as le } from "./agent-R-Ml-XTA.mjs";
8
8
  class ae {
9
9
  getKey(d) {
10
10
  return {
@@ -5,7 +5,7 @@ import { useUserStore as M, clearEmpty as ee, request as te, useTableHooks as ae
5
5
  import { channelApi as le } from "xyvcard-merchant";
6
6
  import { D as m } from "./index-yz18Lhpm.mjs";
7
7
  import { tokenExt as ne } from "xyvcard-agent";
8
- import { g as oe } from "./agent-BXhE-jbg.mjs";
8
+ import { g as oe } from "./agent-R-Ml-XTA.mjs";
9
9
  class re {
10
10
  getKey(u) {
11
11
  return {
@@ -1,5 +1,5 @@
1
1
  import type { InfoKey } from "xyvcard-agent";
2
- export declare class RbacApi {
2
+ export declare class AgentApi {
3
3
  userInfoMap: Map<string, InfoKey>;
4
4
  defauleUserInfo: {
5
5
  tenant?: string | undefined;
@@ -10,6 +10,6 @@ export declare class RbacApi {
10
10
  };
11
11
  userInfo(agentCode: string): InfoKey;
12
12
  }
13
- declare const rbacApi: RbacApi;
14
- export { rbacApi };
15
- export declare function getUserDisplayName(agentCode: string): string | undefined;
13
+ declare const agentApi: AgentApi;
14
+ export { agentApi };
15
+ export declare function getAgentName(agentCode: string): string | undefined;
@@ -0,0 +1,8 @@
1
+ import type { AxiosPromise } from "axios";
2
+ import type { PaymentHistoryTradeApi, PaymentHistoryTradeModel, PaymentHistoryBillsKey, PaymentHistoryTradeReq, PaymentHistoryTradePage } from "./types";
3
+ declare class PaymentHistoryTradeApiImpl implements PaymentHistoryTradeApi {
4
+ getKey(model: PaymentHistoryTradeModel): PaymentHistoryBillsKey;
5
+ findPage(query?: PaymentHistoryTradeReq): AxiosPromise<PaymentHistoryTradePage>;
6
+ }
7
+ declare const paymentHistoryTradeApi: PaymentHistoryTradeApiImpl;
8
+ export { paymentHistoryTradeApi };
@@ -0,0 +1,83 @@
1
+ import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList } from "jmash-core";
2
+ export interface PaymentHistoryTradeApi extends EntityApi {
3
+ }
4
+ export interface PaymentHistoryTradeReq extends EntityReq {
5
+ likeMerchantNo?: string;
6
+ merchantId?: string;
7
+ orderNo?: string;
8
+ outOrderNo?: string;
9
+ channelId?: string;
10
+ agentCode?: string;
11
+ termNo?: string;
12
+ likeOrderTitle?: string;
13
+ hasOrderStatus?: boolean;
14
+ orderStatus?: string;
15
+ startCreateTime?: string;
16
+ endCreateTime?: string;
17
+ payMode?: string;
18
+ tradeType?: string;
19
+ instsId?: string;
20
+ hasBillsStatus?: boolean;
21
+ billsStatus?: string;
22
+ hasTradeType?: boolean;
23
+ hasPayMode?: boolean;
24
+ hasTradeStatus?: boolean;
25
+ tradeStatus?: string;
26
+ tokenExt?: string;
27
+ }
28
+ export interface PaymentHistoryTradeModel extends EntityModel {
29
+ orderId?: string;
30
+ merchantId?: string;
31
+ merchantNo?: string;
32
+ orderNo?: string;
33
+ outOrderNo?: string;
34
+ agentCode?: string;
35
+ marketBy?: string;
36
+ billId?: string;
37
+ orderTitle?: string;
38
+ totalAmount?: number;
39
+ discountAmount?: number;
40
+ payableAmount?: number;
41
+ paidAmount?: number;
42
+ unpaidAmount?: number;
43
+ refundAmount?: number;
44
+ refundableAmount?: number;
45
+ termNo?: string;
46
+ notifyUrl?: string;
47
+ supportCancel?: boolean;
48
+ supportRefund?: boolean;
49
+ supportRepeatPay?: boolean;
50
+ callbackUrl?: string;
51
+ TradeStatus?: string;
52
+ efficientTime?: string;
53
+ description?: string;
54
+ createBy?: string;
55
+ createTime?: string;
56
+ updateTime?: string;
57
+ }
58
+ export interface HistoryTradeList extends EntityList {
59
+ results: Array<PaymentHistoryTradeModel>;
60
+ }
61
+ export interface PaymentHistoryTradePage extends EntityPage {
62
+ results: Array<PaymentHistoryTradeModel>;
63
+ subTotalDto: PaymentHistoryTradeModelTotal;
64
+ totalDto: PaymentHistoryTradeModelTotal;
65
+ }
66
+ export interface PaymentHistoryTradeModelTotal extends EntityTotal {
67
+ totalSize: number;
68
+ totalAmount?: number;
69
+ tradeAmount?: number;
70
+ paidOrder?: number;
71
+ paidAmount?: number;
72
+ discountAmount?: number;
73
+ refundOrder?: number;
74
+ refundAmount?: string;
75
+ }
76
+ export interface PaymentHistoryBillsKey extends EntityKey {
77
+ tenant?: string;
78
+ billId?: string;
79
+ }
80
+ export interface PaymentHistoryTradeList extends EntityKeyList {
81
+ tenant?: string;
82
+ billId?: Array<string>;
83
+ }
@@ -0,0 +1,9 @@
1
+ import { type MerchantsCommonReq } from "xyvcard-merchant";
2
+ export declare class MerchantApi {
3
+ userInfoMap: Map<string, MerchantsCommonReq>;
4
+ defauleUserInfo: any;
5
+ userInfo(merchantId: string): MerchantsCommonReq;
6
+ }
7
+ declare const merchantApi: MerchantApi;
8
+ export { merchantApi };
9
+ export declare function getMerchantName(merchantId: string): any;
@@ -37,6 +37,8 @@ declare const _default: {
37
37
  refundReason: string;
38
38
  description: string;
39
39
  qrcodeNo: string;
40
+ payTimeRequired: string;
41
+ needAtLeastOneCondition: string;
40
42
  };
41
43
  settleTradeAnalysis: {
42
44
  merchantNo: string;
@@ -0,0 +1,2 @@
1
+ declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
2
+ export default _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xyvcard-settle",
3
- "version": "0.0.44",
3
+ "version": "0.0.46",
4
4
  "private": false,
5
5
  "module": "dist/index.mjs",
6
6
  "types": "dts/src/index.d.ts",
@@ -19,7 +19,7 @@
19
19
  "jmash-dict": "^0.1.1",
20
20
  "jmash-rbac": "^0.1.1",
21
21
  "xyvcard-agent": "0.0.48",
22
- "xyvcard-merchant": "0.0.38",
22
+ "xyvcard-merchant": "0.0.47",
23
23
  "xyvcard-insts": "0.0.35"
24
24
  },
25
25
  "devDependencies": {
@@ -1,32 +0,0 @@
1
- var t = Object.defineProperty;
2
- var a = (r, s, e) => s in r ? t(r, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[s] = e;
3
- var i = (r, s, e) => a(r, typeof s != "symbol" ? s + "" : s, e);
4
- import { reactive as n } from "vue";
5
- import { infoApi as u } from "xyvcard-agent";
6
- class o {
7
- constructor() {
8
- // 用户信息缓存
9
- i(this, "userInfoMap", /* @__PURE__ */ new Map());
10
- // 默认用户信息
11
- i(this, "defauleUserInfo", n({}));
12
- }
13
- // 获取用户信息
14
- userInfo(s) {
15
- if (s == null || s === "")
16
- return this.defauleUserInfo;
17
- if (!this.userInfoMap.has(s)) {
18
- const e = n({});
19
- this.userInfoMap.set(s, e), u.findById({ agentCode: s }).then((f) => {
20
- Object.assign(e, f.data);
21
- });
22
- }
23
- return this.userInfoMap.get(s);
24
- }
25
- }
26
- const p = new o();
27
- function l(r) {
28
- return p.userInfo(r).agentAlias;
29
- }
30
- export {
31
- l as g
32
- };
@@ -1,121 +0,0 @@
1
- import { defineComponent as y, ref as u, onMounted as h, onUnmounted as x, createElementBlock as _, openBlock as g } from "vue";
2
- import { i as D } from "./index--_Po9Tig.mjs";
3
- import { D as l } from "./index-yz18Lhpm.mjs";
4
- import { s as b } from "./index-eUhFgNKx.mjs";
5
- import { _ as w } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
6
- const z = /* @__PURE__ */ y({
7
- __name: "pay",
8
- setup(S) {
9
- l.merchantBizDict.useValues();
10
- const i = u();
11
- let e = null, o = null;
12
- const c = u([]), d = () => {
13
- const n = /* @__PURE__ */ new Date(), r = /* @__PURE__ */ new Date();
14
- r.setDate(n.getDate() - 6);
15
- const a = (s) => s.toISOString().split("T")[0];
16
- return {
17
- analysisTimeStart: a(r),
18
- analysisTimeEnd: a(n)
19
- };
20
- }, p = () => {
21
- i.value && (e = D(i.value));
22
- }, f = () => {
23
- if (!e) return;
24
- const n = Math.max(...c.value.map((t) => t.value)), r = Math.ceil(n * 1.2), s = {
25
- tooltip: {
26
- trigger: "axis",
27
- formatter: (t) => `${t[0].name}<br/>交易金额: ¥${t[0].value.toLocaleString()}`
28
- },
29
- grid: {
30
- left: "1%",
31
- right: "5%",
32
- top: "0",
33
- containLabel: !0
34
- },
35
- yAxis: {
36
- type: "category",
37
- inverse: !0,
38
- data: c.value.map((t) => t.name),
39
- axisLabel: {
40
- formatter: (t) => t.replace(/(.{10})/g, `$1
41
- `)
42
- }
43
- },
44
- xAxis: {
45
- type: "value",
46
- min: 0,
47
- max: r,
48
- axisLabel: {
49
- show: !0,
50
- // 确保显示X轴标签
51
- formatter: (t) => `¥${t}`
52
- },
53
- splitLine: {
54
- lineStyle: {
55
- type: "dashed"
56
- }
57
- }
58
- },
59
- series: [
60
- {
61
- data: c.value.map((t) => t.value),
62
- // 调整柱子宽度
63
- barWidth: 40,
64
- label: {
65
- show: !1
66
- // 不展示文字
67
- },
68
- itemStyle: {
69
- color: "#FF8C00"
70
- // 柱状图的颜色为蓝色
71
- },
72
- type: "bar"
73
- // 图表类型为柱状图
74
- }
75
- ]
76
- };
77
- e.setOption(s);
78
- }, v = async () => {
79
- try {
80
- await l.merchantBizDict.useValues();
81
- const n = d(), r = await b.orderAmount({
82
- analysisTimeStart: n.analysisTimeStart,
83
- analysisTimeEnd: n.analysisTimeEnd
84
- });
85
- c.value = r.data.results.filter((a) => a.merchantId && a.orderAmount).map((a) => ({
86
- name: l.merchantBizDict.getValue(a.merchantId),
87
- value: parseFloat(a.orderAmount)
88
- })).sort((a, s) => s.value - a.value).slice(0, 4), f(), setTimeout(() => {
89
- e && e.resize();
90
- }, 0);
91
- } catch (n) {
92
- console.error("获取数据失败:", n), e && e.setOption({
93
- title: {
94
- text: "数据加载失败",
95
- left: "center",
96
- top: "center",
97
- textStyle: {
98
- color: "#999"
99
- }
100
- }
101
- });
102
- }
103
- }, m = () => {
104
- e && e.resize();
105
- };
106
- return h(() => {
107
- p(), v(), window.addEventListener("resize", m), i.value && (o = new ResizeObserver(() => {
108
- e && e.resize();
109
- }), o.observe(i.value));
110
- }), x(() => {
111
- window.removeEventListener("resize", m), o && o.disconnect(), e && e.dispose();
112
- }), (n, r) => (g(), _("div", {
113
- ref_key: "container",
114
- ref: i,
115
- class: "chart-container"
116
- }, null, 512));
117
- }
118
- }), B = /* @__PURE__ */ w(z, [["__scopeId", "data-v-ce4b01cd"]]);
119
- export {
120
- B as default
121
- };
@@ -1,101 +0,0 @@
1
- import { defineComponent as p, ref as l, onMounted as f, onUnmounted as v, createElementBlock as h, openBlock as _ } from "vue";
2
- import { s as y } from "./index-CGc-CaEO.mjs";
3
- import { i as z } from "./index--_Po9Tig.mjs";
4
- import { D as i } from "./index-yz18Lhpm.mjs";
5
- import { _ as b } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
6
- const w = /* @__PURE__ */ p({
7
- __name: "pay",
8
- setup(x) {
9
- i.merchantBizDict.useValues();
10
- const a = l();
11
- let t = null, n = null;
12
- const o = l([]), c = () => {
13
- a.value && (t = z(a.value));
14
- }, u = () => {
15
- if (!t) return;
16
- const r = {
17
- tooltip: {
18
- trigger: "axis",
19
- formatter: (e) => `${e[0].name}<br/>交易金额: ¥${e[0].value.toLocaleString()}`
20
- },
21
- grid: {
22
- left: "0",
23
- right: "5%",
24
- top: "0",
25
- containLabel: !0
26
- },
27
- yAxis: {
28
- type: "category",
29
- inverse: !0,
30
- // 名称
31
- data: o.value.map((e) => e.name),
32
- axisLabel: {
33
- formatter: (e) => e.replace(/(.{6})/g, `$1
34
- `)
35
- }
36
- },
37
- xAxis: {
38
- type: "value",
39
- interval: 2500,
40
- axisLabel: {
41
- show: !0,
42
- // 确保显示X轴标签
43
- formatter: (e) => `¥${e}`
44
- },
45
- splitLine: {
46
- lineStyle: {
47
- type: "dashed"
48
- }
49
- }
50
- },
51
- series: [
52
- {
53
- data: o.value.map((e) => e.value),
54
- // 调整柱子宽度
55
- barWidth: 30,
56
- label: {
57
- show: !1
58
- // 不展示文字
59
- },
60
- itemStyle: {
61
- color: "#FF8C00"
62
- // 柱状图的颜色为蓝色
63
- },
64
- type: "bar"
65
- // 图表类型为柱状图
66
- }
67
- ]
68
- };
69
- t.setOption(r);
70
- }, m = async () => {
71
- try {
72
- await i.merchantBizDict.useValues();
73
- const r = await y.orderAmount({});
74
- o.value = r.data.results.filter((e) => e.merchantId && e.orderAmount).map((e) => ({
75
- name: i.merchantBizDict.getValue(e.merchantId),
76
- value: parseFloat(e.orderAmount)
77
- })).sort((e, d) => d.value - e.value).slice(0, 4), u(), setTimeout(() => {
78
- t && t.resize();
79
- }, 0);
80
- } catch (r) {
81
- console.error("暂无数据", r);
82
- }
83
- }, s = () => {
84
- t && t.resize();
85
- };
86
- return f(() => {
87
- c(), m(), window.addEventListener("resize", s), a.value && (n = new ResizeObserver(() => {
88
- t && t.resize();
89
- }), n.observe(a.value));
90
- }), v(() => {
91
- window.removeEventListener("resize", s), n && n.disconnect(), t && t.dispose();
92
- }), (r, e) => (_(), h("div", {
93
- ref_key: "container",
94
- ref: a,
95
- class: "chart-container"
96
- }, null, 512));
97
- }
98
- }), C = /* @__PURE__ */ b(w, [["__scopeId", "data-v-efd8add5"]]);
99
- export {
100
- C as default
101
- };