From 26eb548e4ce72a10b4b694852e0640fb76651655 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 02 Jan 2024 10:56:26 +0800
Subject: [PATCH] 领取优惠卷,验证商品是否存在、是否下架

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   52 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index c4244c1..1be19b6 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -75,6 +75,7 @@
     private final CouponGoodsMapper couponGoodsMapper;
     private final MallGoodsCouponMapper mallGoodsCouponMapper;
     private final MallMemberCouponMapper mallMemberCouponMapper;
+    private final MallGoodsMapper mallGoodsMapper;
 
 
     @Value("${spring.profiles.active}")
@@ -888,13 +889,14 @@
     public FebsResponse getCoupon(GetCouponDto getCouponDto) {
         Long memberId = LoginUserUtil.getLoginUser().getId();
 
-        String couponUUID = getCouponDto.getCouponUUID();
-        QueryWrapper<MallMemberCoupon> objectQueryWrapper = new QueryWrapper<>();
-        objectQueryWrapper.eq("coupon_uuid",couponUUID);
-        List<MallMemberCoupon> mallMemberCouponDone = mallMemberCouponMapper.selectList(objectQueryWrapper);
-        if(CollUtil.isNotEmpty(mallMemberCouponDone)){
-            return new FebsResponse().success();
-        }
+        String couponUUID = IdUtil.simpleUUID();
+//        String couponUUID = getCouponDto.getCouponUUID();
+//        QueryWrapper<MallMemberCoupon> objectQueryWrapper = new QueryWrapper<>();
+//        objectQueryWrapper.eq("coupon_uuid",couponUUID);
+//        List<MallMemberCoupon> mallMemberCouponDone = mallMemberCouponMapper.selectList(objectQueryWrapper);
+//        if(CollUtil.isNotEmpty(mallMemberCouponDone)){
+//            return new FebsResponse().success();
+//        }
         //通过邀请人信息,获取能领取的优惠卷信息
         MallMember mallMember = this.baseMapper.selectInfoByInviteId(getCouponDto.getInviteId());
         if(ObjectUtil.isNotEmpty(mallMember)){
@@ -902,23 +904,29 @@
             if(ObjectUtil.isNotEmpty(salemanCoupon)){
                 Long couponId = salemanCoupon.getCouponId();
                 Long goodsId = getCouponDto.getGoodsId();
+                MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
+                //验证商品存不存在,且上没上架
+                if(ObjectUtil.isNotEmpty(mallGoods)
+                    && MallGoods.ISSALE_STATUS_ENABLE == mallGoods.getIsSale()){
 //                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponId(memberId, goodsId, couponId,mallMember.getInviteId());
 //                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(memberId, goodsId, couponId);
-                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(memberId, goodsId);
-                if(CollUtil.isEmpty(mallMemberCoupons)){
-                    //商品优惠卷如果绑定了,那么当前登陆者获取一张卷
-                    List<CouponGoods> couponGoodsList = couponGoodsMapper.selectByGoodIdAndCouponId(goodsId,couponId);
-                    MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
-                    if(CollUtil.isNotEmpty(couponGoodsList)){
-                        MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
-                        mallMemberCoupon.setCouponId(couponId);
-                        mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
-                        mallMemberCoupon.setMemberId(memberId);
-                        mallMemberCoupon.setGoodsId(goodsId);
-                        mallMemberCoupon.setInviteId(mallMember.getInviteId());
-                        mallMemberCoupon.setState(1);
-                        mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
-                        mallMemberCouponMapper.insert(mallMemberCoupon);
+                    List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(memberId, goodsId);
+                    if(CollUtil.isEmpty(mallMemberCoupons)){
+                        //商品优惠卷如果绑定了,那么当前登陆者获取一张卷
+                        List<CouponGoods> couponGoodsList = couponGoodsMapper.selectByGoodIdAndCouponId(goodsId,couponId);
+                        MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
+                        if(CollUtil.isNotEmpty(couponGoodsList)){
+                            MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
+                            mallMemberCoupon.setCouponId(couponId);
+                            mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
+                            mallMemberCoupon.setMemberId(memberId);
+                            mallMemberCoupon.setGoodsId(goodsId);
+                            mallMemberCoupon.setCouponUuid(couponUUID);
+                            mallMemberCoupon.setInviteId(mallMember.getInviteId());
+                            mallMemberCoupon.setState(1);
+                            mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
+                            mallMemberCouponMapper.insert(mallMemberCoupon);
+                        }
                     }
                 }
             }

--
Gitblit v1.9.1