shawenguan 1 éve
szülő
commit
7db9e73d66

+ 1 - 1
Scripts/hbcpre/hbcpreComposite.js

@@ -316,7 +316,7 @@ async function tryOneComposite(activityId){
         return;
     }
     if(result.code == 200){
-        magicJS.notification.appendNotifyInfo(`🎉合成<${activityData.eventsName}>合成成功`);
+        magicJS.notification.appendNotifyInfo(`🎉合成<${activityData.eventsName}>合成成功,合成品:${result.data?.worksName}#${result.data?.worksNo}!`);
         // 刷新合成数据
         activityData = await getCompositeList(activityId);
         saveActivitDataCache(1, activityData, false);

+ 1 - 1
Scripts/hbcpre/hbcpreExchange.js

@@ -316,7 +316,7 @@ async function tryOneExchange(activityId){
         return;
     }
     if(result.code == 200){
-        magicJS.notification.appendNotifyInfo(`🎉兑换<${activityData.eventsName}>兑换成功`);
+        magicJS.notification.appendNotifyInfo(`🎉兑换<${activityData.eventsName}>兑换成功,兑换品:${result.data?.worksName}#${result.data?.worksNo}!`);
         // 刷新兑换数据
         activityData = await getCompositeList(activityId);
         saveActivitDataCache(3, activityData, false);

+ 2 - 2
Scripts/hbcpre/hbcpreHelper.js

@@ -781,10 +781,10 @@ function formatNumberWithKAndW(n) {
     if (n >= 1000 && n < 10000) {
         return (n / 1000).toFixed(1) + 'k';
     }
-    if (n >= 10000 && n < 100000) {
+    if (n >= 10000 && n < 1000000) {
         return (n / 10000).toFixed(1) + 'w';
     }
-    return (n / 100000).toFixed(1) + 'w';
+    return (n / 1000000).toFixed(1) + 'm';
 }
 
 function handlerMySeriesList() {

+ 58 - 0
Scripts/hbcpre/hbcpreOrder.js

@@ -270,6 +270,7 @@ async function doNormalOrder(iData, willPrice, priceFloatInterval){
                     } else {
                         magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, 'https://luanshu.hbcpre.com/order/ls/?id=2');
                     }
+                    await checkAuthority();
                 }
             } else {
                 magicJS.logger.info(buyRet.message);
@@ -409,6 +410,63 @@ async function doOrderPay(payType, orderId) {
     return null;
 }
 
+async function checkAuthority(){
+    let reqData = {
+        address: gAppToken,
+    };
+    const headers = gCommonHeaders;
+    const md5 = createWMd5();
+    headers['trans-id'] = md5.hex_md5_32Upper(`${new Date().getTime()}`);
+    const baseConfig = getBaseConfig();
+    let api = '/mall/collector/checkAuthority';
+    let url = `${baseConfig.api_host}${api}`;
+    const options = {
+        url: url,
+        headers: headers,
+        body: `${magicJS.objToQueryStr(reqData)}`,
+    };
+    magicJS.logger.info(`检查刷新token`);
+    let result = await magicJS.http.post(options).then(response => {
+        try {
+            const body = response.body;
+            if (typeof body === "object") {
+                // magicJS.logger.log(JSON.stringify(body));
+                if(body.code == 200){
+                    let headers = response.headers;
+                    if(headers['Set-Cookie']){
+                        let newAuthorization = null;
+                        let cookieSetStr = headers['Set-Cookie'];
+                        let cookieData = magicJs.parseSetCookies(cookieSetStr);
+                        for(let i=0; i < cookieData.length; i++){
+                            let info = cookieData[i];
+                            let name = info.name;
+                            let value = info.value;
+                            if(value == ''){
+                                continue;
+                            }
+                            if(name == 'JSESSIONID'){
+                                if(gAppToken != value){
+                                    gAppToken = value;
+                                    updateRequestHeaders();
+                                    magicJS.logger.info('token发生变化');
+                                } else {
+                                    magicJS.logger.info('token没有变化');
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return body;
+        } catch (e) {
+            magicJS.logger.error(e);
+        }
+    }).catch(err => {
+        const msg = `发生异常\n${JSON.stringify(err)}`;
+        magicJS.logger.error(msg);
+    });
+}
+
 async function browserOpenUrl(url, headers) {
     let options = {
         url: `${url}`,