From 91ddd96c12ec25aaf6d0cb38d54288d863ab2b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 10 七月 2021 18:10:38 +0800
Subject: [PATCH] 礼金红包兼容

---
 fanli/src/main/java/com/yeshi/fanli/lijin/manager/UserLijinSendManager.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/lijin/manager/UserLijinSendManager.java b/fanli/src/main/java/com/yeshi/fanli/lijin/manager/UserLijinSendManager.java
index cbac287..62354f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/lijin/manager/UserLijinSendManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/lijin/manager/UserLijinSendManager.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.lijin.manager;
 
+import com.ks.vip.exception.LijinBalanceException;
 import com.ks.vip.pojo.DO.UserLijinRecord;
 import com.ks.vip.pojo.Enums.VIPEnum;
 import com.yeshi.fanli.entity.SystemEnum;
@@ -161,7 +162,7 @@
      *
      * @param id
      */
-    public LijinSendInfo recieveLijin(String id, Long uid) throws Exception {
+    public LijinSendInfo recieveLijin(String id, Long uid) throws LijinBalanceException, Exception {
         LijinSendInfo lijinSendInfo = (LijinSendInfo) redisManager.getObj(LijinSendInfo.class, id);
         if (lijinSendInfo == null)
             throw new Exception("绾㈠寘涓虹┖");
@@ -170,9 +171,9 @@
         }
 
         //鍒ゆ柇鏄惁鏄柊浜虹孩鍖�
-        if(lijinSendInfo.getCategory().equalsIgnoreCase(UserLijinRecord.Category.newer.name())){
+        if (lijinSendInfo.getCategory() != null && lijinSendInfo.getCategory().equalsIgnoreCase(UserLijinRecord.Category.newer.name())) {
             UserLijinRecord record = userLijinMnager.getLijinRecord(uid, null, UserLijinRecord.Category.newer.name());
-            if(record!=null){
+            if (record != null) {
                 throw new Exception("宸查杩囨柊浜虹孩鍖�");
             }
         }
@@ -212,5 +213,14 @@
         }
     }
 
+    /**
+     * 鍒濆鍖栦綑棰�
+     *
+     * @param uid
+     */
+    public void initBalance(Long uid) {
+        userLijinMnager.initBalance(uid);
+    }
+
 
 }

--
Gitblit v1.8.0