From 4862fd4367447879732b635a20c05405c6fb60fb Mon Sep 17 00:00:00 2001
From: luluyuyu <3305167204@qq.com>
Date: Sat, 14 Dec 2024 21:48:09 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=8A=A0=E4=B8=8D=E8=BF=9B=E5=8E=BB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skyeye/coupon/service/CouponService.java  |  1 -
 .../service/impl/CouponServiceImpl.java       | 26 ++++++-------------
 .../service/impl/CouponUseServiceImpl.java    |  4 +--
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/CouponService.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/CouponService.java
index f7163734..f8ea8b5b 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/CouponService.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/CouponService.java
@@ -26,5 +26,4 @@ public interface CouponService extends SkyeyeBusinessService<Coupon> {
 
     void queryCouponListByMaterialId(InputObject inputObject, OutputObject outputObject);
 
-    Integer getUseCount(String couponId);
 }
diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java
index d3d08bb3..7e6d3c15 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java
@@ -5,7 +5,6 @@
 package com.skyeye.coupon.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -79,8 +78,8 @@ public class CouponServiceImpl extends SkyeyeBusinessServiceImpl<CouponDao, Coup
     public void validatorEntity(Coupon coupon) {
         // 模板新增
         if (StrUtil.isEmpty(coupon.getId()) && StrUtil.isEmpty(coupon.getTemplateId()) && // 主键和模板id为空时，即为模板
-            coupon.getProductScope() != PromotionMaterialScope.ALL.getKey() && // 判断适用商品类型
-            CollectionUtil.isEmpty(coupon.getCouponMaterialList()))  // 不适用全部商品时，适用对象不能为空。
+                coupon.getProductScope() != PromotionMaterialScope.ALL.getKey() && // 判断适用商品类型
+                CollectionUtil.isEmpty(coupon.getCouponMaterialList()))  // 不适用全部商品时，适用对象不能为空。
         {
             throw new CustomException("需要指定优惠券适用的商品范围，适用全部商品时可为空");
         }
@@ -138,7 +137,7 @@ public class CouponServiceImpl extends SkyeyeBusinessServiceImpl<CouponDao, Coup
     @Override
     public void createPostpose(Coupon entity, String userId) {
         if (CollectionUtil.isNotEmpty(entity.getStoreIdList())) {// 优惠券关联门店
-            couponStoreService.createEntity(entity.getId(),entity.getStoreIdList());
+            couponStoreService.createEntity(entity.getId(), entity.getStoreIdList());
         }
         if (StrUtil.isNotEmpty(entity.getTemplateId())) {// 优惠券
             if (Objects.equals(entity.getValidityType(), CouponValidityType.DATE.getKey())) {
@@ -215,7 +214,7 @@ public class CouponServiceImpl extends SkyeyeBusinessServiceImpl<CouponDao, Coup
         String type = params.get("type").toString();
         List<CouponStore> couponStoreList = couponStoreService.queryListByStoreId(storeId);
         List<String> couponIdList = couponStoreList.stream().map(CouponStore::getCouponId).distinct().collect(Collectors.toList());
-        if(CollectionUtil.isEmpty(couponIdList)){
+        if (CollectionUtil.isEmpty(couponIdList)) {
             return;
         }
         queryWrapper.in(CommonConstants.ID, couponIdList);
@@ -266,25 +265,16 @@ public class CouponServiceImpl extends SkyeyeBusinessServiceImpl<CouponDao, Coup
         String materialId = inputObject.getParams().get("materialId").toString();
         String typeKey = MybatisPlusUtil.toColumns(Coupon::getTemplateId);
         MPJLambdaWrapper<Coupon> wrapper = new MPJLambdaWrapper<Coupon>()
-            .innerJoin(CouponMaterial.class, CouponMaterial::getCouponId, Coupon::getId)
-            .eq(CouponMaterial::getMaterialId, materialId)
-            .eq(MybatisPlusUtil.toColumns(Coupon::getEnabled), EnableEnum.ENABLE_USING.getKey())
-            .isNotNull(typeKey).ne(typeKey, StrUtil.EMPTY);
+                .innerJoin(CouponMaterial.class, CouponMaterial::getCouponId, Coupon::getId)
+                .eq(CouponMaterial::getMaterialId, materialId)
+                .eq(MybatisPlusUtil.toColumns(Coupon::getEnabled), EnableEnum.ENABLE_USING.getKey())
+                .isNotNull(typeKey).ne(typeKey, StrUtil.EMPTY);
         List<Coupon> list = skyeyeBaseMapper.selectJoinList(Coupon.class, wrapper);
         setDrawState(list);// 设置是否可以领取状态
         outputObject.setBean(list);
         outputObject.settotal(list.size());
     }
 
-    @Override
-    public Integer getUseCount(String couponId) {
-        Coupon coupon = selectById(couponId);
-        if (ObjUtil.isEmpty(coupon)) {
-            throw new CustomException("优惠券不存在");
-        }
-        return coupon.getUseCount();
-    }
-
     private void setDrawState(List<Coupon> list) {
         if (CollectionUtil.isEmpty(list)) return;
         List<String> couponIdList = list.stream().map(Coupon::getId).collect(Collectors.toList());
diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponUseServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponUseServiceImpl.java
index d18afc4e..2caf2fec 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponUseServiceImpl.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponUseServiceImpl.java
@@ -142,10 +142,10 @@ public class CouponUseServiceImpl extends SkyeyeBusinessServiceImpl<CouponUseDao
     public void createPostpose(CouponUse couponUse, String userId) {
         // 更新优惠券领取数量
         couponService.updateTakeCount(couponUse.getCouponId(), couponUse.getCouponMation().getTakeCount() + 1);
-        Integer useCount = couponService.getUseCount(couponUse.getCouponId());
-        couponUse.setUsageCount(useCount);
         // 新增优惠券可使用的商品信息
         couponUseMaterialService.createEntity(couponUse.getCouponUseMaterialList(), userId);
+        Coupon coupon = couponService.selectById(couponUse.getCouponId());
+        couponUse.setUsageCount(coupon.getUseCount());
         // 定时任务
         Coupon couponMation = couponUse.getCouponMation();
         if (Objects.equals(couponMation.getValidityType(), CouponValidityType.TERM.getKey())) {