ts-glitter 14.3.3 → 14.3.5

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/lowcode/Entry.js CHANGED
@@ -70,7 +70,7 @@ export class Entry {
70
70
  }
71
71
  window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
72
72
  console.log(`Entry-time:`, window.renderClock.stop());
73
- glitter.share.editerVersion = 'V_14.3.2';
73
+ glitter.share.editerVersion = 'V_14.3.5';
74
74
  glitter.share.start = new Date();
75
75
  const vm = {
76
76
  appConfig: [],
package/lowcode/Entry.ts CHANGED
@@ -72,7 +72,7 @@ export class Entry {
72
72
  }
73
73
  (window as any).renderClock = (window as any).renderClock ?? clockF();
74
74
  console.log(`Entry-time:`, (window as any).renderClock.stop());
75
- glitter.share.editerVersion = 'V_14.3.2';
75
+ glitter.share.editerVersion = 'V_14.3.5';
76
76
  glitter.share.start = new Date();
77
77
  const vm: {
78
78
  appConfig: any;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ts-glitter",
3
- "version": "14.3.3",
3
+ "version": "14.3.5",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -184,11 +184,12 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
184
184
  try {
185
185
  let decodeData = undefined;
186
186
  const appName = req.query['g-app'];
187
+ const type = req.query['type'];
187
188
  const keyData = (await private_config_js_1.Private_config.getConfig({
188
189
  appName: appName,
189
190
  key: 'glitter_finance',
190
- }))[0].value;
191
- if (keyData.TYPE === 'ecPay') {
191
+ }))[0].value[type];
192
+ if (type === 'ecPay') {
192
193
  const responseCheckMacValue = `${req.body.CheckMacValue}`;
193
194
  delete req.body.CheckMacValue;
194
195
  const chkSum = financial_service_js_1.EcPay.generateCheckMacValue(req.body, keyData.HASH_KEY, keyData.HASH_IV);
@@ -200,7 +201,7 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
200
201
  },
201
202
  };
202
203
  }
203
- if (keyData.TYPE === 'newWebPay') {
204
+ if (type === 'newWebPay') {
204
205
  decodeData = JSON.parse(new financial_service_js_1.EzPay(appName, {
205
206
  HASH_IV: keyData.HASH_IV,
206
207
  HASH_KEY: keyData.HASH_KEY,
@@ -208,7 +209,7 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
208
209
  NotifyURL: '',
209
210
  ReturnURL: '',
210
211
  MERCHANT_ID: keyData.MERCHANT_ID,
211
- TYPE: keyData.TYPE,
212
+ TYPE: type,
212
213
  }).decode(req.body.TradeInfo));
213
214
  }
214
215
  if (decodeData['Status'] === 'SUCCESS') {
@@ -224,7 +225,8 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
224
225
  spec: []
225
226
  }
226
227
  ],
227
- user_info: data.note.invoice_data
228
+ user_info: data.note.invoice_data,
229
+ orderID: decodeData['Result']['MerchantOrderNo']
228
230
  }, false);
229
231
  }
230
232
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"ai-points.js","sourceRoot":"","sources":["ai-points.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ai-points.js","sourceRoot":"","sources":["ai-points.ts"],"names":[],"mappings":"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"}
@@ -200,14 +200,16 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
200
200
  try {
201
201
  let decodeData = undefined;
202
202
  const appName = req.query['g-app'] as string;
203
+ const type=req.query['type'] as string;
203
204
  const keyData = (
204
205
  await Private_config.getConfig({
205
206
  appName: appName,
206
207
  key: 'glitter_finance',
207
208
  })
208
- )[0].value;
209
+ )[0].value[type];
209
210
 
210
- if (keyData.TYPE === 'ecPay') {
211
+
212
+ if (type === 'ecPay') {
211
213
  const responseCheckMacValue = `${req.body.CheckMacValue}`;
212
214
  delete req.body.CheckMacValue;
213
215
  const chkSum = EcPay.generateCheckMacValue(req.body, keyData.HASH_KEY, keyData.HASH_IV);
@@ -219,7 +221,7 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
219
221
  },
220
222
  };
221
223
  }
222
- if (keyData.TYPE === 'newWebPay') {
224
+ if (type === 'newWebPay') {
223
225
  decodeData = JSON.parse(
224
226
  new EzPay(appName, {
225
227
  HASH_IV: keyData.HASH_IV,
@@ -228,7 +230,7 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
228
230
  NotifyURL: '',
229
231
  ReturnURL: '',
230
232
  MERCHANT_ID: keyData.MERCHANT_ID,
231
- TYPE: keyData.TYPE,
233
+ TYPE: type,
232
234
  }).decode(req.body.TradeInfo)
233
235
  );
234
236
  }
@@ -249,7 +251,8 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
249
251
  spec:[]
250
252
  }
251
253
  ],
252
- user_info:data.note.invoice_data
254
+ user_info:data.note.invoice_data,
255
+ orderID:decodeData['Result']['MerchantOrderNo']
253
256
  }, false);
254
257
  } else {
255
258
  await db.execute(
@@ -184,11 +184,12 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
184
184
  try {
185
185
  let decodeData = undefined;
186
186
  const appName = req.query['g-app'];
187
+ const type = req.query['type'];
187
188
  const keyData = (await private_config_js_1.Private_config.getConfig({
188
189
  appName: appName,
189
190
  key: 'glitter_finance',
190
- }))[0].value;
191
- if (keyData.TYPE === 'ecPay') {
191
+ }))[0].value[type];
192
+ if (type === 'ecPay') {
192
193
  const responseCheckMacValue = `${req.body.CheckMacValue}`;
193
194
  delete req.body.CheckMacValue;
194
195
  const chkSum = financial_service_js_1.EcPay.generateCheckMacValue(req.body, keyData.HASH_KEY, keyData.HASH_IV);
@@ -200,7 +201,7 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
200
201
  },
201
202
  };
202
203
  }
203
- if (keyData.TYPE === 'newWebPay') {
204
+ if (type === 'newWebPay') {
204
205
  decodeData = JSON.parse(new financial_service_js_1.EzPay(appName, {
205
206
  HASH_IV: keyData.HASH_IV,
206
207
  HASH_KEY: keyData.HASH_KEY,
@@ -208,7 +209,7 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
208
209
  NotifyURL: '',
209
210
  ReturnURL: '',
210
211
  MERCHANT_ID: keyData.MERCHANT_ID,
211
- TYPE: keyData.TYPE,
212
+ TYPE: type,
212
213
  }).decode(req.body.TradeInfo));
213
214
  }
214
215
  if (decodeData['Status'] === 'SUCCESS') {
@@ -224,7 +225,8 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
224
225
  spec: []
225
226
  }
226
227
  ],
227
- user_info: data.note.invoice_data
228
+ user_info: data.note.invoice_data,
229
+ orderID: decodeData['Result']['MerchantOrderNo']
228
230
  }, false);
229
231
  }
230
232
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"sms-points.js","sourceRoot":"","sources":["sms-points.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sms-points.js","sourceRoot":"","sources":["sms-points.ts"],"names":[],"mappings":";;;;AAAA,sDAA8B;AAC9B,oDAA4B;AAC5B,sEAA8C;AAC9C,wEAAgD;AAChD,4EAA2C;AAC3C,gEAAyD;AACzD,wEAAkE;AAClE,2EAAgE;AAChE,4DAAqD;AACrD,uDAA+C;AAC/C,+DAAqD;AAErD,MAAM,MAAM,GAAmB,iBAAO,CAAC,MAAM,EAAE,CAAC;AAIhD,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IACnE,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,CAAC;QACvC,IAAI,KAAK,GAAQ,EAAE,CAAC;QAEpB,IAAI,MAAM,+BAAY,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,oCAAoC,GAAG,sFAAsF,GAAG,CAAC,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC;QAC3L,CAAC;aAAM,CAAC;YACJ,KAAK,CAAC,IAAI,CAAC,UAAU,qBAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;aAAM,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;QACD,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,gBAAgB,qBAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACtF,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,2BAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,KAAY,CAAC,CAAC;QAChH,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,IAAI,QAAQ,GAAG,CACX,MAAM,qBAAE,CAAC,KAAK,CACV,0BAA0B,GAAG;qBAC5B,EACD,CAAC,CAAC,CAAC,MAAM,CAAC,CACb,CACJ,CAAC,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,QAAQ,GAAG,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC;QAC/C,CAAC;QACD,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IACpE,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,CAAC;QACvC,OAAO,kBAAQ,CAAC,IAAI,CAChB,IAAI,EACJ,MAAM,IAAI,0BAAS,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;YAC3C,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;YAC/B,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK;YACrB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;YACnB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;SAC1B,CAAC,CACL,CAAC;IACN,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IACtE,IAAI,CAAC;QACD,IAAI,MAAM,+BAAY,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,0BAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;gBACnE,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;aAClB,CAAC,CAAC;YACH,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;gBACvB,MAAM,EAAE,IAAI;aACf,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAS,CAAC,eAAe,CAAC,aAAa,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACjG,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IAC3E,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,CAAC;QACvC,IAAI,KAAK,GAAQ,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,2BAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,KAAY,CAAC,CAAC;QAC9G,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,IAAI,QAAQ,GAAG,CACX,MAAM,qBAAE,CAAC,KAAK,CACV,0BAA0B,GAAG;qBAC5B,EACD,CAAC,CAAC,CAAC,MAAM,CAAC,CACb,CACJ,CAAC,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,QAAQ,GAAG,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC;QAC/C,CAAC;QACD,IAAI,MAAM,+BAAY,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACJ,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAS,CAAC,eAAe,CAAC,aAAa,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACjG,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IAC5E,IAAI,CAAC;QACD,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IAC3E,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,CAAC;QACvC,IAAI,MAAM,+BAAY,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,0BAAS,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC;gBACjD,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACf,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;gBACvB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;aACtB,CAAC,CAAC;YACH,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;gBACvB,MAAM,EAAE,IAAI;aACf,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAS,CAAC,eAAe,CAAC,aAAa,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACjG,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IAC9E,IAAI,CAAC;QACD,IAAI,MAAM,+BAAY,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,0BAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC;gBAC3E,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;aAClB,CAAC,CAAC;YACH,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;gBACvB,MAAM,EAAE,IAAI;aACf,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAS,CAAC,eAAe,CAAC,aAAa,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACjG,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IACtE,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,CAAC;QACvC,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;YACvB,GAAG,EACC,CACI,MAAM,qBAAE,CAAC,KAAK,CACV,4BAA4B,GAAG;kEACW,EAC1C,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAC9C,CACJ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;SAC9B,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IAC3E,IAAI,CAAC;QACD,IAAI,MAAM,+BAAY,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAW,CAAC;YACvC,IAAI,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACnC,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC9B,MAAM,qBAAE,CAAC,OAAO,CACZ,iBAAiB,GAAG;+CACO,EAC3B,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CACnD,CAAC;YACN,CAAC;YACD,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;gBACvB,MAAM,EAAE,IAAI;aACf,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAS,CAAC,eAAe,CAAC,aAAa,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACjG,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,gBAAM,CAAC,aAAa,EAAE,CAAC;AACvC,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AACnC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;IACjG,IAAI,CAAC;QACD,IAAI,UAAU,GAAG,SAAS,CAAC;QAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAW,CAAC;QAC7C,MAAM,IAAI,GAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAW,CAAC;QACvC,MAAM,OAAO,GAAG,CACZ,MAAM,kCAAc,CAAC,SAAS,CAAC;YAC3B,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,iBAAiB;SACzB,CAAC,CACL,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAIjB,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACnB,MAAM,qBAAqB,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC1D,OAAO,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC;YAC9B,MAAM,MAAM,GAAG,4BAAK,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACxF,UAAU,GAAG;gBACT,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,IAAI,qBAAqB,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO;gBAC1F,MAAM,EAAE;oBACJ,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,eAAe;oBACzC,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC,aAAa;iBACxC;aACJ,CAAC;QACN,CAAC;QACD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YACvB,UAAU,GAAG,IAAI,CAAC,KAAK,CACnB,IAAI,4BAAK,CAAC,OAAO,EAAE;gBACf,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,SAAS,EAAE,EAAE;gBACb,SAAS,EAAE,EAAE;gBACb,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,IAAI,EAAE,IAAI;aACb,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAChC,CAAC;QACN,CAAC;QAED,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;YACrC,MAAM,qBAAE,CAAC,OAAO,CACZ,YAAY,OAAO;iBAClB,EACD,CAAC,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAC/C,CAAC;YACD,MAAM,IAAI,GAAC,CAAC,MAAM,qBAAE,CAAC,KAAK,CAAC,mBAAmB,OAAO,iCAAiC,EAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACrI,IAAI,oBAAO,CAAC,OAAO,CAAC,CAAC,mBAAmB,CAAC;gBACrC,SAAS,EAAC;oBACN;wBACI,QAAQ,EAAC,gBAAgB,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG;wBACvD,KAAK,EAAC,CAAC;wBACP,UAAU,EAAC,IAAI,CAAC,KAAK,GAAC,EAAE;wBACxB,IAAI,EAAC,EAAE;qBACV;iBACJ;gBACD,SAAS,EAAC,IAAI,CAAC,IAAI,CAAC,YAAY;gBAChC,OAAO,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC;aACnD,EAAE,KAAK,CAAC,CAAC;QACd,CAAC;aAAM,CAAC;YACJ,MAAM,qBAAE,CAAC,OAAO,CACZ,YAAY,OAAO;iBAClB,EACD,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAChD,CAAC;QACN,CAAC;QACD,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,kBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC,CAAC;AA9PH,iBAAS,MAAM,CAAC"}
@@ -200,14 +200,17 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
200
200
  try {
201
201
  let decodeData = undefined;
202
202
  const appName = req.query['g-app'] as string;
203
+ const type=req.query['type'] as string;
203
204
  const keyData = (
204
205
  await Private_config.getConfig({
205
206
  appName: appName,
206
207
  key: 'glitter_finance',
207
208
  })
208
- )[0].value;
209
+ )[0].value[type];
209
210
 
210
- if (keyData.TYPE === 'ecPay') {
211
+
212
+
213
+ if (type === 'ecPay') {
211
214
  const responseCheckMacValue = `${req.body.CheckMacValue}`;
212
215
  delete req.body.CheckMacValue;
213
216
  const chkSum = EcPay.generateCheckMacValue(req.body, keyData.HASH_KEY, keyData.HASH_IV);
@@ -219,7 +222,7 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
219
222
  },
220
223
  };
221
224
  }
222
- if (keyData.TYPE === 'newWebPay') {
225
+ if (type === 'newWebPay') {
223
226
  decodeData = JSON.parse(
224
227
  new EzPay(appName, {
225
228
  HASH_IV: keyData.HASH_IV,
@@ -228,7 +231,7 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
228
231
  NotifyURL: '',
229
232
  ReturnURL: '',
230
233
  MERCHANT_ID: keyData.MERCHANT_ID,
231
- TYPE: keyData.TYPE,
234
+ TYPE: type,
232
235
  }).decode(req.body.TradeInfo)
233
236
  );
234
237
  }
@@ -249,7 +252,8 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
249
252
  spec:[]
250
253
  }
251
254
  ],
252
- user_info:data.note.invoice_data
255
+ user_info:data.note.invoice_data,
256
+ orderID:decodeData['Result']['MerchantOrderNo']
253
257
  }, false);
254
258
  } else {
255
259
  await db.execute(
@@ -183,11 +183,12 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
183
183
  try {
184
184
  let decodeData = undefined;
185
185
  const appName = req.query['g-app'];
186
+ const type = req.query['type'];
186
187
  const keyData = (await private_config_js_1.Private_config.getConfig({
187
188
  appName: appName,
188
189
  key: 'glitter_finance',
189
- }))[0].value;
190
- if (keyData.TYPE === 'ecPay') {
190
+ }))[0].value[type];
191
+ if (type === 'ecPay') {
191
192
  const responseCheckMacValue = `${req.body.CheckMacValue}`;
192
193
  delete req.body.CheckMacValue;
193
194
  const chkSum = financial_service_js_1.EcPay.generateCheckMacValue(req.body, keyData.HASH_KEY, keyData.HASH_IV);
@@ -199,7 +200,7 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
199
200
  },
200
201
  };
201
202
  }
202
- if (keyData.TYPE === 'newWebPay') {
203
+ if (type === 'newWebPay') {
203
204
  decodeData = JSON.parse(new financial_service_js_1.EzPay(appName, {
204
205
  HASH_IV: keyData.HASH_IV,
205
206
  HASH_KEY: keyData.HASH_KEY,
@@ -207,7 +208,7 @@ router.post('/notify', upload.single('file'), async (req, resp) => {
207
208
  NotifyURL: '',
208
209
  ReturnURL: '',
209
210
  MERCHANT_ID: keyData.MERCHANT_ID,
210
- TYPE: keyData.TYPE,
211
+ TYPE: type,
211
212
  }).decode(req.body.TradeInfo));
212
213
  }
213
214
  if (decodeData['Status'] === 'SUCCESS') {
@@ -1 +1 @@
1
- {"version":3,"file":"wallet.js","sourceRoot":"","sources":["wallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wallet.js","sourceRoot":"","sources":["wallet.ts"],"names":[],"mappings":"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"}
@@ -199,14 +199,15 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
199
199
  try {
200
200
  let decodeData = undefined;
201
201
  const appName = req.query['g-app'] as string;
202
+ const type=req.query['type'] as string;
202
203
  const keyData = (
203
204
  await Private_config.getConfig({
204
205
  appName: appName,
205
206
  key: 'glitter_finance',
206
207
  })
207
- )[0].value;
208
+ )[0].value[type];
208
209
 
209
- if (keyData.TYPE === 'ecPay') {
210
+ if (type === 'ecPay') {
210
211
  const responseCheckMacValue = `${req.body.CheckMacValue}`;
211
212
  delete req.body.CheckMacValue;
212
213
  const chkSum = EcPay.generateCheckMacValue(req.body, keyData.HASH_KEY, keyData.HASH_IV);
@@ -218,7 +219,7 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
218
219
  },
219
220
  };
220
221
  }
221
- if (keyData.TYPE === 'newWebPay') {
222
+ if (type === 'newWebPay') {
222
223
  decodeData = JSON.parse(
223
224
  new EzPay(appName, {
224
225
  HASH_IV: keyData.HASH_IV,
@@ -227,7 +228,7 @@ router.post('/notify', upload.single('file'), async (req: express.Request, resp:
227
228
  NotifyURL: '',
228
229
  ReturnURL: '',
229
230
  MERCHANT_ID: keyData.MERCHANT_ID,
230
- TYPE: keyData.TYPE,
231
+ TYPE: type,
231
232
  }).decode(req.body.TradeInfo)
232
233
  );
233
234
  }
@@ -18,17 +18,18 @@ class AiPointes {
18
18
  async store(cf) {
19
19
  const id = 'redirect_' + tool_js_1.default.randomString(6);
20
20
  await redis_js_1.default.setValue(id, cf.return_url);
21
- const keyData = (await private_config_js_1.Private_config.getConfig({
21
+ const keyData = ((await private_config_js_1.Private_config.getConfig({
22
22
  appName: this.app, key: 'glitter_finance'
23
- }))[0].value;
23
+ }))[0].value);
24
+ const kd = keyData[keyData.TYPE];
24
25
  return {
25
26
  form: (await (new financial_service_js_1.default(this.app, {
26
- "HASH_IV": keyData.HASH_IV,
27
- "HASH_KEY": keyData.HASH_KEY,
28
- "ActionURL": keyData.ActionURL,
29
- "NotifyURL": `${process.env.DOMAIN}/api-public/v1/ai/points/notify?g-app=${this.app}`,
30
- "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
31
- "MERCHANT_ID": keyData.MERCHANT_ID,
27
+ "HASH_IV": kd.HASH_IV,
28
+ "HASH_KEY": kd.HASH_KEY,
29
+ "ActionURL": kd.ActionURL,
30
+ "NotifyURL": `${process.env.DOMAIN}/api-public/v1/ai/points/notify?g-app=${this.app}&type=${keyData.TYPE}`,
31
+ "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${keyData.TYPE}`,
32
+ "MERCHANT_ID": kd.MERCHANT_ID,
32
33
  TYPE: keyData.TYPE
33
34
  }).saveWallet({
34
35
  total: cf.total,
@@ -1 +1 @@
1
- {"version":3,"file":"ai-pointes.js","sourceRoot":"","sources":["ai-pointes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ai-pointes.js","sourceRoot":"","sources":["ai-pointes.ts"],"names":[],"mappings":"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"}
@@ -25,17 +25,18 @@ export class AiPointes {
25
25
  }) {
26
26
  const id='redirect_'+Tool.randomString(6)
27
27
  await redis.setValue(id,cf.return_url)
28
- const keyData = (await Private_config.getConfig({
28
+ const keyData = ((await Private_config.getConfig({
29
29
  appName: this.app, key: 'glitter_finance'
30
- }))[0].value;
30
+ }))[0].value);
31
+ const kd=keyData[keyData.TYPE]
31
32
  return {
32
33
  form: (await (new FinancialService(this.app, {
33
- "HASH_IV": keyData.HASH_IV,
34
- "HASH_KEY": keyData.HASH_KEY,
35
- "ActionURL": keyData.ActionURL,
36
- "NotifyURL": `${process.env.DOMAIN}/api-public/v1/ai/points/notify?g-app=${this.app}`,
37
- "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
38
- "MERCHANT_ID": keyData.MERCHANT_ID,
34
+ "HASH_IV": kd.HASH_IV,
35
+ "HASH_KEY": kd.HASH_KEY,
36
+ "ActionURL": kd.ActionURL,
37
+ "NotifyURL": `${process.env.DOMAIN}/api-public/v1/ai/points/notify?g-app=${this.app}&type=${keyData.TYPE}`,
38
+ "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${keyData.TYPE}`,
39
+ "MERCHANT_ID": kd.MERCHANT_ID,
39
40
  TYPE:keyData.TYPE
40
41
  }).saveWallet({
41
42
  total: cf.total,
@@ -88,7 +88,7 @@ class Invoice {
88
88
  RespondType: 'JSON',
89
89
  Version: '1.5',
90
90
  TimeStamp: timeStamp.substring(0, timeStamp.length - 3),
91
- MerchantOrderNo: orderID,
91
+ MerchantOrderNo: (typeof orderID === 'string') ? orderID : order.orderID,
92
92
  Status: 1,
93
93
  Category: order.user_info.invoice_type === 'company' ? 'B2B' : 'B2C',
94
94
  BuyerUBN: order.user_info.invoice_type === 'company' ? order.user_info.gui_number : undefined,
@@ -1 +1 @@
1
- {"version":3,"file":"invoice.js","sourceRoot":"","sources":["invoice.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"invoice.js","sourceRoot":"","sources":["invoice.ts"],"names":[],"mappings":"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"}
@@ -74,6 +74,7 @@ export class Invoice {
74
74
  use_rebate: number;
75
75
  shipment_fee: number;
76
76
  discount: number;
77
+ orderID:number;
77
78
  } = (typeof orderID==='string') ? (
78
79
  await db.query(
79
80
  `SELECT *
@@ -126,7 +127,7 @@ export class Invoice {
126
127
  RespondType: 'JSON',
127
128
  Version: '1.5',
128
129
  TimeStamp: timeStamp.substring(0, timeStamp.length - 3),
129
- MerchantOrderNo: orderID,
130
+ MerchantOrderNo: (typeof orderID==='string') ? orderID:order.orderID,
130
131
  Status: 1,
131
132
  Category: order.user_info.invoice_type === 'company' ? 'B2B' : 'B2C',
132
133
  BuyerUBN: order.user_info.invoice_type === 'company' ? order.user_info.gui_number : undefined,
@@ -18,17 +18,18 @@ class SmsPoints {
18
18
  async store(cf) {
19
19
  const id = 'redirect_' + tool_js_1.default.randomString(6);
20
20
  await redis_js_1.default.setValue(id, cf.return_url);
21
- const keyData = (await private_config_js_1.Private_config.getConfig({
21
+ const keyData = ((await private_config_js_1.Private_config.getConfig({
22
22
  appName: this.app, key: 'glitter_finance'
23
- }))[0].value;
23
+ }))[0].value);
24
+ const kd = keyData[keyData.TYPE];
24
25
  return {
25
26
  form: (await (new financial_service_js_1.default(this.app, {
26
- "HASH_IV": keyData.HASH_IV,
27
- "HASH_KEY": keyData.HASH_KEY,
28
- "ActionURL": keyData.ActionURL,
29
- "NotifyURL": `${process.env.DOMAIN}/api-public/v1/sms/points/notify?g-app=${this.app}`,
30
- "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
31
- "MERCHANT_ID": keyData.MERCHANT_ID,
27
+ "HASH_IV": kd.HASH_IV,
28
+ "HASH_KEY": kd.HASH_KEY,
29
+ "ActionURL": kd.ActionURL,
30
+ "NotifyURL": `${process.env.DOMAIN}/api-public/v1/sms/points/notify?g-app=${this.app}&type=${keyData.TYPE}`,
31
+ "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${keyData.TYPE}`,
32
+ "MERCHANT_ID": kd.MERCHANT_ID,
32
33
  TYPE: keyData.TYPE
33
34
  }).saveWallet({
34
35
  total: cf.total,
@@ -1 +1 @@
1
- {"version":3,"file":"sms-pointes.js","sourceRoot":"","sources":["sms-pointes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sms-pointes.js","sourceRoot":"","sources":["sms-pointes.ts"],"names":[],"mappings":"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"}
@@ -25,17 +25,18 @@ export class SmsPoints {
25
25
  }) {
26
26
  const id='redirect_'+Tool.randomString(6)
27
27
  await redis.setValue(id,cf.return_url)
28
- const keyData = (await Private_config.getConfig({
28
+ const keyData = ((await Private_config.getConfig({
29
29
  appName: this.app, key: 'glitter_finance'
30
- }))[0].value;
30
+ }))[0].value);
31
+ const kd=keyData[keyData.TYPE]
31
32
  return {
32
33
  form: (await (new FinancialService(this.app, {
33
- "HASH_IV": keyData.HASH_IV,
34
- "HASH_KEY": keyData.HASH_KEY,
35
- "ActionURL": keyData.ActionURL,
36
- "NotifyURL": `${process.env.DOMAIN}/api-public/v1/sms/points/notify?g-app=${this.app}`,
37
- "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
38
- "MERCHANT_ID": keyData.MERCHANT_ID,
34
+ "HASH_IV": kd.HASH_IV,
35
+ "HASH_KEY": kd.HASH_KEY,
36
+ "ActionURL": kd.ActionURL,
37
+ "NotifyURL": `${process.env.DOMAIN}/api-public/v1/sms/points/notify?g-app=${this.app}&type=${keyData.TYPE}`,
38
+ "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${keyData.TYPE}`,
39
+ "MERCHANT_ID": kd.MERCHANT_ID,
39
40
  TYPE:keyData.TYPE
40
41
  }).saveWallet({
41
42
  total: cf.total,
@@ -21,14 +21,15 @@ class Wallet {
21
21
  const keyData = (await private_config_js_1.Private_config.getConfig({
22
22
  appName: this.app, key: 'glitter_finance'
23
23
  }))[0].value;
24
+ const kd = keyData[keyData.TYPE];
24
25
  return {
25
26
  form: (await (new financial_service_js_1.default(this.app, {
26
- "HASH_IV": keyData.HASH_IV,
27
- "HASH_KEY": keyData.HASH_KEY,
28
- "ActionURL": keyData.ActionURL,
29
- "NotifyURL": `${process.env.DOMAIN}/api-public/v1/wallet/notify?g-app=${this.app}`,
30
- "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
31
- "MERCHANT_ID": keyData.MERCHANT_ID,
27
+ "HASH_IV": kd.HASH_IV,
28
+ "HASH_KEY": kd.HASH_KEY,
29
+ "ActionURL": kd.ActionURL,
30
+ "NotifyURL": `${process.env.DOMAIN}/api-public/v1/wallet/notify?g-app=${this.app}&type=${keyData.TYPE}`,
31
+ "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${keyData.TYPE}`,
32
+ "MERCHANT_ID": kd.MERCHANT_ID,
32
33
  TYPE: keyData.TYPE
33
34
  }).saveWallet({
34
35
  total: cf.total,
@@ -1 +1 @@
1
- {"version":3,"file":"wallet.js","sourceRoot":"","sources":["wallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wallet.js","sourceRoot":"","sources":["wallet.ts"],"names":[],"mappings":"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"}
@@ -27,15 +27,15 @@ export class Wallet {
27
27
  const keyData = (await Private_config.getConfig({
28
28
  appName: this.app, key: 'glitter_finance'
29
29
  }))[0].value;
30
-
30
+ const kd=keyData[keyData.TYPE]
31
31
  return {
32
32
  form: (await (new FinancialService(this.app, {
33
- "HASH_IV": keyData.HASH_IV,
34
- "HASH_KEY": keyData.HASH_KEY,
35
- "ActionURL": keyData.ActionURL,
36
- "NotifyURL": `${process.env.DOMAIN}/api-public/v1/wallet/notify?g-app=${this.app}`,
37
- "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
38
- "MERCHANT_ID": keyData.MERCHANT_ID,
33
+ "HASH_IV": kd.HASH_IV,
34
+ "HASH_KEY": kd.HASH_KEY,
35
+ "ActionURL": kd.ActionURL,
36
+ "NotifyURL": `${process.env.DOMAIN}/api-public/v1/wallet/notify?g-app=${this.app}&type=${keyData.TYPE}`,
37
+ "ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${keyData.TYPE}`,
38
+ "MERCHANT_ID": kd.MERCHANT_ID,
39
39
  TYPE:keyData.TYPE
40
40
  }).saveWallet({
41
41
  total: cf.total,