diff --git a/src/main/resources/test_assets.js b/src/main/resources/test_assets.js index f9a1094..fd56950 100644 --- a/src/main/resources/test_assets.js +++ b/src/main/resources/test_assets.js @@ -27,7 +27,8 @@ let roleMap = { "417040678_m":"斌子怪", "jd_73d88459d908e":"杰杰子", "381550701lol":"漪漪子", - "jd_4333d5dc1ac5f":"舒楠子" + "jd_4333d5dc1ac5f":"舒楠子", + "realm_":"泽子怪" } let dingtalk = "https://oapi.dingtalk.com/robot/send?access_token=d2b6042cb38f0df63e20797c002208d2710104750c18a1dc84d54106a859a3f0" const $ = new Env('京东资产变动通知'); diff --git a/src/main/resources/test_assets_new.js b/src/main/resources/test_assets_new.js index 0494fe1..990311a 100644 --- a/src/main/resources/test_assets_new.js +++ b/src/main/resources/test_assets_new.js @@ -9,7 +9,8 @@ let roleMap = { "417040678_m":"斌子怪", "jd_73d88459d908e":"杰杰子", "381550701lol":"漪漪子", - "jd_4333d5dc1ac5f":"舒楠子" + "jd_4333d5dc1ac5f":"舒楠子", + "realm_":"泽子怪" } let dingtalk = "https://oapi.dingtalk.com/robot/send?access_token=d2b6042cb38f0df63e20797c002208d2710104750c18a1dc84d54106a859a3f0" //更新by ccwav,20210821 diff --git a/src/main/resources/test_getTuanBean.js b/src/main/resources/test_getTuanBean.js index 20eaca7..78ddee6 100644 --- a/src/main/resources/test_getTuanBean.js +++ b/src/main/resources/test_getTuanBean.js @@ -21,6 +21,7 @@ let roleMap = { } let dingtalk = "https://oapi.dingtalk.com/robot/send?access_token=d2b6042cb38f0df63e20797c002208d2710104750c18a1dc84d54106a859a3f0" let username = "" +let helpTuanLenght = 3 if ($.isNode()) { @@ -84,7 +85,12 @@ const JD_API_HOST = 'https://api.m.jd.com/api'; $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1]) if ($.canHelp && (cookiesArr.length > $.assistNum)) { if (tuanList.length) that.log(`开始账号内部互助 赚京豆-瓜分京豆 活动,优先内部账号互助`) + for (let j = 0; j < tuanList.length; ++j) { + message += "" + `开团码 【${tuanList[j]['assistedPinEncrypted']}】` + " \n\n" + } + + for (let j = 0; j < tuanList.length && j < helpTuanLenght; ++j) { that.log(`账号 ${$.UserName} 开始给 【${tuanList[j]['assistedPinEncrypted']}】助力`) message += "" + `账号 ${$.UserName} 开始给 【${tuanList[j]['assistedPinEncrypted']}】助力` + " \n\n" await helpFriendTuan(tuanList[j]) @@ -549,6 +555,7 @@ async function distributeBeanActivity() { await getUserTuanInfo() if (!$.tuan && ($.assistStatus === 3 || $.assistStatus === 2 || $.assistStatus === 0) && $.canStartNewAssist) { that.log(`准备再次开团`) + message += "" + '助力结果:助力成功\n' + " \n\n" await openTuan() if ($.hasOpen) await getUserTuanInfo() } @@ -585,14 +592,36 @@ function helpFriendTuan(body) { if (safeGet(data)) { data = JSON.parse(data); if (data.success) { + message += "" + '助力结果:助力成功\n' + " \n\n" that.log('助力结果:助力成功\n') } else { - if (data.resultCode === '9200008') that.log('助力结果:不能助力自己\n') - else if (data.resultCode === '9200011') that.log('助力结果:已经助力过\n') - else if (data.resultCode === '2400205') that.log('助力结果:团已满\n') - else if (data.resultCode === '2400203') { that.log('助力结果:助力次数已耗尽\n'); $.canHelp = false } - else if (data.resultCode === '9000000') { that.log('助力结果:活动火爆,跳出\n'); $.canHelp = false } - else that.log(`助力结果:未知错误\n${JSON.stringify(data)}\n\n`) + if (data.resultCode === '9200008') { + that.log('助力结果:不能助力自己\n') + message += "" + '助力结果:不能助力自己\n' + " \n\n" + } + else if (data.resultCode === '9200011') { + that.log('助力结果:已经助力过\n') + message += "" + '助力结果:已经助力过\n' + " \n\n" + } + else if (data.resultCode === '2400205') { + that.log('助力结果:团已满\n') + message += "" + '助力结果:团已满\n' + " \n\n" + } + else if (data.resultCode === '2400203') { + that.log('助力结果:助力次数已耗尽\n'); + $.canHelp = false + message += "" + '助力结果:助力次数已耗尽\n' + " \n\n" + } + + else if (data.resultCode === '9000000') { + that.log('助力结果:活动火爆,跳出\n'); + $.canHelp = false + message += "" + '助力结果:活动火爆,跳出\n' + " \n\n" + } + else { + that.log(`助力结果:未知错误\n${JSON.stringify(data)}\n\n`) + message += "" + `助力结果:未知错误\n${JSON.stringify(data)}\n\n` + " \n\n" + } } } } @@ -621,10 +650,13 @@ function getUserTuanInfo() { that.log(`assistStatus ${data.data.assistStatus}`) if (data.data.assistStatus === 1 && !data.data.canStartNewAssist) { that.log(`已开团(未达上限),但团成员人未满\n\n`) + message += "" + `已开团(未达上限),但团成员人未满` + " \n\n" } else if (data.data.assistStatus === 3 && data.data.canStartNewAssist) { that.log(`已开团(未达上限),团成员人已满\n\n`) + message += "" + `已开团(未达上限),团成员人已满` + " \n\n" } else if (data.data.assistStatus === 3 && !data.data.canStartNewAssist) { that.log(`今日开团已达上限,且当前团成员人已满\n\n`) + message += "" + `今日开团已达上限,且当前团成员人已满` + " \n\n" } if (data.data && !data.data.canStartNewAssist) { $.tuan = { diff --git a/src/main/resources/test_sendBean.js b/src/main/resources/test_sendBean.js index 34aced1..190e4cb 100644 --- a/src/main/resources/test_sendBean.js +++ b/src/main/resources/test_sendBean.js @@ -82,7 +82,8 @@ if ($.isNode()) { } console.log('\n开团信息\n'+JSON.stringify(openTuanList)); console.log(`\n开始互助\n`); - let ckList = getRandomArrayElements(cookiesArr,cookiesArr.length); + let ckList = [] + ckList = getRandomArrayElements(cookiesArr,cookiesArr.length); for (let i = 0; i < ckList.length && openTuanList.length > 0; i++) { $.cookie = ckList[i]; diff --git a/src/main/resources/test_trytryOne.js b/src/main/resources/test_trytryOne.js index 1386887..f39dc70 100644 --- a/src/main/resources/test_trytryOne.js +++ b/src/main/resources/test_trytryOne.js @@ -35,7 +35,8 @@ let roleMap = { "381550701lol": "漪漪子", "jd_4333d5dc1ac5f": "舒楠子", "jd_66ea783827d30": "军子", - "jd_4311ac0ff4456": "居子" + "jd_4311ac0ff4456": "居子", + "realm_":"泽子怪" } const URL = 'https://api.m.jd.com/client.action'