费率定时任务相关修改

cron/model/task.fee.rate.log.model.ts

@@ -118,7 +118,7 @@ export const changeUserSpotFee = async function (user_id, symbol, fee_model, mak
     let pair = symbol === 'all' ? '' : symbol;
     let is_success = true;
     await checkFeeModel(fee_model);
-    let product_type = pair == 'all' ? 'spot' : 'single';
+    let product_type = symbol == 'all' ? 'spot' : 'single';
     let opt_market = product_type;
     //生效的费率 与要设置的费率 比对做校验 现在分不开 现货  合约 先不校验  之后分开了 再校验
      let feeExist = await cancelIfFeeExist(user_id, product_type, symbol, maker_fee, taker_fee);
@@ -160,7 +160,7 @@ export const changeUserContractFee = async function (user_id, symbol, fee_model,
     let pair = symbol === 'all' ? '' : symbol;
 
     let is_success = true;
-    let product_type = pair == 'all' ? 'lpc' : 'single';
+    let product_type = symbol == 'all' ? 'lpc' : 'single';
     let opt_market = product_type;
     let feeExist = await cancelIfFeeExist(user_id, product_type, symbol, maker_fee, taker_fee);
     if (feeExist) {

cron/task/task_fee_rate_base_coin_contract_log.ts

@@ -208,17 +208,8 @@ async function setExpiredDefault() {
         },
         raw: true,
     });
-    let defaultFeeObj = {}, max_maker_rate = 0.0004, max_taker_rate = 0.0006;  // 2020.5.9
-    for (let i = 0; i < defaultPairFee.length; i++) {
-        let { symbol, maker_fee, taker_fee } = defaultPairFee[i];
-        defaultFeeObj[symbol] = defaultPairFee[i];
-        if (max_maker_rate < maker_fee) {
-            max_maker_rate = maker_fee;
-        }
-        if (max_taker_rate < taker_fee) {
-            max_taker_rate = taker_fee;
-        }
-    }
+    let init_maker_rate = 1, init_taker_rate = 1;  // maker_fee 和 taker_fee 同时为1 代表初始化用户费率
+
     let newFeeArr: any = [];
     let beginAt = new Date();
     for (let i = 0; i < expirdFees.length; i++) {
@@ -227,24 +218,15 @@ async function setExpiredDefault() {
             continue;
         }
 
-        let new_maker_fee = max_maker_rate, new_taker_fee = max_taker_rate;
         if (unCheckCountObj[user_id] > 0) { // 已经存在
             continue;
         }
-        if (defaultFeeObj[pair]) {
-            let { maker_fee, taker_fee } = defaultFeeObj[pair];
-            new_maker_fee = maker_fee;
-            new_taker_fee = taker_fee;
-            if (new_maker_fee === before_maker_fee && new_taker_fee === before_taker_fee) {
-                continue
-            }
-        }
         newFeeArr.push({
             user_id,
             pair: pair,
             fee_model,
-            maker_fee: new_maker_fee,
-            taker_fee: new_taker_fee,
+            maker_fee: init_maker_rate,
+            taker_fee: init_taker_rate,
             beginAt: beginAt,
             expireAt: new Date(beginAt.getTime() + oneMonth),
             is_check: feeRateCheckStatus.CHECK_STATUS_UNCHECK,

cron/task/task_fee_rate_contract_log.ts

@@ -205,29 +205,13 @@ async function setExpiredDefault() {
         let { user_id, amount } = uncheckCounts[i];
         unCheckCountObj[user_id] = amount;
     }
-    let defaultPairFee = await contractPairs.prototype.findAll({
-        attributes: ['taker_fee', 'maker_fee', 'symbol'],
-        where: {
-            status: 2
-        },
-        raw: true,
-    });
-    let defaultFeeObj = {}, max_maker_rate = 0.0004, max_taker_rate = 0.0006;  // 2020.5.9
-    for (let i = 0; i < defaultPairFee.length; i++) {
-        let { symbol, maker_fee, taker_fee } = defaultPairFee[i];
-        defaultFeeObj[symbol] = defaultPairFee[i];
-        if (max_maker_rate < maker_fee) {
-            max_maker_rate = maker_fee;
-        }
-        if (max_taker_rate < taker_fee) {
-            max_taker_rate = taker_fee;
-        }
-    }
+
+    let init_maker_rate = 1, init_taker_rate = 1;  // maker_fee 和 taker_fee 同时为1 代表初始化用户费率
+
     let newFeeArr: any = [];
     let beginAt = new Date();
     for (let i = 0; i < expirdFees.length; i++) {
         let { pair, fee_model, user_id, maker_fee: before_maker_fee, taker_fee: before_taker_fee } = expirdFees[i];
-        let new_maker_fee = max_maker_rate, new_taker_fee = max_taker_rate;
 
         if (await isWhiteListUser(user_id)) {
             continue;
@@ -235,20 +219,12 @@ async function setExpiredDefault() {
         if (unCheckCountObj[user_id] > 0) { // 已经存在
             continue;
         }
-        if (defaultFeeObj[pair]) {
-            let { maker_fee, taker_fee } = defaultFeeObj[pair];
-            new_maker_fee = maker_fee;
-            new_taker_fee = taker_fee;
-            if (new_maker_fee === before_maker_fee && new_taker_fee === before_taker_fee) {
-                continue
-            }
-        }
         newFeeArr.push({
             user_id,
             pair: pair,
             fee_model,
-            maker_fee: new_maker_fee,
-            taker_fee: new_taker_fee,
+            maker_fee: init_maker_rate,
+            taker_fee: init_taker_rate,
             beginAt: beginAt,
             expireAt: new Date(beginAt.getTime() + oneMonth),
             is_check: feeRateCheckStatus.CHECK_STATUS_UNCHECK,

cron/task/task_fee_rate_spot_log.ts

@@ -231,26 +231,18 @@ async function setExpiredDefault() {
         },
         raw: true,
     });
-    let defaultFeeObj = {}, max_maker_rate = 0.001, max_taker_rate = 0.002;  // 2020.5.9
+    let init_maker_rate = 1, init_taker_rate = 1;  // maker_fee 和 taker_fee 同时为1 代表初始化用户费率
     let activePairs: any = ['all'];
     for (let i = 0; i < defaultPairFee.length; i++) {
-        let { symbol, maker_fee, taker_fee } = defaultPairFee[i];
-
+        let { symbol} = defaultPairFee[i];
         activePairs.push(symbol);
-        defaultFeeObj[symbol] = defaultPairFee[i];
-        if (max_maker_rate < maker_fee) {
-            max_maker_rate = maker_fee;
-        }
-        if (max_taker_rate < taker_fee) {
-            max_taker_rate = taker_fee;
-        }
     }
 
     let newFeeArr: any = [];
     let beginAt = new Date();
     let expiredPairs: any = [];
     for (let i = 0; i < expirdFees.length; i++) {
-        let { pair, fee_model, user_id, maker_fee: before_maker_fee, taker_fee: before_taker_fee } = expirdFees[i];
+        let { pair, fee_model, user_id} = expirdFees[i];
 
         if (await isWhiteListUser(user_id)) {
             continue;
@@ -262,22 +254,12 @@ async function setExpiredDefault() {
         if (unCheckCountObj[user_id] > 0) { // 已经存在
             continue;
         }
-        let new_maker_fee = max_maker_rate, new_taker_fee = max_taker_rate;
-        if (defaultFeeObj[pair]) {
-            let { maker_rate, taker_rate } = defaultFeeObj[pair];
-            new_maker_fee = maker_rate;
-            new_taker_fee = taker_rate;
-            if (new_maker_fee === before_maker_fee && new_taker_fee === before_taker_fee) {
-                continue
-            }
-
-        }
         newFeeArr.push({
             user_id,
             pair: pair,
             fee_model,
-            maker_fee: new_maker_fee,
-            taker_fee: new_taker_fee,
+            maker_fee: init_maker_rate,
+            taker_fee: init_taker_rate,
             beginAt: beginAt,
             expireAt: new Date(beginAt.getTime() + oneMonth),
             is_check: feeRateCheckStatus.CHECK_STATUS_UNCHECK,