From dbdc1ed6a3ecdcb20981b9e84200c69424444d6d Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 06 Feb 2025 15:59:20 +0800 Subject: [PATCH] feat(payment): 集成 FIUU 支付方式并优化退款流程 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java index 4e54820..0113b5d 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java @@ -1,11 +1,13 @@ package cc.mrbird.febs.mall.service.impl; +import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; import cc.mrbird.febs.common.enumerates.FlowTypeEnum; import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.LoginUserUtil; import cc.mrbird.febs.mall.conversion.MallActivityConversion; +import cc.mrbird.febs.mall.conversion.MallGoodsCouponConversion; import cc.mrbird.febs.mall.dto.ApiMallActListDto; import cc.mrbird.febs.mall.dto.ApiMallActWinDetailsDto; import cc.mrbird.febs.mall.entity.*; @@ -13,13 +15,13 @@ import cc.mrbird.febs.mall.service.IApiMallActService; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; import cc.mrbird.febs.mall.service.IMallMoneyFlowService; -import cc.mrbird.febs.mall.vo.ApiActivityVo; -import cc.mrbird.febs.mall.vo.ApiMallActListVo; -import cc.mrbird.febs.mall.vo.ApiMallActWinDetailsVo; -import cc.mrbird.febs.mall.vo.ApiMallAwardDetailsVo; +import cc.mrbird.febs.mall.vo.*; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -46,6 +48,8 @@ private final IMallMoneyFlowService mallMoneyFlowService; private final IApiMallMemberWalletService mallMemberWalletService; private final MallActivityMapper mallActivityMapper; + private final MallGoodsCouponMapper mallGoodsCouponMapper; + private final MallMemberCouponMapper mallMemberCouponMapper; @Override public IPage<ApiMallActListVo> findApiMallActListInPage(ApiMallActListDto apiMallActListDto) { @@ -552,5 +556,52 @@ return apiMallAwardDetailsVo; } + @Override + public ApiCouponVo findApiCouponById(Long id) { + Long memberId = LoginUserUtil.getLoginUser().getId(); + + MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(id); + ApiCouponVo apiCouponVo = MallGoodsCouponConversion.INSTANCE.entityToApiCouponVo(mallGoodsCoupon); + List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectList( + new LambdaQueryWrapper<MallMemberCoupon>() + .eq(MallMemberCoupon::getMemberId, memberId) + .eq(MallMemberCoupon::getCouponId, id) + ); + if(CollUtil.isNotEmpty(mallMemberCoupons)){ + apiCouponVo.setState(1); + }else{ + apiCouponVo.setState(0); + } + return apiCouponVo; + } + + @Override + public FebsResponse addCoupon(Long couponId) { + Long memberId = LoginUserUtil.getLoginUser().getId(); + MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId); + if(mallGoodsCoupon.getState() == 2){ + List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectList( + new LambdaQueryWrapper<MallMemberCoupon>() + .eq(MallMemberCoupon::getMemberId, memberId) + .eq(MallMemberCoupon::getCouponId, couponId) + ); + if(CollUtil.isNotEmpty(mallMemberCoupons)){ + return new FebsResponse().fail().message("优惠卷已领取,请刷新当前页面"); + } + + MallMemberCoupon memberCoupon = new MallMemberCoupon(); + memberCoupon.setMemberId(memberId); + memberCoupon.setCouponId(couponId); + memberCoupon.setCouponName(mallGoodsCoupon.getName()); + memberCoupon.setCouponUuid(IdUtil.simpleUUID()); + memberCoupon.setState(1); + memberCoupon.setFromType(1); + memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), mallGoodsCoupon.getExpireDay())); + mallMemberCouponMapper.insert(memberCoupon); + return new FebsResponse().success().message("操作成功"); + } + return new FebsResponse().fail().message("优惠卷已失效,请刷新当前页面"); + } + } -- Gitblit v1.9.1