change sth

This commit is contained in:
CounterFire2023 2023-07-12 16:59:38 +08:00
parent 3d36b846be
commit 8ade5239df
3 changed files with 14 additions and 6 deletions

View File

@ -56,17 +56,17 @@ export class ERC721Reactor {
chain, chain,
address, address,
to, to,
count, amount,
encodeABI = false, encodeABI = false,
}: { }: {
chain: number chain: number
address?: string address?: string
to: string to: string
count: number amount: number
encodeABI?: boolean encodeABI?: boolean
}) { }) {
const { instance, account } = new ChainCache().getInstances(chain, address, abiBadge) const { instance, account } = new ChainCache().getInstances(chain, address, abiBadge)
const countStr = count + '' const countStr = amount + ''
if (encodeABI) { if (encodeABI) {
return instance.methods.batchMint(to, countStr).encodeABI() return instance.methods.batchMint(to, countStr).encodeABI()
} }

View File

@ -64,6 +64,7 @@ class WorkFlowController extends BaseController {
} }
const taskObj = { const taskObj = {
id: chainTask.id, id: chainTask.id,
chain: chainTask.chain,
name: chainTask.name, name: chainTask.name,
desc: chainTask.desc, desc: chainTask.desc,
starterName: chainTask.starterName, starterName: chainTask.starterName,
@ -119,7 +120,7 @@ class WorkFlowController extends BaseController {
// let fileId = 'WWME_g-oYEAAACj738mha3is3XxxDavhb5w' // let fileId = 'WWME_g-oYEAAACj738mha3is3XxxDavhb5w'
// await new WechatWorkService().fetchFile(fileId, true) // await new WechatWorkService().fetchFile(fileId, true)
// console.log('11') // console.log('11')
let spNo = '202305090004' let spNo = '202307120001'
new TaskQueue().addTaskToQueue(spNo) new TaskQueue().addTaskToQueue(spNo)
// let task = await ChainTask.findById('642fe42611845ce0e1def316') // let task = await ChainTask.findById('642fe42611845ce0e1def316')
// for (let tid of task.tasks) { // for (let tid of task.tasks) {

View File

@ -7,7 +7,7 @@ import { TaskSvr } from 'service/task.service'
import { generateRandomBytes32 } from 'utils/wallet.util' import { generateRandomBytes32 } from 'utils/wallet.util'
import { BaseModule } from './Base' import { BaseModule } from './Base'
import { ReqTaskStatus, RequestTask, RequestTaskClass } from './RequestTask' import { ReqTaskStatus, RequestTask, RequestTaskClass, TaskType } from './RequestTask'
export enum TaskStatus { export enum TaskStatus {
NOTSTART = 0, NOTSTART = 0,
@ -151,9 +151,16 @@ export class ChainTaskClass extends BaseModule {
if (chainTask.newRecord) { if (chainTask.newRecord) {
let subTask let subTask
let index = 0 let index = 0
let count = 0
for (let sub of data) { for (let sub of data) {
if (!subTask || subTask.reqDatas.length >= MAX_BATCH_REQ_COUNT) { if (sub.type == TaskType.MINT_NFT && sub.amount && parseInt(sub.amount) > 1) {
count += parseInt(sub.amount)
} else {
count += 1
}
if (!subTask || count >= MAX_BATCH_REQ_COUNT) {
index += 1 index += 1
count = sub.type === TaskType.MINT_NFT && sub.amount && parseInt(sub.amount) > 1 ? parseInt(sub.amount) : 1
subTask = new RequestTask({ subTask = new RequestTask({
taskId, taskId,
index, index,