Merge remote-tracking branch 'origin/master'

src/functional/mvc/control/contractLimitTrade.control.ts

@@ -34,11 +34,14 @@ export const list = async (req: any, limitTradeVO: LimitTradeVO) => {
             for (let key of keys) {
                 let splitArr = key.split(".");
                 let item = {
-                    type: splitArr[0] == "baseu" ? 1 : 2,
+                    type: splitArr[0] == "lpc" ? 1 : 2,
                     status: splitArr[2] == "trade" ? 1 : 2,
                     pair: splitArr[3],
                     user_id: splitArr[4],
                 }
+                if (splitArr[0] == "spot"){
+                    item.type = 3;
+                }
                 list.push(item)
             }
         }
@@ -78,7 +81,7 @@ export const set = async (req: any, limitTradeVO: LimitTradeVO) => {
 
         let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
         let currentUserId = await getCurrentUserId(req.cookies.session_id);
-        //1U本位，2币本位
+        //1U本位，2币本位 3 现货
         let type = Number(limitTradeVO.type);
         //1限制交易，2限制开仓，3取消限制交易，4取消限制开仓
         let status = Number(limitTradeVO.status);
@@ -108,7 +111,10 @@ async function writeCacheData(type: number, status: number, pair: string, user_i
     if (!pair) {
         pair = "all";
     }
-    let typeStr = type == 1 ? "baseu.limit" : "basecoin.limit";
+    let typeStr = type == 1 ? "lpc.limit" : "ipc.limit";
+    if (type == 3){
+        typeStr = "spot";
+    }
     let statusStr = status == 1 || status == 3 ? "trade" : "open";
     let mapKey = `${typeStr}.${statusStr}.${pair}.${user_id}`;