From 97b1b0d8a2f0ad812bf66a0629a3ccc5cc17d1cc Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 28 Dec 2023 09:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=88=B8=E6=95=B0=E9=87=8F=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=B8=BA=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yyth/biz/empcardgift/EmpCardGiftService.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
index 18e3957..a94d955 100644
--- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
+++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
@@ -330,6 +330,15 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
     @Transactional(rollbackFor = Exception.class)
     public ResultBean generateCard(EmpCardGiftDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if(dto.getCount().contains("-")){
+            return rb.setMsg("卡券数量不能为负数，请重新填写");
+        }
+        int count=0;
+        try{
+            count=Integer.parseInt(dto.getCount());
+        }catch (Exception e){
+            return rb.setMsg("卡券数量不是数字，请重新填写");
+        }
         if (StringUtils.isBlank(dto.getEmpCardSid())) {
             return rb.setMsg("请选择企业卡");
         }
@@ -340,12 +349,13 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
         }
         for(GoodsVo goodsVo:dto.getGoodsVoList()){
             EmpCardVo vo= empCardService.getBagGoods(dto.getEmpCardSid(),goodsVo.getGoodsSid()).getData();
-            if(goodsVo.getSelect()*Integer.valueOf(dto.getCount())>vo.getGoodsNumber()){
+            if(goodsVo.getSelect()*count>vo.getGoodsNumber()){
                 return rb.setMsg("商品数量不足，请重新选择");
             }
         }
+
         LpkGiftBag bag=lpkGiftBagService.getOne(new QueryWrapper<LpkGiftBag>().eq("sid",empCard.getGiftbagSid()));
-        for (int k = 0; k < Integer.valueOf(dto.getCount()); k++) {
+        for (int k = 0; k < count; k++) {
             EmpCardGrantLog record = new EmpCardGrantLog();
             record.setCreateTime(new DateTime());
             record.setEmpCardSid(dto.getEmpCardSid());