修改

cron/service/task.market.maker.statis.service.ts

-// 每日定时统计项目方 指定交易对做市信息, 并根据成交量信息进行费率分档优惠;
+// 每日定时统计项目方 指定交易对做市信息,
+// 并根据成交量信息判断是否满足承诺交易量
+// 不满足则将费率降为基础费率;
 import {
     ormDB, commonUserFeeSetting, feeRateSpotLog, userInfoSon, spotPairs, contractPairs, userInfo,
     dwdExFill, dwdMadOrmDB
@@ -16,29 +18,15 @@ const logger = require('@madex/ex-js-public').logger;
 let feeRateCheckStatus = FEE_RATE_LOG_STATUS;
 
 
-//价格缓存时间 2分钟
-const CACHE_TIMEOUT = 2 * 60 * 1000;
 const DAY = 24 * 3600 * 1000;
 
 const FEE_MODEL = {
     "fixedingain": "fixedingain"
 }
-const BTC_AMOUNT = {
-        "BTC30": 30,
-        "BTC5": 5,
-        "BTC0": 0,
-    },
-    FEE_RATE = {
-        "Wan1": 0.0001,
-        "Wan2": 0.0002,
-        "Default": 0.001,
-        "maker_default": 0.0008,
-        "Free": 0,
-    },
-    Market_Maker_FEE = {
-        init_taker: 0.002,
-        init_maker: 0.001,
-    }
+const Market_Maker_FEE = {
+    init_taker: 0.002,
+    init_maker: 0.001,
+}
 
 async function delayPromise(time: any) {
     return new Promise((resolve) => setTimeout(resolve, time));
@@ -101,8 +89,9 @@ async function projectMaker() {
     try {
         res = await commonUserFeeSetting.prototype.findAll({
             where: {
-                user_channel: 2,
-                type: 1,
+                user_channel: 2,//项目方
+                type: 1,//现货
+                status: 2,//已生效
             },
             order: [['id', 'asc']],
             raw:

src/functional/mvc/service/mUserManage.service.ts

@@ -133,9 +133,17 @@ export async function oneUserDetail(m_user_id: number) {
     }
     let oneRealName = await getRealNameByUserId(m_user_id);
     let isLoginLock = await getLoginLimit(m_user_id);
+    let is_withdraw: any;
     //24小时提现限制
-    let dead_line = datetimeUtils.add(oneUser.secure_modifiedAt, datetimeUtils.DAY);
-    let is_withdraw = datetimeUtils.between(new Date(), dead_line);
+    if (oneUser.secure_modifiedAt) {
+        let dead_line = datetimeUtils.add(oneUser.secure_modifiedAt, datetimeUtils.DAY);
+        is_withdraw = datetimeUtils.between(new Date(), dead_line);
+    }
+    else {
+        //没修改过安全信息 不需要限制
+        is_withdraw = 1;
+    }
+
     let res = {
         user_id: oneUser.user_id,
         real_name: oneUser.real_name,