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/ApiMallGoodsCategoryServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java
index b2aeb8b..154044d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java
@@ -1,14 +1,22 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.mall.entity.MallAddressWorld;
+import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallGoodsCategory;
+import cc.mrbird.febs.mall.mapper.MallAddressWorldMapper;
import cc.mrbird.febs.mall.mapper.MallGoodsCategoryMapper;
+import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
import cc.mrbird.febs.mall.service.IApiMallGoodsCategoryService;
+import cc.mrbird.febs.mall.vo.AdminWorldAddressVo;
import cc.mrbird.febs.mall.vo.MallGoodsCategoryVo;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -20,10 +28,29 @@
@RequiredArgsConstructor
public class ApiMallGoodsCategoryServiceImpl extends ServiceImpl<MallGoodsCategoryMapper, MallGoodsCategory> implements IApiMallGoodsCategoryService {
+ private final MallAddressWorldMapper mallAddressWorldMapper;
+ private final MallGoodsMapper mallGoodsMapper;
@Override
public List<MallGoodsCategoryVo> findAllCategoryList() {
- return this.baseMapper.selectAllCategoryList();
+ List<MallGoodsCategoryVo> mallGoodsCategoryVos = this.baseMapper.selectAllCategoryList();
+ ArrayList<MallGoodsCategoryVo> objects = new ArrayList<>();
+ if(CollUtil.isNotEmpty(mallGoodsCategoryVos)){
+ mallGoodsCategoryVos.forEach(item -> {
+ Long id = item.getId();
+ List<MallGoods> mallGoods = mallGoodsMapper.selectList(
+ new LambdaQueryWrapper<MallGoods>()
+ .select(MallGoods::getId)
+ .eq(MallGoods::getCategoryId, id));
+ if(CollUtil.isEmpty(mallGoods)){
+ objects.add(item);
+ }
+ });
+ }
+ if(CollUtil.isNotEmpty(objects)){
+ mallGoodsCategoryVos.removeAll(objects);
+ }
+ return mallGoodsCategoryVos;
}
@Override
@@ -35,4 +62,24 @@
public List<MallGoodsCategory> findRecommendCategory() {
return this.baseMapper.selectRecommendCategoryList();
}
+
+ @Override
+ public List<AdminWorldAddressVo> findAllAddressList() {
+ List<AdminWorldAddressVo> objects = new ArrayList<>();
+ LambdaQueryWrapper<MallAddressWorld> addressWorldLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ addressWorldLambdaQueryWrapper.eq(MallAddressWorld::getPid, 131)
+ .eq(MallAddressWorld::getLevel, 3)
+ .orderByAsc(MallAddressWorld::getId);
+ // 执行查询
+ List<MallAddressWorld> mallAddressWorlds = mallAddressWorldMapper.selectList(addressWorldLambdaQueryWrapper);
+ if(CollUtil.isNotEmpty(mallAddressWorlds)){
+ mallAddressWorlds.forEach(item -> {
+ AdminWorldAddressVo adminWorldAddressVo = new AdminWorldAddressVo();
+ adminWorldAddressVo.setId(item.getId());
+ adminWorldAddressVo.setName(item.getName()+"-"+item.getNameEn()+"-"+item.getNamePinyin());
+ objects.add(adminWorldAddressVo);
+ });
+ }
+ return objects;
+ }
}
--
Gitblit v1.9.1