From 433f3631e70c86714ec7f0ce7a740050a51e6944 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期三, 11 九月 2024 15:17:19 +0800
Subject: [PATCH] 质检是否有总仓权限

---
 src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
index ec5067b..a55612d 100644
--- a/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
@@ -135,7 +135,7 @@
                     }
 
                     // 优惠券字段冗余
-                    couponRecordDO.setCategory(couponTemplateDO.getGetUserType());
+                    couponRecordDO.setCategory(couponTemplateDO.getCategory());
                     couponRecordDO.setCouponCode(couponTemplateDO.getCouponCode());
                     couponRecordDO.setCouponName(couponTemplateDO.getCouponName());
                     couponRecordDO.setCouponDiscountValue(couponTemplateDO.getCouponDiscountValue());
@@ -188,6 +188,8 @@
                         }
                     }
 
+                    // 手动设置ID
+                    couponRecordDO.setId(IdUtil.simpleUUID());
                     return baseMapper.insert(couponRecordDO)>0;
 
                 } finally {
@@ -212,7 +214,7 @@
         // 优惠券字段冗余
         final CouponTemplateDO couponTemplateDO = couponTemplateService.getById(dto.getCouponId());
         if(null!=couponTemplateDO){
-            couponRecordDO.setCategory(couponTemplateDO.getGetUserType());
+            couponRecordDO.setCategory(couponTemplateDO.getCategory());
             couponRecordDO.setCouponCode(couponTemplateDO.getCouponCode());
             couponRecordDO.setCouponName(couponTemplateDO.getCouponName());
             couponRecordDO.setCouponDiscountValue(couponTemplateDO.getCouponDiscountValue());
@@ -497,7 +499,7 @@
         // 查询订单使用的优惠券
         final CouponRecordDO couponRecordDO = getCouponByOrderId(orderId);
         if(null==couponRecordDO){
-            throw new IllegalArgumentException("优惠券不存在,无法操作");
+            return false;
         }
         log.info("优惠券退回之前:"+ JSON.toJSONString(couponRecordDO));
         couponRecordDO.setStatus(CouponUsedStatusEnum.UNUSED.getType());
@@ -524,4 +526,14 @@
         }
         return null;
     }
+
+    @Override
+    public boolean checkUserCouponExists(String couponId, Long customId) {
+        QueryWrapper<CouponRecordDO> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(CouponRecordDO::getDeleted,TrueOrFalseEnum.FALSE.isFlag())
+                .eq(CouponRecordDO::getCouponId,couponId)
+                .eq(CouponRecordDO::getCustomerId,customId)
+        ;
+        return baseMapper.selectCount(queryWrapper)>0;
+    }
 }

--
Gitblit v1.9.3