diff --git a/wxsdk/base/SDKConst.ts b/wxsdk/base/SDKConst.ts index 204ae81..e3510b1 100644 --- a/wxsdk/base/SDKConst.ts +++ b/wxsdk/base/SDKConst.ts @@ -33,7 +33,7 @@ export const GAMEDATA = { } // sdk版本 -export const SDKVersion = 'v1.0.7'; +export const SDKVersion = 'v1.0.8'; // 是否打印 export const __LOG__ = false; // 是否mock @@ -108,7 +108,7 @@ export const HostKeys = { behavior: 'api/douyin/behavior', //抖音投放关键行为 attribute: 'api/member/attribute/set', //修改用户属性 //订单 - orderReport: 'api/order/v2/mimas', //订单信息上报 + orderReport: 'api/order/v2/mimas/new', //订单信息上报 orderQuery: 'api/order/query', //订单信息查询 preorder: 'api/order/v2/preorder', //获取支付方式 // diff --git a/wxsdk/service/DataService.ts b/wxsdk/service/DataService.ts index 085a3bf..5938901 100644 --- a/wxsdk/service/DataService.ts +++ b/wxsdk/service/DataService.ts @@ -14,6 +14,16 @@ export default class DataService { private constructor() { this._data = new SdkData; + // 0点数据变动 + let expiration = +((this.nextDay() - Date.now()) / 1000).toFixed(0); + setTimeout(this.resetData, expiration * 1000); + + } + + private resetData(){ + this.setPtm(0);//更新当天是否300s + this.setLogindays(this.logindays+1);// 更新登录天数 + this.setIsnew(0);//更新新老用户 } setValue(key: string, val: any) { diff --git a/wxsdk/wx/WxPay.ts b/wxsdk/wx/WxPay.ts index de30733..fa73528 100644 --- a/wxsdk/wx/WxPay.ts +++ b/wxsdk/wx/WxPay.ts @@ -25,10 +25,31 @@ export default class WxPay { buyQuantity: params.money / 10, zoneId: ZoneId }; - console.log(pms); - WxApi.I.requestMidasPayment(pms) - .then(() => this.handlePaySuccess({ ...params, platform }, opts, resolve, reject)) - .catch(err => this.handlePayError(err, reject)); + let extend = ""; + for (let key in opts) { + extend += (`${key}=${opts[key]}&`) + } + extend = extend.substring(0, extend.length - 1); + extend = encodeURIComponent(extend); + + let payParams = { + ...this.buildParams(), + extend, + midasenv: DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1, + orderid: params.orderid, + payid: params.payid, + goodid: params.goodid, + type: 0, + money: params.money, + platform + }; + SDKApi.pay(payParams).then(res => { + if (!res.code) { + WxApi.I.requestMidasPayment(pms) + .then(() => this.handlePaySuccess({ ...params, platform }, opts, resolve, reject)) + .catch(err => this.handlePayError({ ...params, platform }, opts, err, reject)); + } + }) }); } @@ -43,7 +64,6 @@ export default class WxPay { extend = encodeURIComponent(extend); let params = { ...this.buildParams(), - ...opts, extend, midasenv: DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1, orderid: data.orderid, @@ -65,11 +85,31 @@ export default class WxPay { }, t); } }) - .catch(err => this.handlePayError(err, reject)); } - private handlePayError(err: any, reject: any) { + private handlePayError(data: { payid: string, goodid: string, money: number; orderid: string, platform: string }, opts, err: any, reject: any) { console.log("支付失败", JSON.stringify(err)); + let type = 2; + if (err.code + '' == '-2') { + type = 3; + } + let extend = ""; + for (let key in opts) { + extend += (`${key}=${opts[key]}&`) + } + extend = extend.substring(0, extend.length - 1); + extend = encodeURIComponent(extend); + let params = { + ...this.buildParams(), + extend, + midasenv: DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1, + orderid: data.orderid, + payid: data.payid, goodid: data.goodid, + type, + money: data.money, + platform: data.platform + }; + SDKApi.pay(params) reject(err); } -- libgit2 0.21.0