Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix

src/module/redis.ts

@@ -17,7 +17,6 @@ import { CollectionFriend } from '../module/collection_friend';
 import {CollectionGongHui} from '../module/collection_gonghui';
 
 
-
 export type sortEd = {
     score: number,
     value: string
@@ -29,7 +28,7 @@ export type sortEd = {
 export type RedisCollections1 = {
     user: CollectionUser;
     gbtx: CollectionGBTX;
-    tanxian: Omit<CollectionTanXian, 'fastGuaJiNum'>;
+    tanxian: Omit<CollectionTanXian, 'fastGuaJiNum'> | any;
     dxlt: CollectionDxlt;
     jjc: CollectionJJC;
 };

src/public/gud.ts

@@ -21,11 +21,13 @@ export async function clearGud(uid) {
 
     if (await G.redis.type('tanxian', uid)) {
         console.log('清空tanxian Redis', uid);
-        G.redis.del("tanxian",uid);
+        // G.redis.del("tanxian", uid);
+        G.redis.set('tanxian', uid, {})
     }
     try {
-        console.log('清空friend:list Redis',uid);
-        G.redis.hDel("friend:list",uid);
+        // console.log('清空friend:list Redis', uid);
+        // G.redis.hDel("friend:list", uid);
+        // G.redis.hSet('friend:list', uid, {})
     } catch (e) {
 
     }

src/public/lingzhulaixi.ts

@@ -74,7 +74,7 @@ export class LingZhuLaiXifun {
         // 隔天清零
         if (_myData && PublicShared.chkSameDate(_myData.time, G.time)) {
             _res = {
-                num: _myData.num,
+                num: _myData.num || 0,
                 time: _myData.time,
                 maxdps: _myData.maxdps
             }

src/public/pay.ts

@@ -250,7 +250,7 @@ export class PayFun {
             console.log("Christmasfun.payChristmas Error", e);
         }
 
-        if (payArgs.selectPrize) {
+        if (payArgs && payArgs?.selectPrize) {
             let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`);
             if (selectPrize) {
                 prize.push(...JSON.parse(selectPrize))
@@ -421,7 +421,7 @@ export class PayFun {
              * payArgs里传相应参数，selectList选择的奖励列表
              * 往后所有自选类型，走这个方法，配置格式同4、14
              */
-            if (payArgs.htype && payArgs.selectList) {
+            if (payArgs && payArgs?.htype && payArgs?.selectList) {
                 let call = this.getCall(player)
                 // @ts-ignore
                 let _hdInfo = (await HuoDongFun.gethdList(call, payArgs.htype))[0]

src/test.ts

@@ -42,6 +42,7 @@ async function start() {
     // let c = await getItemNum('0_64e7024f1b2a9acc9e6900fb',['27382','12']);
     // console.log('c',c)
 
+}
 
 //定义全局变量
 ctor();