资产管理后台-特殊费率修改

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

@@ -119,6 +119,7 @@ export const changeUserSpotFee = async function (user_id, symbol, fee_model, mak
     let is_success = true;
     await checkFeeModel(fee_model);
     let product_type = pair == 'all' ? 'spot' : 'single';
+    let opt_market = product_type;
     //生效的费率 与要设置的费率 比对做校验 现在分不开 现货  合约 先不校验  之后分开了 再校验
      let feeExist = await cancelIfFeeExist(user_id, product_type, symbol, maker_fee, taker_fee);
      if (feeExist) {
@@ -149,7 +150,7 @@ export const changeUserSpotFee = async function (user_id, symbol, fee_model, mak
     await sleep(1000);
     //请求撮合 修改费率
 
-    let res = await changeTradingFee(pair, user_id, maker_fee, taker_fee, "spot");
+    let res = await changeTradingFee(pair, user_id, maker_fee, taker_fee, "spot",opt_market);
     return res.is_success;
 };
 
@@ -160,6 +161,7 @@ export const changeUserContractFee = async function (user_id, symbol, fee_model,
 
     let is_success = true;
     let product_type = pair == 'all' ? 'lpc' : 'single';
+    let opt_market = product_type;
     let feeExist = await cancelIfFeeExist(user_id, product_type, symbol, maker_fee, taker_fee);
     if (feeExist) {
         return is_success;
@@ -193,7 +195,7 @@ export const changeUserContractFee = async function (user_id, symbol, fee_model,
 
     await sleep(1000);
     //请求撮合 修改费率
-    let res = await changeTradingFee(pair, user_id, maker_fee, taker_fee, "lpc");
+    let res = await changeTradingFee(pair, user_id, maker_fee, taker_fee, "lpc",opt_market);
     return res.is_success;
 };
 

src/functional/mvc/service/commonUserFeeSetting.service.ts

@@ -153,36 +153,32 @@ export async function add(commonUserFeeVO: CommonUserFeeVO, currentUserId: any,
         let pair = dbInfo.pair;
         let type = dbInfo.type;
         let now = new Date();
-        let insertDbList: any;
+        let insertDbOne: any;
 
 
-        let rateLogs = await buildSubmitItems(pair, dbInfo, now, dbInfo.user_channel);
+        let rateLog = await buildSubmitItem(pair, dbInfo, now, dbInfo.user_channel);
 
         //提交到log表
         if (type == FEE_TYPE.FEE_TYPE_SPOT) {
-            insertDbList = await feeRateSpotLog.prototype.bulkCreate(rateLogs, {
-                transaction: tx,
-                returning: true
+            insertDbOne = await feeRateSpotLog.prototype.create(rateLog, {
+                transaction: tx
             });
         }
         else if (type == FEE_TYPE.FEE_TYPE_BASE_COIN_CONTRACT) {//币本位
-            insertDbList = await feeRateBaseCoinContractLog.prototype.bulkCreate(rateLogs, {
-                transaction: tx,
-                returning: true
+            insertDbOne = await feeRateBaseCoinContractLog.prototype.create(rateLog, {
+                transaction: tx
             });
         }
         else {//U本位
-            insertDbList = await feeRateContractLog.prototype.bulkCreate(rateLogs, {
-                transaction: tx,
-                returning: true
+            insertDbOne = await feeRateContractLog.prototype.create(rateLog, {
+                transaction: tx
             });
 
         }
-        let idsList = insertDbList.map(item => item.id);
-        let ids = idsList.length ? idsList.join(",") : "";
+        let id = insertDbOne.id;
 
         await commonUserFeeSetting.prototype.update({
-            fee_log_ids: ids,
+            fee_log_ids: id.toString(),
             update_time: new Date()
         }, {
             where: {
@@ -229,35 +225,32 @@ export async function update(commonUserFeeVO: CommonUserFeeVO, currentUserId: an
     let tx;
     try {
         tx = await ormDB.transaction();
-        let feeLogIds: any;
+        let feeLogId: any;
         //这四项修改需要 重新写入 rate_log
         if (Number(commonUserFeeVO.maker_fee) != Number(dbInfo.maker_fee) || Number(commonUserFeeVO.taker_fee) != Number(dbInfo.taker_fee)
             || datetimeUtils.trim(commonUserFeeVO.begin_time, 's').getTime() != datetimeUtils.trim(dbInfo.begin_time, 's').getTime()
             || datetimeUtils.trim(commonUserFeeVO.expire_time, 's').getTime() != datetimeUtils.trim(dbInfo.expire_time, 's').getTime()) {
-            let insertDbList: any;
-            let rateLogs = await buildSubmitItems(pair, commonUserFeeVO, new Date(), Number(commonUserFeeVO.user_channel));
+            let insertDbOne: any;
+            let rateLog = await buildSubmitItem(pair, commonUserFeeVO, new Date(), Number(commonUserFeeVO.user_channel));
             //提交到log表
             if (type == FEE_TYPE.FEE_TYPE_SPOT) {
-                insertDbList = await feeRateSpotLog.prototype.bulkCreate(rateLogs, {
-                    transaction: tx,
-                    returning: true
+                insertDbOne = await feeRateSpotLog.prototype.create(rateLog, {
+                    transaction: tx
                 });
             }
             else if (type == FEE_TYPE.FEE_TYPE_BASE_COIN_CONTRACT) {//币本位
-                insertDbList = await feeRateBaseCoinContractLog.prototype.bulkCreate(rateLogs, {
-                    transaction: tx,
-                    returning: true
+                insertDbOne = await feeRateBaseCoinContractLog.prototype.create(rateLog, {
+                    transaction: tx
                 });
             }
             else {//U本位
-                insertDbList = await feeRateContractLog.prototype.bulkCreate(rateLogs, {
-                    transaction: tx,
-                    returning: true
+                insertDbOne = await feeRateContractLog.prototype.create(rateLog, {
+                    transaction: tx
                 });
 
             }
-            let idsList = insertDbList.map(item => item.id);
-            feeLogIds = idsList.length ? idsList.join(",") : dbInfo.fee_log_ids;
+
+            feeLogId = insertDbOne.id;
         }
 
 
@@ -272,7 +265,7 @@ export async function update(commonUserFeeVO: CommonUserFeeVO, currentUserId: an
             amount_require_usdt: commonUserFeeVO.amount_require_usdt,
             applicant: commonUserFeeVO.applicant,
             update_time: new Date(),
-            fee_log_ids: feeLogIds,
+            fee_log_ids: feeLogId ? feeLogId.toString() : dbInfo.fee_log_ids,
         }, {
             where: {
                 id: Number(commonUserFeeVO.id)
@@ -469,51 +462,32 @@ async function getDbFeeSetting(user_id: number | any, type: number | any, user_c
     return dbInfo;
 }
 
-async function buildSubmitItems(pair: string, dbInfo: any, now: Date, user_channel: number) {
-    let type = Number(dbInfo.type);
-    let submitItems: any = [];
-    let pairs: any = [];
-    //全部交易对时需要查询交易对表
-    if (pair == 'all') {
-        //现货
-        if (type == FEE_TYPE.FEE_TYPE_SPOT) {
-            pairs = await getAllSpotPairs();
-        }
-        else {//合约  这里目前查询的是 contract_pairs 如果之后 币本位的交易对有单独的表 需要修改此处代码
-            pairs = await getAllContractPairs();
-        }
+async function buildSubmitItem(pair: string, dbInfo: any, now: Date, user_channel: number) {
+    let item = {
+        user_id: dbInfo.user_id,
+        pair: pair,
+        fee_model: FEE_MODEL_SPOT_DEFAULT,
+        maker_fee: dbInfo.maker_fee,
+        taker_fee: dbInfo.taker_fee,
+        beginAt: dbInfo.begin_time,
+        expireAt: dbInfo.expire_time,
+        is_check: FEE_RATE_LOG_STATUS.CHECK_STATUS_UNCHECK,
+        comment: "",
+        createdAt: now,
+        updatedAt: now
+    }
+    //项目方
+    if (user_channel == 2) {
+        item.comment = COMMENT_MAKER_FEE_SUBMIT
+    }
+    else if (user_channel == 3) {
+        item.comment = COMMENT_KOL_FEE_SUBMIT
     }
     else {
-        pairs.push(pair);
+        item.comment = COMMENT_USER_FEE_SUBMIT
     }
-    for (let onePair of pairs) {
-        let item = {
-            user_id: dbInfo.user_id,
-            pair: onePair,
-            fee_model: FEE_MODEL_SPOT_DEFAULT,
-            maker_fee: dbInfo.maker_fee,
-            taker_fee: dbInfo.taker_fee,
-            beginAt: dbInfo.begin_time,
-            expireAt: dbInfo.expire_time,
-            is_check: FEE_RATE_LOG_STATUS.CHECK_STATUS_UNCHECK,
-            comment: "",
-            createdAt: now,
-            updatedAt: now
-        }
-        //项目方
-        if (user_channel == 2) {
-            item.comment = COMMENT_MAKER_FEE_SUBMIT
-        }
-        else if (user_channel == 3) {
-            item.comment = COMMENT_KOL_FEE_SUBMIT
-        }
-        else {
-            item.comment = COMMENT_USER_FEE_SUBMIT
-        }
 
-        submitItems.push(item);
-    }
-    return submitItems;
+    return item;
 }
 
 async function checkSpotPair(pair: string) {