Commit b757781b3426bc933cdba9b049e6ce8d0ee59669
1 parent
a4da6703
Exists in
master
and in
3 other branches
X
Showing
3 changed files
with
59 additions
and
9 deletions
Show diff stats
wxsdk/base/SDKConst.ts
| @@ -33,7 +33,7 @@ export const GAMEDATA = { | @@ -33,7 +33,7 @@ export const GAMEDATA = { | ||
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | // sdk版本 | 35 | // sdk版本 |
| 36 | -export const SDKVersion = 'v1.0.7'; | 36 | +export const SDKVersion = 'v1.0.8'; |
| 37 | // 是否打印 | 37 | // 是否打印 |
| 38 | export const __LOG__ = false; | 38 | export const __LOG__ = false; |
| 39 | // 是否mock | 39 | // 是否mock |
| @@ -108,7 +108,7 @@ export const HostKeys = { | @@ -108,7 +108,7 @@ export const HostKeys = { | ||
| 108 | behavior: 'api/douyin/behavior', //抖音投放关键行为 | 108 | behavior: 'api/douyin/behavior', //抖音投放关键行为 |
| 109 | attribute: 'api/member/attribute/set', //修改用户属性 | 109 | attribute: 'api/member/attribute/set', //修改用户属性 |
| 110 | //订单 | 110 | //订单 |
| 111 | - orderReport: 'api/order/v2/mimas', //订单信息上报 | 111 | + orderReport: 'api/order/v2/mimas/new', //订单信息上报 |
| 112 | orderQuery: 'api/order/query', //订单信息查询 | 112 | orderQuery: 'api/order/query', //订单信息查询 |
| 113 | preorder: 'api/order/v2/preorder', //获取支付方式 | 113 | preorder: 'api/order/v2/preorder', //获取支付方式 |
| 114 | // | 114 | // |
wxsdk/service/DataService.ts
| @@ -14,6 +14,16 @@ export default class DataService { | @@ -14,6 +14,16 @@ export default class DataService { | ||
| 14 | 14 | ||
| 15 | private constructor() { | 15 | private constructor() { |
| 16 | this._data = new SdkData; | 16 | this._data = new SdkData; |
| 17 | + // 0点数据变动 | ||
| 18 | + let expiration = +((this.nextDay() - Date.now()) / 1000).toFixed(0); | ||
| 19 | + setTimeout(this.resetData, expiration * 1000); | ||
| 20 | + | ||
| 21 | + } | ||
| 22 | + | ||
| 23 | + private resetData(){ | ||
| 24 | + this.setPtm(0);//更新当天是否300s | ||
| 25 | + this.setLogindays(this.logindays+1);// 更新登录天数 | ||
| 26 | + this.setIsnew(0);//更新新老用户 | ||
| 17 | } | 27 | } |
| 18 | 28 | ||
| 19 | setValue(key: string, val: any) { | 29 | setValue(key: string, val: any) { |
wxsdk/wx/WxPay.ts
| @@ -25,10 +25,31 @@ export default class WxPay { | @@ -25,10 +25,31 @@ export default class WxPay { | ||
| 25 | buyQuantity: params.money / 10, | 25 | buyQuantity: params.money / 10, |
| 26 | zoneId: ZoneId | 26 | zoneId: ZoneId |
| 27 | }; | 27 | }; |
| 28 | - console.log(pms); | ||
| 29 | - WxApi.I.requestMidasPayment(pms) | ||
| 30 | - .then(() => this.handlePaySuccess({ ...params, platform }, opts, resolve, reject)) | ||
| 31 | - .catch(err => this.handlePayError(err, reject)); | 28 | + let extend = ""; |
| 29 | + for (let key in opts) { | ||
| 30 | + extend += (`${key}=${opts[key]}&`) | ||
| 31 | + } | ||
| 32 | + extend = extend.substring(0, extend.length - 1); | ||
| 33 | + extend = encodeURIComponent(extend); | ||
| 34 | + | ||
| 35 | + let payParams = { | ||
| 36 | + ...this.buildParams(), | ||
| 37 | + extend, | ||
| 38 | + midasenv: DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1, | ||
| 39 | + orderid: params.orderid, | ||
| 40 | + payid: params.payid, | ||
| 41 | + goodid: params.goodid, | ||
| 42 | + type: 0, | ||
| 43 | + money: params.money, | ||
| 44 | + platform | ||
| 45 | + }; | ||
| 46 | + SDKApi.pay(payParams).then(res => { | ||
| 47 | + if (!res.code) { | ||
| 48 | + WxApi.I.requestMidasPayment(pms) | ||
| 49 | + .then(() => this.handlePaySuccess({ ...params, platform }, opts, resolve, reject)) | ||
| 50 | + .catch(err => this.handlePayError({ ...params, platform }, opts, err, reject)); | ||
| 51 | + } | ||
| 52 | + }) | ||
| 32 | }); | 53 | }); |
| 33 | } | 54 | } |
| 34 | 55 | ||
| @@ -43,7 +64,6 @@ export default class WxPay { | @@ -43,7 +64,6 @@ export default class WxPay { | ||
| 43 | extend = encodeURIComponent(extend); | 64 | extend = encodeURIComponent(extend); |
| 44 | let params = { | 65 | let params = { |
| 45 | ...this.buildParams(), | 66 | ...this.buildParams(), |
| 46 | - ...opts, | ||
| 47 | extend, | 67 | extend, |
| 48 | midasenv: DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1, | 68 | midasenv: DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1, |
| 49 | orderid: data.orderid, | 69 | orderid: data.orderid, |
| @@ -65,11 +85,31 @@ export default class WxPay { | @@ -65,11 +85,31 @@ export default class WxPay { | ||
| 65 | }, t); | 85 | }, t); |
| 66 | } | 86 | } |
| 67 | }) | 87 | }) |
| 68 | - .catch(err => this.handlePayError(err, reject)); | ||
| 69 | } | 88 | } |
| 70 | 89 | ||
| 71 | - private handlePayError(err: any, reject: any) { | 90 | + private handlePayError(data: { payid: string, goodid: string, money: number; orderid: string, platform: string }, opts, err: any, reject: any) { |
| 72 | console.log("支付失败", JSON.stringify(err)); | 91 | console.log("支付失败", JSON.stringify(err)); |
| 92 | + let type = 2; | ||
| 93 | + if (err.code + '' == '-2') { | ||
| 94 | + type = 3; | ||
| 95 | + } | ||
| 96 | + let extend = ""; | ||
| 97 | + for (let key in opts) { | ||
| 98 | + extend += (`${key}=${opts[key]}&`) | ||
| 99 | + } | ||
| 100 | + extend = extend.substring(0, extend.length - 1); | ||
| 101 | + extend = encodeURIComponent(extend); | ||
| 102 | + let params = { | ||
| 103 | + ...this.buildParams(), | ||
| 104 | + extend, | ||
| 105 | + midasenv: DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1, | ||
| 106 | + orderid: data.orderid, | ||
| 107 | + payid: data.payid, goodid: data.goodid, | ||
| 108 | + type, | ||
| 109 | + money: data.money, | ||
| 110 | + platform: data.platform | ||
| 111 | + }; | ||
| 112 | + SDKApi.pay(params) | ||
| 73 | reject(err); | 113 | reject(err); |
| 74 | } | 114 | } |
| 75 | 115 |