From 73888d5addf53dadec2cd592616ffb2e521041e3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-C3M45P4\\dengdan" <dengdan@elex-tech.com>
Date: Tue, 9 Jun 2026 16:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A4=BC=E5=8C=85=E6=95=B0=E9=87=8F=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/goods/MoneyBuyGiftHandler.java    | 18 +++++++++++
 .../handler/goods/VouchersBuyGiftHandler.java | 25 +++++++++------
 .../jieling/logic/store/BuyGoodsNewLogic.java | 32 ++++++++++---------
 3 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/goods/MoneyBuyGiftHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/goods/MoneyBuyGiftHandler.java
index 67681be3f..035845517 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/goods/MoneyBuyGiftHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/goods/MoneyBuyGiftHandler.java
@@ -11,6 +11,8 @@ import com.ljsd.jieling.logic.dao.UserManager;
 import com.ljsd.jieling.logic.dao.root.User;
 import com.ljsd.jieling.logic.rank.RankEnum;
 import com.ljsd.jieling.logic.store.BuyGoodsNewLogic;
+import com.ljsd.jieling.logic.store.newRechargeInfo.bean.AbstractWelfareBag;
+import com.ljsd.jieling.logic.store.newRechargeInfo.rechargeHandler.RechargeHandler;
 import com.ljsd.jieling.network.session.ISession;
 import com.ljsd.jieling.util.ItemUtil;
 import config.SRechargeCommodityNewConfig;
@@ -46,6 +48,9 @@ public class MoneyBuyGiftHandler extends BaseHandler<PlayerInfoProto.GmBuyGoodRe
         if (!cost){
             throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
         }
+        if(!checkGoodStatus(user,goodsId,config)){
+            throw new ErrorTableException(104,"礼包已购买");
+        }
         // 走礼包逻辑发送奖励
         BuyGoodsNewLogic.moneyBuyGoods(iSession, goodsId);
         int money = config.getOtherBuy1()[0][1];
@@ -53,4 +58,17 @@ public class MoneyBuyGiftHandler extends BaseHandler<PlayerInfoProto.GmBuyGoodRe
         Poster.getPoster().dispatchEvent(new OpenServerActivityEvent(user.getId(),money, RankEnum.MONEY_RANK.getType()));
     }
 
+    /**
+     * 验证礼包是否购买
+     */
+    private static boolean checkGoodStatus(User user, int goodId,SRechargeCommodityNewConfig config){
+        RechargeHandler rechargeHandler = BuyGoodsNewLogic.getRechargeHandler(config.getOtype());
+        AbstractWelfareBag bag = rechargeHandler.getRechargeMap(user).get(goodId);
+        if (bag == null){
+            return false;
+        }
+        // 是否可买
+        return bag.isBuy();
+    }
+
 }
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/goods/VouchersBuyGiftHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/goods/VouchersBuyGiftHandler.java
index 3a5d4a8ce..0a99ba184 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/goods/VouchersBuyGiftHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/goods/VouchersBuyGiftHandler.java
@@ -2,11 +2,14 @@ package com.ljsd.jieling.handler.goods;
 
 import com.ljsd.jieling.exception.ErrorCode;
 import com.ljsd.jieling.exception.ErrorCodeException;
+import com.ljsd.jieling.exception.ErrorTableException;
 import com.ljsd.jieling.globals.BIReason;
 import com.ljsd.jieling.handler.BaseHandler;
 import com.ljsd.jieling.logic.dao.UserManager;
 import com.ljsd.jieling.logic.dao.root.User;
 import com.ljsd.jieling.logic.store.BuyGoodsNewLogic;
+import com.ljsd.jieling.logic.store.newRechargeInfo.bean.AbstractWelfareBag;
+import com.ljsd.jieling.logic.store.newRechargeInfo.rechargeHandler.RechargeHandler;
 import com.ljsd.jieling.network.session.ISession;
 import com.ljsd.jieling.util.ItemUtil;
 import config.SRechargeCommodityNewConfig;
@@ -42,6 +45,9 @@ public class VouchersBuyGiftHandler extends BaseHandler<PlayerInfoProto.GmBuyGoo
         if (!cost){
             throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
         }
+        if(!checkGoodStatus(user,goodsId,config)){
+            throw new ErrorTableException(104,"礼包已购买");
+        }
         // 走礼包逻辑发送奖励
         BuyGoodsNewLogic.vouchersBuyGoods(iSession, goodsId);
     }
@@ -49,14 +55,13 @@ public class VouchersBuyGiftHandler extends BaseHandler<PlayerInfoProto.GmBuyGoo
     /**
      * 验证礼包是否购买
      */
-//    private static boolean checkGoodStatus(User user, int goodId){
-//        SRechargeCommodityNewConfig recharge = SRechargeCommodityNewConfig.getConfigById(goodId);
-//        RechargeHandler rechargeHandler = BuyGoodsNewLogic.getRechargeHandler(recharge.getOtype());
-//        AbstractWelfareBag bag = rechargeHandler.getRechargeMap(user).get(goodId);
-//        if (bag == null){
-//            return false;
-//        }
-//        // 是否可买
-//        return bag.isBuy();
-//    }
+    private static boolean checkGoodStatus(User user, int goodId,SRechargeCommodityNewConfig config){
+        RechargeHandler rechargeHandler = BuyGoodsNewLogic.getRechargeHandler(config.getOtype());
+        AbstractWelfareBag bag = rechargeHandler.getRechargeMap(user).get(goodId);
+        if (bag == null){
+            return false;
+        }
+        // 是否可买
+        return bag.isBuy();
+    }
 }
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
index e33f1f9c1..8fb2c476e 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
@@ -263,18 +263,6 @@ public class BuyGoodsNewLogic {
         long now = TimeUtils.now();
         Result resultRes = new Result();
         resultRes.setResultCode(0);
-        ISession session = OnlineUserManager.getSessionByUid(uid);
-        if (session == null) {
-            Order order = new Order(uid, sdkGoodsId, openId, orderId, orderTime, amount);
-            String key = RedisKey.ANEW_RECHARGE_ORDER + ":" + uid;
-            RedisUtil.getInstence().putmap(key, order.getId(), order);
-            RedisUtil.getInstence().expireMills(key, TimeUtils.DAY * 30);
-            LOGGER.error("sendGoods 玩家不在缓存中,补单信息已放入redis缓存， uid={}，order：{}",uid, order);
-
-            resultRes.setResultCode(1);
-            resultRes.setResultMsg("Session is null");
-            return resultRes;
-        }
         if (StringUtil.isEmpty(sdkGoodsId)){
             resultRes.setResultMsg("sdkGoodsId is error");
             LOGGER.error("sdkGoodsId empty, uid={}, goodId={}",uid, sdkGoodsId);
@@ -313,15 +301,12 @@ public class BuyGoodsNewLogic {
                 return resultRes;
             }
         }
-
-
         User user = UserManager.getUser(uid);
         if (user == null) {
             resultRes.setResultMsg("User not found");
             LOGGER.error("sendGoods 玩家找不到, uid={}",uid);
             return resultRes;
         }
-
         RechargeHandler rechargeHandler = getRechargeHandler(config.getOtype());
         AbstractWelfareBag bag = rechargeHandler.getBag(user, goodsId);
         if (bag == null) {
@@ -329,6 +314,23 @@ public class BuyGoodsNewLogic {
             LOGGER.error("sendGoods 玩家身上找不到礼包, uid={}, goodId={}",uid, goodsId);
             return resultRes;
         }
+        if(!bag.isBuy()){
+            resultRes.setResultMsg("bag limit");
+            LOGGER.error("sendGoods 礼包已购买, uid={}, goodId={}",uid, goodsId);
+            return resultRes;
+        }
+        ISession session = OnlineUserManager.getSessionByUid(uid);
+        if (session == null) {
+            Order order = new Order(uid, sdkGoodsId, openId, orderId, orderTime, amount);
+            String key = RedisKey.ANEW_RECHARGE_ORDER + ":" + uid;
+            RedisUtil.getInstence().putmap(key, order.getId(), order);
+            RedisUtil.getInstence().expireMills(key, TimeUtils.DAY * 30);
+            LOGGER.error("sendGoods 玩家不在缓存中,补单信息已放入redis缓存， uid={}，order：{}",uid, order);
+
+            resultRes.setResultCode(1);
+            resultRes.setResultMsg("Session is null");
+            return resultRes;
+        }
 
         // 礼包购买
         bag.buy();