From 8ade5239df2414ca61774ccc5ffa145438f2df0a Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Wed, 12 Jul 2023 16:59:38 +0800
Subject: [PATCH] change sth

---
 src/chain/ERC721Reactor.ts             |  6 +++---
 src/controllers/workflow.controller.ts |  3 ++-
 src/models/ChainTask.ts                | 11 +++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/chain/ERC721Reactor.ts b/src/chain/ERC721Reactor.ts
index a7782b8..9e71d10 100644
--- a/src/chain/ERC721Reactor.ts
+++ b/src/chain/ERC721Reactor.ts
@@ -56,17 +56,17 @@ export class ERC721Reactor {
     chain,
     address,
     to,
-    count,
+    amount,
     encodeABI = false,
   }: {
     chain: number
     address?: string
     to: string
-    count: number
+    amount: number
     encodeABI?: boolean
   }) {
     const { instance, account } = new ChainCache().getInstances(chain, address, abiBadge)
-    const countStr = count + ''
+    const countStr = amount + ''
     if (encodeABI) {
       return instance.methods.batchMint(to, countStr).encodeABI()
     }
diff --git a/src/controllers/workflow.controller.ts b/src/controllers/workflow.controller.ts
index d71af84..4273fec 100644
--- a/src/controllers/workflow.controller.ts
+++ b/src/controllers/workflow.controller.ts
@@ -64,6 +64,7 @@ class WorkFlowController extends BaseController {
     }
     const taskObj = {
       id: chainTask.id,
+      chain: chainTask.chain,
       name: chainTask.name,
       desc: chainTask.desc,
       starterName: chainTask.starterName,
@@ -119,7 +120,7 @@ class WorkFlowController extends BaseController {
     // let fileId = 'WWME_g-oYEAAACj738mha3is3XxxDavhb5w'
     // await new WechatWorkService().fetchFile(fileId, true)
     // console.log('11')
-    let spNo = '202305090004'
+    let spNo = '202307120001'
     new TaskQueue().addTaskToQueue(spNo)
     // let task = await ChainTask.findById('642fe42611845ce0e1def316')
     // for (let tid of task.tasks) {
diff --git a/src/models/ChainTask.ts b/src/models/ChainTask.ts
index 878ab73..067bb2c 100644
--- a/src/models/ChainTask.ts
+++ b/src/models/ChainTask.ts
@@ -7,7 +7,7 @@ import { TaskSvr } from 'service/task.service'
 import { generateRandomBytes32 } from 'utils/wallet.util'
 
 import { BaseModule } from './Base'
-import { ReqTaskStatus, RequestTask, RequestTaskClass } from './RequestTask'
+import { ReqTaskStatus, RequestTask, RequestTaskClass, TaskType } from './RequestTask'
 
 export enum TaskStatus {
   NOTSTART = 0,
@@ -151,9 +151,16 @@ export class ChainTaskClass extends BaseModule {
     if (chainTask.newRecord) {
       let subTask
       let index = 0
+      let count = 0
       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
+          count = sub.type === TaskType.MINT_NFT && sub.amount && parseInt(sub.amount) > 1 ? parseInt(sub.amount) : 1
           subTask = new RequestTask({
             taskId,
             index,