From 24f7f046f8854d63839ad52d0cff34ea45a0f449 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期二, 12 十一月 2024 13:10:17 +0800
Subject: [PATCH] 优化

---
 src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java b/src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java
index b33c44a..154b128 100644
--- a/src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java
+++ b/src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java
@@ -293,6 +293,7 @@
                     couponRecordDO.setPoint(couponTemplateDO.getPoint());
                     couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
                     couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
+                    couponRecordDO.setCouponDescription(couponTemplateDO.getCouponDescription());
 
                     // 创建相关信息
                     couponRecordDO.create(SecurityUtils.getUserId());
@@ -421,7 +422,9 @@
             if(couponTemplateDO==null){
                 throw new ValidationException("优惠券不存在");
             }
-
+            if(couponTemplateDO.getCouponAmount()<=0 ){
+               throw new ValidationException("优惠券已兑换完");
+            }
             CustomerPoint cp = customerPointMapper.selectOne(new LambdaQueryWrapper<CustomerPoint>()
                     .eq(CustomerPoint::getUserId, SecurityUtils.getUserId()));
             if(cp == null || (cp.getTotalPoint()-cp.getUsedPoint()-cp.getExpiredPoint()- cp.getExpiredPoint()) < couponTemplateDO.getPoint() * dto.getNum()){
@@ -439,6 +442,10 @@
             recordDTO.setCustomerId(customer.getId());
             couponRecordService.createCouponRecord(recordDTO);
 
+//            //更新优惠券数量
+//            couponTemplateDO.setCouponAmount(couponTemplateDO.getCouponAmount()-dto.getNum());
+//            couponTemplateService.updateById(couponTemplateDO);
+
             //更新积分汇总
             cp.setUsedPoint(cp.getUsedPoint()+couponTemplateDO.getPoint());
             customerPointMapper.updateById(cp);
@@ -454,8 +461,6 @@
             detail.setRemarks(couponTemplateDO.getCouponName());
             detail.create(SecurityUtils.getUserId());
             customerPointDetailMapper.insert(detail);
-        }catch (Exception e){
-            throw new ValidationException("兑换失败");
         }finally {
             lockService.releaseObjectLock(key,"");
         }
@@ -485,6 +490,12 @@
     }
 
     @Override
+    public boolean expireActivityCouponTemplateAll() {
+
+        return couponTemplateMapperCustom.expireActivityCouponTemplateAll()>0;
+    }
+
+    @Override
     public List<CouponTemplateVO> getActivityEffectList(QueryActivityEffectCouponDTO dto) {
 
         return couponTemplateMapperCustom.getActivityEffectList(dto);

--
Gitblit v1.9.3