Merge branch 'dev/2024/0523/update-admin-Y' of feifan/mall-backend-admin into master

移除不需要的接口

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/duser/DuserServiceImpl.java

@@ -171,7 +171,7 @@ public class DuserServiceImpl implements DuserService {
             DuserDO duser = getDuserByUser(memberUserRespVO.getId());
             if(duser == null) continue;
             SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duser.getSocialStatusId());
-//            if(socialStatus == null) continue;
+            if(socialStatus == null) continue;
             memberUserRespVO.setCurrentMemberWorthLevelName(socialStatus.getName());
             memberUserRespVO.setCurrentMemberWorthLevel(socialStatus.getLevel());
             //获取钱包

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/app/file/AppFileController.java

@@ -1,38 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.app.file;
-
-import cn.hutool.core.io.IoUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.infra.controller.app.file.vo.AppFileUploadReqVO;
-import cn.newfeifan.mall.module.infra.service.file.FileService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 文件存储")
-@RestController
-@RequestMapping("/infra/file")
-@Validated
-@Slf4j
-public class AppFileController {
-
-    @Resource
-    private FileService fileService;
-
-    @PostMapping("/upload")
-    @Operation(summary = "上传文件")
-    public CommonResult<String> uploadFile(AppFileUploadReqVO uploadReqVO) throws Exception {
-        MultipartFile file = uploadReqVO.getFile();
-        String path = uploadReqVO.getPath();
-        return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/app/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 占位
- */
-package cn.newfeifan.mall.module.infra.controller.app;

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/category/AppCategoryController.java

@@ -1,54 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.app.category;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.product.controller.app.category.vo.AppCategoryRespVO;
-import cn.newfeifan.mall.module.product.dal.dataobject.category.ProductCategoryDO;
-import cn.newfeifan.mall.module.product.service.category.ProductCategoryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 APP - 商品分类")
-@RestController
-@RequestMapping("/product/category")
-@Validated
-public class AppCategoryController {
-
-    @Resource
-    private ProductCategoryService categoryService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得商品分类列表")
-    public CommonResult<List<AppCategoryRespVO>> getProductCategoryList() {
-        List<ProductCategoryDO> list = categoryService.getEnableCategoryList();
-        list.sort(Comparator.comparing(ProductCategoryDO::getSort));
-        return success(BeanUtils.toBean(list, AppCategoryRespVO.class));
-    }
-
-    @GetMapping("/list-by-ids")
-    @Operation(summary = "获得商品分类列表，指定编号")
-    @Parameter(name = "ids", description = "商品分类编号数组", required = true)
-    public CommonResult<List<AppCategoryRespVO>> getProductCategoryList(@RequestParam("ids") List<Long> ids) {
-        if (CollUtil.isEmpty(ids)) {
-            return success(Collections.emptyList());
-        }
-        List<ProductCategoryDO> list = categoryService.getEnableCategoryList(ids);
-        list.sort(Comparator.comparing(ProductCategoryDO::getSort));
-        return success(BeanUtils.toBean(list, AppCategoryRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/comment/AppProductCommentController.java

@@ -1,50 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.app.comment;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.product.controller.app.comment.vo.AppCommentPageReqVO;
-import cn.newfeifan.mall.module.product.controller.app.comment.vo.AppProductCommentRespVO;
-import cn.newfeifan.mall.module.product.dal.dataobject.comment.ProductCommentDO;
-import cn.newfeifan.mall.module.product.service.comment.ProductCommentService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 APP - 商品评价")
-@RestController
-@RequestMapping("/product/comment")
-@Validated
-public class AppProductCommentController {
-
-    @Resource
-    private ProductCommentService productCommentService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得商品评价分页")
-    public CommonResult<PageResult<AppProductCommentRespVO>> getCommentPage(@Valid AppCommentPageReqVO pageVO) {
-        // 查询评论分页
-        PageResult<ProductCommentDO> pageResult = productCommentService.getCommentPage(pageVO, Boolean.TRUE);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接返回
-        pageResult.getList().forEach(item -> {
-            if (Boolean.TRUE.equals(item.getAnonymous())) {
-                item.setUserNickname(ProductCommentDO.NICKNAME_ANONYMOUS);
-            }
-        });
-        return success(BeanUtils.toBean(pageResult, AppProductCommentRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/favorite/AppFavoriteController.java

@@ -1,88 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.app.favorite;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.product.controller.app.favorite.vo.AppFavoriteBatchReqVO;
-import cn.newfeifan.mall.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
-import cn.newfeifan.mall.module.product.controller.app.favorite.vo.AppFavoriteReqVO;
-import cn.newfeifan.mall.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
-import cn.newfeifan.mall.module.product.convert.favorite.ProductFavoriteConvert;
-import cn.newfeifan.mall.module.product.dal.dataobject.favorite.ProductFavoriteDO;
-import cn.newfeifan.mall.module.product.dal.dataobject.spu.ProductSpuDO;
-import cn.newfeifan.mall.module.product.service.favorite.ProductFavoriteService;
-import cn.newfeifan.mall.module.product.service.spu.ProductSpuService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 商品收藏")
-@RestController
-@RequestMapping("/product/favorite")
-public class AppFavoriteController {
-
-    @Resource
-    private ProductFavoriteService productFavoriteService;
-    @Resource
-    private ProductSpuService productSpuService;
-
-    @PostMapping(value = "/create")
-    @Operation(summary = "添加商品收藏")
-    @PreAuthenticated
-    public CommonResult<Long> createFavorite(@RequestBody @Valid AppFavoriteReqVO reqVO) {
-        return success(productFavoriteService.createFavorite(getLoginUserId(), reqVO.getSpuId()));
-    }
-
-    @DeleteMapping(value = "/delete")
-    @Operation(summary = "取消单个商品收藏")
-    @PreAuthenticated
-    public CommonResult<Boolean> deleteFavorite(@RequestBody @Valid AppFavoriteReqVO reqVO) {
-        productFavoriteService.deleteFavorite(getLoginUserId(), reqVO.getSpuId());
-        return success(Boolean.TRUE);
-    }
-
-    @GetMapping(value = "/page")
-    @Operation(summary = "获得商品收藏分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppFavoriteRespVO>> getFavoritePage(AppFavoritePageReqVO reqVO) {
-        PageResult<ProductFavoriteDO> favoritePage = productFavoriteService.getFavoritePage(getLoginUserId(), reqVO);
-        if (CollUtil.isEmpty(favoritePage.getList())) {
-            return success(PageResult.empty());
-        }
-
-        // 得到商品 spu 信息
-        List<ProductFavoriteDO> favorites = favoritePage.getList();
-        List<Long> spuIds = convertList(favorites, ProductFavoriteDO::getSpuId);
-        List<ProductSpuDO> spus = productSpuService.getSpuList(spuIds);
-
-        // 转换 VO 结果
-        PageResult<AppFavoriteRespVO> pageResult = new PageResult<>(favoritePage.getTotal());
-        pageResult.setList(ProductFavoriteConvert.INSTANCE.convertList(favorites, spus));
-        return success(pageResult);
-    }
-
-    @GetMapping(value = "/exits")
-    @Operation(summary = "检查是否收藏过商品")
-    @PreAuthenticated
-    public CommonResult<Boolean> isFavoriteExists(AppFavoriteReqVO reqVO) {
-        ProductFavoriteDO favorite = productFavoriteService.getFavorite(getLoginUserId(), reqVO.getSpuId());
-        return success(favorite != null);
-    }
-
-    @GetMapping(value = "/get-count")
-    @Operation(summary = "获得商品收藏数量")
-    @PreAuthenticated
-    public CommonResult<Long> getFavoriteCount() {
-        return success(productFavoriteService.getFavoriteCount(getLoginUserId()));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/history/AppProductBrowseHistoryController.java

@@ -1,77 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.app.history;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.product.controller.admin.history.vo.ProductBrowseHistoryPageReqVO;
-import cn.newfeifan.mall.module.product.controller.app.history.vo.AppProductBrowseHistoryDeleteReqVO;
-import cn.newfeifan.mall.module.product.controller.app.history.vo.AppProductBrowseHistoryPageReqVO;
-import cn.newfeifan.mall.module.product.controller.app.history.vo.AppProductBrowseHistoryRespVO;
-import cn.newfeifan.mall.module.product.dal.dataobject.history.ProductBrowseHistoryDO;
-import cn.newfeifan.mall.module.product.dal.dataobject.spu.ProductSpuDO;
-import cn.newfeifan.mall.module.product.service.history.ProductBrowseHistoryService;
-import cn.newfeifan.mall.module.product.service.spu.ProductSpuService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertMap;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 商品浏览记录")
-@RestController
-@RequestMapping("/product/browse-history")
-public class AppProductBrowseHistoryController {
-
-    @Resource
-    private ProductBrowseHistoryService productBrowseHistoryService;
-    @Resource
-    private ProductSpuService productSpuService;
-
-    @DeleteMapping(value = "/delete")
-    @Operation(summary = "删除商品浏览记录")
-    @PreAuthenticated
-    public CommonResult<Boolean> deleteBrowseHistory(@RequestBody @Valid AppProductBrowseHistoryDeleteReqVO reqVO) {
-        productBrowseHistoryService.hideUserBrowseHistory(getLoginUserId(), reqVO.getSpuIds());
-        return success(Boolean.TRUE);
-    }
-
-    @DeleteMapping(value = "/clean")
-    @Operation(summary = "清空商品浏览记录")
-    @PreAuthenticated
-    public CommonResult<Boolean> deleteBrowseHistory() {
-        productBrowseHistoryService.hideUserBrowseHistory(getLoginUserId(), null);
-        return success(Boolean.TRUE);
-    }
-
-    @GetMapping(value = "/page")
-    @Operation(summary = "获得商品浏览记录分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppProductBrowseHistoryRespVO>> getBrowseHistoryPage(AppProductBrowseHistoryPageReqVO reqVO) {
-        ProductBrowseHistoryPageReqVO pageReqVO = BeanUtils.toBean(reqVO, ProductBrowseHistoryPageReqVO.class)
-                .setUserId(getLoginUserId())
-                .setUserDeleted(false); // 排除用户已删除的（隐藏的）
-        PageResult<ProductBrowseHistoryDO> pageResult = productBrowseHistoryService.getBrowseHistoryPage(pageReqVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty());
-        }
-
-        // 得到商品 spu 信息
-        Set<Long> spuIds = convertSet(pageResult.getList(), ProductBrowseHistoryDO::getSpuId);
-        Map<Long, ProductSpuDO> spuMap = convertMap(productSpuService.getSpuList(spuIds), ProductSpuDO::getId);
-        return success(BeanUtils.toBean(pageResult, AppProductBrowseHistoryRespVO.class,
-                vo -> Optional.ofNullable(spuMap.get(vo.getSpuId()))
-                        .ifPresent(spu -> vo.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()).setPrice(spu.getPrice()))));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/property/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 占位符，无时间作用，避免 package 缩进
- */
-package cn.newfeifan.mall.module.product.controller.app.property;

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/spu/AppProductSpuController.http

@@ -1,18 +0,0 @@
-### 获得订单交易的分页（默认）
-GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-### 获得订单交易的分页（价格）
-GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10&sortField=price&sortAsc=true
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-### 获得订单交易的分页（销售）
-GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10&sortField=salesCount&sortAsc=true
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-### 获得商品 SPU 明细
-GET {{appApi}}/product/spu/get-detail?id=102
-tenant-id: {{appTenentId}}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/spu/AppProductSpuController.java

@@ -1,152 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.app.spu;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.member.api.level.MemberLevelApi;
-import cn.newfeifan.mall.module.member.api.level.dto.MemberLevelRespDTO;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.product.controller.app.spu.vo.AppProductSpuDetailRespVO;
-import cn.newfeifan.mall.module.product.controller.app.spu.vo.AppProductSpuPageReqVO;
-import cn.newfeifan.mall.module.product.controller.app.spu.vo.AppProductSpuRespVO;
-import cn.newfeifan.mall.module.product.dal.dataobject.sku.ProductSkuDO;
-import cn.newfeifan.mall.module.product.dal.dataobject.spu.ProductSpuDO;
-import cn.newfeifan.mall.module.product.enums.spu.ProductSpuStatusEnum;
-import cn.newfeifan.mall.module.product.service.history.ProductBrowseHistoryService;
-import cn.newfeifan.mall.module.product.service.sku.ProductSkuService;
-import cn.newfeifan.mall.module.product.service.spu.ProductSpuService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.newfeifan.mall.module.product.enums.ErrorCodeConstants.SPU_NOT_ENABLE;
-import static cn.newfeifan.mall.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
-
-@Tag(name = "用户 APP - 商品 SPU")
-@RestController
-@RequestMapping("/product/spu")
-@Validated
-public class AppProductSpuController {
-
-    @Resource
-    private ProductSpuService productSpuService;
-    @Resource
-    private ProductSkuService productSkuService;
-    @Resource
-    private ProductBrowseHistoryService productBrowseHistoryService;
-
-    @Resource
-    private MemberLevelApi memberLevelApi;
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @GetMapping("/list-by-ids")
-    @Operation(summary = "获得商品 SPU 列表")
-    @Parameter(name = "ids", description = "编号列表", required = true)
-    public CommonResult<List<AppProductSpuRespVO>> getSpuList(@RequestParam("ids") Set<Long> ids) {
-        List<ProductSpuDO> list = productSpuService.getSpuList(ids);
-        if (CollUtil.isEmpty(list)) {
-            return success(Collections.emptyList());
-        }
-
-        // 拼接返回
-        list.forEach(spu -> spu.setSalesCount(spu.getSalesCount() + spu.getVirtualSalesCount()));
-        List<AppProductSpuRespVO> voList = BeanUtils.toBean(list, AppProductSpuRespVO.class);
-        // 处理 vip 价格
-        MemberLevelRespDTO memberLevel = getMemberLevel();
-        voList.forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
-        return success(voList);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得商品 SPU 分页")
-    public CommonResult<PageResult<AppProductSpuRespVO>> getSpuPage(@Valid AppProductSpuPageReqVO pageVO) {
-        PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接返回
-        pageResult.getList().forEach(spu -> spu.setSalesCount(spu.getSalesCount() + spu.getVirtualSalesCount()));
-        PageResult<AppProductSpuRespVO> voPageResult = BeanUtils.toBean(pageResult, AppProductSpuRespVO.class);
-        // 处理 vip 价格
-        MemberLevelRespDTO memberLevel = getMemberLevel();
-        voPageResult.getList().forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
-        return success(voPageResult);
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得商品 SPU 明细")
-    @Parameter(name = "id", description = "编号", required = true)
-    public CommonResult<AppProductSpuDetailRespVO> getSpuDetail(@RequestParam("id") Long id) {
-        // 获得商品 SPU
-        ProductSpuDO spu = productSpuService.getSpu(id);
-        if (spu == null) {
-            throw exception(SPU_NOT_EXISTS);
-        }
-        if (!ProductSpuStatusEnum.isEnable(spu.getStatus())) {
-            throw exception(SPU_NOT_ENABLE);
-        }
-        // 获得商品 SKU
-        List<ProductSkuDO> skus = productSkuService.getSkuListBySpuId(spu.getId());
-
-        // 增加浏览量
-        productSpuService.updateBrowseCount(id, 1);
-        // 保存浏览记录
-        productBrowseHistoryService.createBrowseHistory(getLoginUserId(), id);
-
-        // 拼接返回
-        spu.setBrowseCount(spu.getBrowseCount() + spu.getVirtualSalesCount());
-        AppProductSpuDetailRespVO spuVO = BeanUtils.toBean(spu, AppProductSpuDetailRespVO.class)
-                .setSkus(BeanUtils.toBean(skus, AppProductSpuDetailRespVO.Sku.class));
-        // 处理 vip 价格
-        MemberLevelRespDTO memberLevel = getMemberLevel();
-        spuVO.setVipPrice(calculateVipPrice(spuVO.getPrice(), memberLevel));
-        return success(spuVO);
-    }
-
-    private MemberLevelRespDTO getMemberLevel() {
-        Long userId = getLoginUserId();
-        if (userId == null) {
-            return null;
-        }
-        MemberUserRespDTO user = memberUserApi.getUser(userId);
-        if (user.getLevelId() == null || user.getLevelId() <= 0) {
-            return null;
-        }
-        return memberLevelApi.getMemberLevel(user.getLevelId());
-    }
-
-    /**
-     * 计算会员 VIP 优惠价格
-     *
-     * @param price 原价
-     * @param memberLevel 会员等级
-     * @return 优惠价格
-     */
-    public Integer calculateVipPrice(Integer price, MemberLevelRespDTO memberLevel) {
-        if (memberLevel == null || memberLevel.getDiscountPercent() == null) {
-            return 0;
-        }
-        Integer newPrice = price * memberLevel.getDiscountPercent() / 100;
-        return price - newPrice;
-    }
-
-    // TODO 非繁人：商品的浏览记录；
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/activity/AppActivityController.http

@@ -1,5 +0,0 @@
-### /promotion/activity/list-by-spu-ids 获得多个商品，近期参与的每个活动
-GET {{appApi}}/promotion/activity/list-by-spu-ids?spuIds=222&spuIds=633
-Authorization: Bearer {{appToken}}
-Content-Type: application/json
-tenant-id: {{appTenentId}}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/activity/AppActivityController.java

@@ -1,172 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.activity;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.promotion.controller.app.activity.vo.AppActivityRespVO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.discount.DiscountActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.discount.DiscountProductDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.reward.RewardActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.seckill.SeckillActivityDO;
-import cn.newfeifan.mall.module.promotion.enums.common.PromotionActivityStatusEnum;
-import cn.newfeifan.mall.module.promotion.enums.common.PromotionTypeEnum;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainActivityService;
-import cn.newfeifan.mall.module.promotion.service.combination.CombinationActivityService;
-import cn.newfeifan.mall.module.promotion.service.discount.DiscountActivityService;
-import cn.newfeifan.mall.module.promotion.service.reward.RewardActivityService;
-import cn.newfeifan.mall.module.promotion.service.seckill.SeckillActivityService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.*;
-
-@Tag(name = "用户 APP - 营销活动") // 用于提供跨多个活动的 HTTP 接口
-@RestController
-@RequestMapping("/promotion/activity")
-@Validated
-public class AppActivityController {
-
-    @Resource
-    private CombinationActivityService combinationActivityService;
-    @Resource
-    private SeckillActivityService seckillActivityService;
-    @Resource
-    private BargainActivityService bargainActivityService;
-    @Resource
-    private DiscountActivityService discountActivityService;
-    @Resource
-    private RewardActivityService rewardActivityService;
-
-    @GetMapping("/list-by-spu-id")
-    @Operation(summary = "获得单个商品，近期参与的每个活动")
-    @Parameter(name = "spuId", description = "商品编号", required = true)
-    public CommonResult<List<AppActivityRespVO>> getActivityListBySpuId(@RequestParam("spuId") Long spuId) {
-        // 每种活动，只返回一个
-        return success(getAppActivityList(Collections.singletonList(spuId)));
-    }
-
-    @GetMapping("/list-by-spu-ids")
-    @Operation(summary = "获得多个商品，近期参与的每个活动")
-    @Parameter(name = "spuIds", description = "商品编号数组", required = true)
-    public CommonResult<Map<Long, List<AppActivityRespVO>>> getActivityListBySpuIds(@RequestParam("spuIds") List<Long> spuIds) {
-        if (CollUtil.isEmpty(spuIds)) {
-            return success(MapUtil.empty());
-        }
-        // 每种活动，只返回一个；key 为 SPU 编号
-        return success(convertMultiMap(getAppActivityList(spuIds), AppActivityRespVO::getSpuId));
-    }
-
-    private List<AppActivityRespVO> getAppActivityList(Collection<Long> spuIds) {
-        if (CollUtil.isEmpty(spuIds)) {
-            return new ArrayList<>();
-        }
-        // 获取开启的且开始的且没有结束的活动
-        List<AppActivityRespVO> activityList = new ArrayList<>();
-        LocalDateTime now = LocalDateTime.now();
-        // 1. 拼团活动
-        getCombinationActivities(spuIds, now, activityList);
-        // 2. 秒杀活动
-        getSeckillActivities(spuIds, now, activityList);
-        // 3. 砍价活动
-        getBargainActivities(spuIds, now, activityList);
-        // 4. 限时折扣活动
-        getDiscountActivities(spuIds, now, activityList);
-        // 5. 满减送活动
-        getRewardActivities(spuIds, now, activityList);
-        return activityList;
-    }
-
-    private void getCombinationActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
-        List<CombinationActivityDO> combinationActivities = combinationActivityService.getCombinationActivityBySpuIdsAndStatusAndDateTimeLt(
-                spuIds, CommonStatusEnum.ENABLE.getStatus(), now);
-        if (CollUtil.isEmpty(combinationActivities)) {
-            return;
-        }
-
-        combinationActivities.forEach(item -> {
-            activityList.add(new AppActivityRespVO(item.getId(), PromotionTypeEnum.COMBINATION_ACTIVITY.getType(),
-                    item.getName(), item.getSpuId(), item.getStartTime(), item.getEndTime()));
-        });
-    }
-
-    private void getSeckillActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
-        List<SeckillActivityDO> seckillActivities = seckillActivityService.getSeckillActivityBySpuIdsAndStatusAndDateTimeLt(
-                spuIds, CommonStatusEnum.ENABLE.getStatus(), now);
-        if (CollUtil.isEmpty(seckillActivities)) {
-            return;
-        }
-
-        seckillActivities.forEach(item -> {
-            activityList.add(new AppActivityRespVO(item.getId(), PromotionTypeEnum.SECKILL_ACTIVITY.getType(),
-                    item.getName(), item.getSpuId(), item.getStartTime(), item.getEndTime()));
-        });
-    }
-
-    private void getBargainActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
-        List<BargainActivityDO> bargainActivities = bargainActivityService.getBargainActivityBySpuIdsAndStatusAndDateTimeLt(
-                spuIds, CommonStatusEnum.ENABLE.getStatus(), now);
-        if (CollUtil.isNotEmpty(bargainActivities)) {
-            return;
-        }
-
-        bargainActivities.forEach(item -> {
-            activityList.add(new AppActivityRespVO(item.getId(), PromotionTypeEnum.BARGAIN_ACTIVITY.getType(),
-                    item.getName(), item.getSpuId(), item.getStartTime(), item.getEndTime()));
-        });
-    }
-
-    private void getDiscountActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
-        List<DiscountActivityDO> discountActivities = discountActivityService.getDiscountActivityBySpuIdsAndStatusAndDateTimeLt(
-                spuIds, CommonStatusEnum.ENABLE.getStatus(), now);
-        if (CollUtil.isEmpty(discountActivities)) {
-            return;
-        }
-
-        List<DiscountProductDO> products = discountActivityService.getDiscountProductsByActivityId(
-                convertSet(discountActivities, DiscountActivityDO::getId));
-        Map<Long, Long> productMap = convertMap(products, DiscountProductDO::getActivityId, DiscountProductDO::getSpuId);
-        discountActivities.forEach(item -> activityList.add(new AppActivityRespVO(item.getId(), PromotionTypeEnum.DISCOUNT_ACTIVITY.getType(),
-                item.getName(), productMap.get(item.getId()), item.getStartTime(), item.getEndTime())));
-    }
-
-    private void getRewardActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
-        // TODO @puhui999：有 3 范围，不只 spuId，还有 categoryId，全部
-        List<RewardActivityDO> rewardActivityList = rewardActivityService.getRewardActivityBySpuIdsAndStatusAndDateTimeLt(
-                spuIds, PromotionActivityStatusEnum.RUN.getStatus(), now);
-        if (CollUtil.isEmpty(rewardActivityList)) {
-            return;
-        }
-
-        Map<Long, Optional<RewardActivityDO>> spuIdAndActivityMap = spuIds.stream()
-                .collect(Collectors.toMap(
-                        spuId -> spuId,
-                        spuId -> rewardActivityList.stream()
-                                .filter(activity -> activity.getProductSpuIds().contains(spuId))
-                                .max(Comparator.comparing(RewardActivityDO::getCreateTime))));
-        for (Long supId : spuIdAndActivityMap.keySet()) {
-            if (!spuIdAndActivityMap.get(supId).isPresent()) {
-                continue;
-            }
-
-            RewardActivityDO rewardActivityDO = spuIdAndActivityMap.get(supId).get();
-            activityList.add(new AppActivityRespVO(rewardActivityDO.getId(), PromotionTypeEnum.REWARD_ACTIVITY.getType(),
-                    rewardActivityDO.getName(), supId, rewardActivityDO.getStartTime(), rewardActivityDO.getEndTime()));
-        }
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/article/AppArticleCategoryController.java

@@ -1,39 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.article;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.promotion.controller.app.article.vo.category.AppArticleCategoryRespVO;
-import cn.newfeifan.mall.module.promotion.convert.article.ArticleCategoryConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.article.ArticleCategoryDO;
-import cn.newfeifan.mall.module.promotion.service.article.ArticleCategoryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 APP - 文章分类")
-@RestController
-@RequestMapping("/promotion/article-category")
-@Validated
-public class AppArticleCategoryController {
-
-    @Resource
-    private ArticleCategoryService articleCategoryService;
-
-    @RequestMapping("/list")
-    @Operation(summary = "获得文章分类列表")
-    public CommonResult<List<AppArticleCategoryRespVO>> getArticleCategoryList() {
-        List<ArticleCategoryDO> categoryList = articleCategoryService.getArticleCategoryListByStatus(
-                CommonStatusEnum.ENABLE.getStatus());
-        categoryList.sort(Comparator.comparing(ArticleCategoryDO::getSort)); // 按 sort 降序排列
-        return success(ArticleCategoryConvert.INSTANCE.convertList04(categoryList));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/article/AppArticleController.java

@@ -1,75 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.article;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.promotion.controller.app.article.vo.article.AppArticlePageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.app.article.vo.article.AppArticleRespVO;
-import cn.newfeifan.mall.module.promotion.convert.article.ArticleConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.article.ArticleDO;
-import cn.newfeifan.mall.module.promotion.service.article.ArticleService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 APP - 文章")
-@RestController
-@RequestMapping("/promotion/article")
-@Validated
-public class AppArticleController {
-
-    @Resource
-    private ArticleService articleService;
-
-    @RequestMapping("/list")
-    @Operation(summary = "获得文章详情列表")
-    @Parameters({
-            @Parameter(name = "recommendHot", description = "是否热门", example = "false"), // 场景一：查看指定的文章
-            @Parameter(name = "recommendBanner", description = "是否轮播图", example = "false") // 场景二：查看指定的文章
-    })
-    public CommonResult<List<AppArticleRespVO>> getArticleList(
-            @RequestParam(value = "recommendHot", required = false) Boolean recommendHot,
-            @RequestParam(value = "recommendBanner", required = false) Boolean recommendBanner) {
-        return success(ArticleConvert.INSTANCE.convertList03(
-                articleService.getArticleCategoryListByRecommend(recommendHot, recommendBanner)));
-    }
-
-    @RequestMapping("/page")
-    @Operation(summary = "获得文章详情分页")
-    public CommonResult<PageResult<AppArticleRespVO>> getArticlePage(AppArticlePageReqVO pageReqVO) {
-        return success(ArticleConvert.INSTANCE.convertPage02(articleService.getArticlePage(pageReqVO)));
-    }
-
-    @RequestMapping("/get")
-    @Operation(summary = "获得文章详情")
-    @Parameters({
-            @Parameter(name = "id", description = "文章编号", example = "1024"),
-            @Parameter(name = "title", description = "文章标题", example = "1024"),
-    })
-    public CommonResult<AppArticleRespVO> getArticle(@RequestParam(value = "id", required = false) Long id,
-                                                     @RequestParam(value = "title", required = false) String title) {
-        ArticleDO article = id != null ? articleService.getArticle(id)
-                : articleService.getLastArticleByTitle(title);
-        return success(BeanUtils.toBean(article, AppArticleRespVO.class));
-    }
-
-    @PutMapping("/add-browse-count")
-    @Operation(summary = "增加文章浏览量")
-    @Parameter(name = "id", description = "文章编号", example = "1024")
-    public CommonResult<Boolean> addBrowseCount(@RequestParam("id") Long id) {
-        articleService.addArticleBrowseCount(id);
-        return success(true);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/banner/AppBannerController.java

@@ -1,44 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.banner;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.promotion.controller.app.banner.vo.AppBannerRespVO;
-import cn.newfeifan.mall.module.promotion.convert.banner.BannerConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.banner.BannerDO;
-import cn.newfeifan.mall.module.promotion.service.banner.BannerService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@RestController
-@RequestMapping("/promotion/banner")
-@Tag(name = "用户 APP - 首页 Banner")
-@Validated
-public class AppBannerController {
-
-    @Resource
-    private BannerService bannerService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得 banner 列表")
-    @Parameter(name = "position", description = "Banner position", example = "1")
-    public CommonResult<List<AppBannerRespVO>> getBannerList(@RequestParam("position") Integer position) {
-        List<BannerDO> bannerList = bannerService.getBannerListByPosition(position);
-        return success(BannerConvert.INSTANCE.convertList01(bannerList));
-    }
-
-    @PutMapping("/add-browse-count")
-    @Operation(summary = "增加 Banner 点击量")
-    @Parameter(name = "id", description = "Banner 编号", example = "1024")
-    public CommonResult<Boolean> addBrowseCount(@RequestParam("id") Long id) {
-        bannerService.addBannerBrowseCount(id);
-        return success(true);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/bargain/AppBargainActivityController.java

@@ -1,107 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.bargain;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.app.bargain.vo.activity.AppBargainActivityDetailRespVO;
-import cn.newfeifan.mall.module.promotion.controller.app.bargain.vo.activity.AppBargainActivityRespVO;
-import cn.newfeifan.mall.module.promotion.convert.bargain.BargainActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainActivityDO;
-import cn.newfeifan.mall.module.promotion.enums.bargain.BargainRecordStatusEnum;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainActivityService;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainRecordService;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.time.Duration;
-import java.util.Collections;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.cache.CacheUtils.buildAsyncReloadingCache;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-
-@Tag(name = "用户 App - 砍价活动")
-@RestController
-@RequestMapping("/promotion/bargain-activity")
-@Validated
-public class AppBargainActivityController {
-
-    /**
-     * {@link AppBargainActivityRespVO} 缓存，通过它异步刷新 {@link #getBargainActivityList0(Integer)} 所要的首页数据
-     */
-    private final LoadingCache<Integer, List<AppBargainActivityRespVO>> bargainActivityListCache = buildAsyncReloadingCache(Duration.ofSeconds(10L),
-            new CacheLoader<Integer, List<AppBargainActivityRespVO>>() {
-
-                @Override
-                public List<AppBargainActivityRespVO> load(Integer count) {
-                    return getBargainActivityList0(count);
-                }
-
-            });
-
-    @Resource
-    private BargainActivityService bargainActivityService;
-    @Resource
-    private BargainRecordService bargainRecordService;
-
-    @Resource
-    private ProductSpuApi spuApi;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得砍价活动列表", description = "用于小程序首页")
-    @Parameter(name = "count", description = "需要展示的数量", example = "6")
-    public CommonResult<List<AppBargainActivityRespVO>> getBargainActivityList(
-            @RequestParam(name = "count", defaultValue = "6") Integer count) {
-        return success(bargainActivityListCache.getUnchecked(count));
-    }
-
-    private List<AppBargainActivityRespVO>getBargainActivityList0(Integer count) {
-        List<BargainActivityDO> list = bargainActivityService.getBargainActivityListByCount(count);
-        if (CollUtil.isEmpty(list)) {
-            return Collections.emptyList();
-        }
-        // 拼接数据
-        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(list, BargainActivityDO::getSpuId));
-        return BargainActivityConvert.INSTANCE.convertAppList(list, spuList);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得砍价活动分页")
-    public CommonResult<PageResult<AppBargainActivityRespVO>> getBargainActivityPage(PageParam pageReqVO) {
-        PageResult<BargainActivityDO> result = bargainActivityService.getBargainActivityPage(pageReqVO);
-        if (CollUtil.isEmpty(result.getList())) {
-            return success(PageResult.empty(result.getTotal()));
-        }
-        // 拼接数据
-        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(result.getList(), BargainActivityDO::getSpuId));
-        return success(BargainActivityConvert.INSTANCE.convertAppPage(result, spuList));
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得砍价活动详情")
-    @Parameter(name = "id", description = "活动编号", example = "1")
-    public CommonResult<AppBargainActivityDetailRespVO> getBargainActivityDetail(@RequestParam("id") Long id) {
-        BargainActivityDO activity = bargainActivityService.getBargainActivity(id);
-        if (activity == null) {
-            return success(null);
-        }
-        // 拼接数据
-        Integer successUserCount = bargainRecordService.getBargainRecordUserCount(id, BargainRecordStatusEnum.SUCCESS.getStatus());
-        ProductSpuRespDTO spu = spuApi.getSpu(activity.getSpuId());
-        return success(BargainActivityConvert.INSTANCE.convert(activity, successUserCount, spu));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/bargain/AppBargainHelpController.http

@@ -1,9 +0,0 @@
-### /promotion/bargain-record/create 创建砍价助力
-POST {{appApi}}/promotion/bargain-help/create
-Authorization: Bearer test248
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "recordId": 26
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/bargain/AppBargainHelpController.java

@@ -1,62 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.bargain;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.app.bargain.vo.help.AppBargainHelpCreateReqVO;
-import cn.newfeifan.mall.module.promotion.controller.app.bargain.vo.help.AppBargainHelpRespVO;
-import cn.newfeifan.mall.module.promotion.convert.bargain.BargainHelpConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainHelpDO;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainHelpService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 砍价助力")
-@RestController
-@RequestMapping("/promotion/bargain-help")
-@Validated
-public class AppBargainHelpController {
-
-    @Resource
-    private BargainHelpService bargainHelpService;
-
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建砍价助力", description = "给拼团记录砍一刀") // 返回结果为砍价金额，单位：分
-    public CommonResult<Integer> createBargainHelp(@RequestBody AppBargainHelpCreateReqVO reqVO) {
-        BargainHelpDO help = bargainHelpService.createBargainHelp(getLoginUserId(), reqVO);
-        return success(help.getReducePrice());
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得砍价助力列表")
-    @Parameter(name = "recordId", description = "砍价记录编号", required = true, example = "111")
-    public CommonResult<List<AppBargainHelpRespVO>> getBargainHelpList(@RequestParam("recordId") Long recordId) {
-        List<BargainHelpDO> helps = bargainHelpService.getBargainHelpListByRecordId(recordId);
-        if (CollUtil.isEmpty(helps)) {
-            return success(Collections.emptyList());
-        }
-        helps.sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime())); // 倒序展示
-
-        // 拼接数据
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(
-                convertSet(helps, BargainHelpDO::getUserId));
-        return success(BargainHelpConvert.INSTANCE.convertList(helps, userMap));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/bargain/AppBargainRecordController.http

@@ -1,9 +0,0 @@
-### /promotion/bargain-record/create 创建砍价记录
-POST {{appApi}}/promotion/bargain-record/create
-Authorization: Bearer {{appToken}}
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "activityId": 1
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/bargain/AppBargainRecordController.java

@@ -1,162 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.bargain;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.app.bargain.vo.record.AppBargainRecordCreateReqVO;
-import cn.newfeifan.mall.module.promotion.controller.app.bargain.vo.record.AppBargainRecordDetailRespVO;
-import cn.newfeifan.mall.module.promotion.controller.app.bargain.vo.record.AppBargainRecordRespVO;
-import cn.newfeifan.mall.module.promotion.controller.app.bargain.vo.record.AppBargainRecordSummaryRespVO;
-import cn.newfeifan.mall.module.promotion.convert.bargain.BargainRecordConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainRecordDO;
-import cn.newfeifan.mall.module.promotion.enums.bargain.BargainRecordStatusEnum;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainActivityService;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainHelpService;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainRecordService;
-import cn.newfeifan.mall.module.trade.api.order.TradeOrderApi;
-import cn.newfeifan.mall.module.trade.api.order.dto.TradeOrderRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 砍价记录")
-@RestController
-@RequestMapping("/promotion/bargain-record")
-@Validated
-public class AppBargainRecordController {
-
-    @Resource
-    private BargainHelpService bargainHelpService;
-    @Resource
-    private BargainRecordService bargainRecordService;
-    @Resource
-    private BargainActivityService bargainActivityService;
-
-    @Resource
-    private TradeOrderApi tradeOrderApi;
-    @Resource
-    private MemberUserApi memberUserApi;
-    @Resource
-    private ProductSpuApi productSpuApi;
-
-    @GetMapping("/get-summary")
-    @Operation(summary = "获得砍价记录的概要信息", description = "用于小程序首页")
-    public CommonResult<AppBargainRecordSummaryRespVO> getBargainRecordSummary() {
-        // 砍价成功的用户数量
-        Integer successUserCount = bargainRecordService.getBargainRecordUserCount(
-                BargainRecordStatusEnum.SUCCESS.getStatus());
-        if (successUserCount == 0) {
-            return success(new AppBargainRecordSummaryRespVO().setSuccessUserCount(0)
-                    .setSuccessList(Collections.emptyList()));
-        }
-        // 砍价成功的用户列表
-        List<BargainRecordDO> successList = bargainRecordService.getBargainRecordList(
-                BargainRecordStatusEnum.SUCCESS.getStatus(), 7);
-        List<BargainActivityDO> activityList = bargainActivityService.getBargainActivityList(
-                convertSet(successList, BargainRecordDO::getActivityId));
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(
-                convertSet(successList, BargainRecordDO::getUserId));
-        // 拼接返回
-        return success(BargainRecordConvert.INSTANCE.convert(successUserCount, successList, activityList, userMap));
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得砍价记录的明细")
-    @Parameters({
-            @Parameter(name = "id", description = "砍价记录编号", example = "111"), // 场景一：查看指定的砍价记录
-            @Parameter(name = "activityId", description = "砍价活动编号", example = "222") // 场景二：查看指定的砍价活动
-    })
-    public CommonResult<AppBargainRecordDetailRespVO> getBargainRecordDetail(
-            @RequestParam(value = "id", required = false) Long id,
-            @RequestParam(value = "activityId", required = false) Long activityId) {
-        // 1. 查询砍价记录 + 砍价活动
-        Assert.isTrue(id != null || activityId != null, "砍价记录编号和活动编号不能同时为空");
-        BargainRecordDO record = id != null ? bargainRecordService.getBargainRecord(id)
-                : bargainRecordService.getLastBargainRecord(getLoginUserId(), activityId);
-        if (activityId == null || record != null) {
-            activityId = record.getActivityId();
-        }
-        // 2. 查询助力记录
-        Long userId = getLoginUserId();
-        Integer helpAction = getHelpAction(userId, record, activityId);
-        // 3. 如果是自己的订单，则查询订单信息
-        TradeOrderRespDTO order = record != null && record.getOrderId() != null && record.getUserId().equals(getLoginUserId())
-                ? tradeOrderApi.getOrder(record.getOrderId()) : null;
-        // TODO 继续查询别的字段
-
-        // 拼接返回
-        return success(BargainRecordConvert.INSTANCE.convert02(record, helpAction, order));
-    }
-
-    private Integer getHelpAction(Long userId, BargainRecordDO record, Long activityId) {
-        // 0.1 如果没有活动，无法帮砍
-        if (activityId == null) {
-            return null;
-        }
-        // 0.2 如果是自己的砍价记录，无法帮砍
-        if (record != null && record.getUserId().equals(userId)) {
-            return null;
-        }
-
-        // 1. 判断是否已经助力
-        if (record != null
-            && bargainHelpService.getBargainHelp(record.getId(), userId) != null) {
-            return AppBargainRecordDetailRespVO.HELP_ACTION_SUCCESS;
-        }
-        // 2. 判断是否满助力
-        BargainActivityDO activity = bargainActivityService.getBargainActivity(activityId);
-        if (activity != null
-            && bargainHelpService.getBargainHelpCountByActivity(activityId, userId) >= activity.getBargainCount()) {
-            return AppBargainRecordDetailRespVO.HELP_ACTION_FULL;
-        }
-        // 3. 允许助力
-        return AppBargainRecordDetailRespVO.HELP_ACTION_NONE;
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得砍价记录的分页")
-    public CommonResult<PageResult<AppBargainRecordRespVO>> getBargainRecordPage(PageParam pageParam) {
-        PageResult<BargainRecordDO> pageResult = bargainRecordService.getBargainRecordPage(getLoginUserId(), pageParam);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接数据
-        List<BargainActivityDO> activityList = bargainActivityService.getBargainActivityList(
-                convertSet(pageResult.getList(), BargainRecordDO::getActivityId));
-        List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(
-                convertSet(pageResult.getList(), BargainRecordDO::getSpuId));
-        List<TradeOrderRespDTO> orderList = tradeOrderApi.getOrderList(
-                convertSet(pageResult.getList(), BargainRecordDO::getOrderId));
-        return success(BargainRecordConvert.INSTANCE.convertPage02(pageResult, activityList, spuList, orderList));
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "创建砍价记录", description = "参与砍价活动")
-    @PreAuthenticated
-    public CommonResult<Long> createBargainRecord(@RequestBody AppBargainRecordCreateReqVO reqVO) {
-        Long recordId = bargainRecordService.createBargainRecord(getLoginUserId(), reqVO);
-        return success(recordId);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/combination/AppCombinationActivityController.java

@@ -1,112 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.combination;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO;
-import cn.newfeifan.mall.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityRespVO;
-import cn.newfeifan.mall.module.promotion.convert.combination.CombinationActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationProductDO;
-import cn.newfeifan.mall.module.promotion.service.combination.CombinationActivityService;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.time.Duration;
-import java.util.Collections;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.cache.CacheUtils.buildAsyncReloadingCache;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-
-@Tag(name = "用户 APP - 拼团活动")
-@RestController
-@RequestMapping("/promotion/combination-activity")
-@Validated
-public class AppCombinationActivityController {
-
-    /**
-     * {@link AppCombinationActivityRespVO} 缓存，通过它异步刷新 {@link #getCombinationActivityList0(Integer)} 所要的首页数据
-     */
-    private final LoadingCache<Integer, List<AppCombinationActivityRespVO>> combinationActivityListCache = buildAsyncReloadingCache(Duration.ofSeconds(10L),
-            new CacheLoader<Integer, List<AppCombinationActivityRespVO>>() {
-
-                @Override
-                public List<AppCombinationActivityRespVO> load(Integer count) {
-                    return getCombinationActivityList0(count);
-                }
-
-            });
-
-    @Resource
-    private CombinationActivityService activityService;
-
-    @Resource
-    private ProductSpuApi spuApi;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得拼团活动列表", description = "用于小程序首页")
-    @Parameter(name = "count", description = "需要展示的数量", example = "6")
-    public CommonResult<List<AppCombinationActivityRespVO>> getCombinationActivityList(
-            @RequestParam(name = "count", defaultValue = "6") Integer count) {
-        return success(combinationActivityListCache.getUnchecked(count));
-    }
-
-    private List<AppCombinationActivityRespVO> getCombinationActivityList0(Integer count) {
-        List<CombinationActivityDO> activityList = activityService.getCombinationActivityListByCount(count);
-        if (CollUtil.isEmpty(activityList)) {
-            return Collections.emptyList();
-        }
-        // 拼接返回
-        List<CombinationProductDO> productList = activityService.getCombinationProductListByActivityIds(
-                convertList(activityList, CombinationActivityDO::getId));
-        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(activityList, CombinationActivityDO::getSpuId));
-        return CombinationActivityConvert.INSTANCE.convertAppList(activityList, productList, spuList);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得拼团活动分页")
-    public CommonResult<PageResult<AppCombinationActivityRespVO>> getCombinationActivityPage(PageParam pageParam) {
-        PageResult<CombinationActivityDO> pageResult = activityService.getCombinationActivityPage(pageParam);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-        // 拼接返回
-        List<CombinationProductDO> productList = activityService.getCombinationProductListByActivityIds(
-                convertList(pageResult.getList(), CombinationActivityDO::getId));
-        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(pageResult.getList(), CombinationActivityDO::getSpuId));
-        return success(CombinationActivityConvert.INSTANCE.convertAppPage(pageResult, productList, spuList));
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得拼团活动明细")
-    @Parameter(name = "id", description = "活动编号", required = true, example = "1024")
-    public CommonResult<AppCombinationActivityDetailRespVO> getCombinationActivityDetail(@RequestParam("id") Long id) {
-        // 1. 获取活动
-        CombinationActivityDO activity = activityService.getCombinationActivity(id);
-        if (activity == null
-                || ObjectUtil.equal(activity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
-            return success(null);
-        }
-
-        // 2. 获取活动商品
-        List<CombinationProductDO> products = activityService.getCombinationProductsByActivityId(activity.getId());
-        return success(CombinationActivityConvert.INSTANCE.convert3(activity, products));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/combination/AppCombinationRecordController.java

@@ -1,142 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.combination;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.promotion.controller.app.combination.vo.record.AppCombinationRecordDetailRespVO;
-import cn.newfeifan.mall.module.promotion.controller.app.combination.vo.record.AppCombinationRecordPageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.app.combination.vo.record.AppCombinationRecordRespVO;
-import cn.newfeifan.mall.module.promotion.controller.app.combination.vo.record.AppCombinationRecordSummaryRespVO;
-import cn.newfeifan.mall.module.promotion.convert.combination.CombinationActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationRecordDO;
-import cn.newfeifan.mall.module.promotion.enums.combination.CombinationRecordStatusEnum;
-import cn.newfeifan.mall.module.promotion.service.combination.CombinationRecordService;
-import cn.newfeifan.mall.module.trade.api.order.TradeOrderApi;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 拼团活动")
-@RestController
-@RequestMapping("/promotion/combination-record")
-@Validated
-public class AppCombinationRecordController {
-
-    @Resource
-    private CombinationRecordService combinationRecordService;
-    @Resource
-    @Lazy
-    private TradeOrderApi tradeOrderApi;
-
-    @GetMapping("/get-summary")
-    @Operation(summary = "获得拼团记录的概要信息", description = "用于小程序首页")
-    public CommonResult<AppCombinationRecordSummaryRespVO> getCombinationRecordSummary() {
-        AppCombinationRecordSummaryRespVO summary = new AppCombinationRecordSummaryRespVO();
-        // 1. 获得拼团参与用户数量
-        Long userCount = combinationRecordService.getCombinationUserCount();
-        if (userCount == 0) {
-            summary.setAvatars(Collections.emptyList());
-            summary.setUserCount(userCount);
-            return success(summary);
-        }
-        summary.setUserCount(userCount);
-
-        // 2. 获得拼团记录头像
-        List<CombinationRecordDO> records = combinationRecordService.getLatestCombinationRecordList(
-                AppCombinationRecordSummaryRespVO.AVATAR_COUNT);
-        summary.setAvatars(convertList(records, CombinationRecordDO::getAvatar));
-        return success(summary);
-    }
-
-    @GetMapping("/get-head-list")
-    @Operation(summary = "获得最近 n 条拼团记录（团长发起的）")
-    @Parameters({
-            @Parameter(name = "activityId", description = "拼团活动编号"),
-            @Parameter(name = "status", description = "拼团状态"), // 对应 CombinationRecordStatusEnum 枚举
-            @Parameter(name = "count", description = "数量")
-    })
-    public CommonResult<List<AppCombinationRecordRespVO>> getHeadCombinationRecordList(
-            @RequestParam(value = "activityId", required = false) Long activityId,
-            @RequestParam("status") Integer status,
-            @RequestParam(value = "count", defaultValue = "20") @Max(20) Integer count) {
-        List<CombinationRecordDO> list = combinationRecordService.getHeadCombinationRecordList(activityId, status, count);
-        return success(BeanUtils.toBean(list, AppCombinationRecordRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得我的拼团记录分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppCombinationRecordRespVO>> getCombinationRecordPage(
-            @Valid AppCombinationRecordPageReqVO pageReqVO) {
-        PageResult<CombinationRecordDO> pageResult = combinationRecordService.getCombinationRecordPage(
-                getLoginUserId(), pageReqVO);
-        return success(BeanUtils.toBean(pageResult, AppCombinationRecordRespVO.class));
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得拼团记录明细")
-    @Parameter(name = "id", description = "拼团记录编号", required = true, example = "1024")
-    public CommonResult<AppCombinationRecordDetailRespVO> getCombinationRecordDetail(@RequestParam("id") Long id) {
-        // 1. 查找这条拼团记录
-        CombinationRecordDO record = combinationRecordService.getCombinationRecordById(id);
-        if (record == null) {
-            return success(null);
-        }
-
-        // 2. 查找该拼团的参团记录
-        CombinationRecordDO headRecord;
-        List<CombinationRecordDO> memberRecords;
-        if (Objects.equals(record.getHeadId(), CombinationRecordDO.HEAD_ID_GROUP)) { // 情况一：团长
-            headRecord = record;
-            memberRecords = combinationRecordService.getCombinationRecordListByHeadId(record.getId());
-        } else { // 情况二：团员
-            headRecord = combinationRecordService.getCombinationRecordById(record.getHeadId());
-            memberRecords = combinationRecordService.getCombinationRecordListByHeadId(headRecord.getId());
-        }
-
-        // 3. 拼接数据
-        return success(CombinationActivityConvert.INSTANCE.convert(getLoginUserId(), headRecord, memberRecords));
-    }
-
-    @GetMapping("/cancel")
-    @Operation(summary = "取消拼团")
-    @Parameter(name = "id", description = "拼团记录编号", required = true, example = "1024")
-    public CommonResult<Boolean> cancelCombinationRecord(@RequestParam("id") Long id) {
-        Long userId = getLoginUserId();
-        // 1、查找这条拼团记录
-        CombinationRecordDO record = combinationRecordService.getCombinationRecordByIdAndUser(userId, id);
-        if (record == null) {
-            return success(Boolean.FALSE);
-        }
-        // 1.1、需要先校验拼团记录未完成；
-        if (!CombinationRecordStatusEnum.isInProgress(record.getStatus())) {
-            return success(Boolean.FALSE);
-        }
-
-        // 2. 取消已支付的订单
-        tradeOrderApi.cancelPaidOrder(userId, record.getOrderId());
-        // 3. 取消拼团记录
-        combinationRecordService.cancelCombinationRecord(userId, record.getId(), record.getHeadId());
-        return success(Boolean.TRUE);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/coupon/AppCouponController.java

@@ -1,92 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.coupon;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.promotion.controller.app.coupon.vo.coupon.*;
-import cn.newfeifan.mall.module.promotion.convert.coupon.CouponConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.coupon.CouponDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.coupon.CouponTemplateDO;
-import cn.newfeifan.mall.module.promotion.enums.coupon.CouponTakeTypeEnum;
-import cn.newfeifan.mall.module.promotion.service.coupon.CouponService;
-import cn.newfeifan.mall.module.promotion.service.coupon.CouponTemplateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collections;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 优惠劵")
-@RestController
-@RequestMapping("/promotion/coupon")
-@Validated
-public class AppCouponController {
-
-    @Resource
-    private CouponService couponService;
-    @Resource
-    private CouponTemplateService couponTemplateService;
-
-    @PostMapping("/take")
-    @Operation(summary = "领取优惠劵")
-    @Parameter(name = "templateId", description = "优惠券模板编号", required = true, example = "1024")
-    @PreAuthenticated
-    public CommonResult<Boolean> takeCoupon(@Valid @RequestBody AppCouponTakeReqVO reqVO) {
-        // 1. 领取优惠劵
-        Long userId = getLoginUserId();
-        couponService.takeCoupon(reqVO.getTemplateId(), CollUtil.newHashSet(userId), CouponTakeTypeEnum.USER);
-
-        // 2. 检查是否可以继续领取
-        CouponTemplateDO couponTemplate = couponTemplateService.getCouponTemplate(reqVO.getTemplateId());
-        boolean canTakeAgain = true;
-        if (couponTemplate.getTakeLimitCount() != null && couponTemplate.getTakeLimitCount() > 0) {
-            Integer takeCount = couponService.getTakeCount(reqVO.getTemplateId(), userId);
-            canTakeAgain = takeCount < couponTemplate.getTakeLimitCount();
-        }
-        return success(canTakeAgain);
-    }
-
-    @GetMapping("/match-list")
-    @Operation(summary = "获得匹配指定商品的优惠劵列表", description = "用于下单页，展示优惠劵列表")
-    public CommonResult<List<AppCouponMatchRespVO>> getMatchCouponList(AppCouponMatchReqVO matchReqVO) {
-        // todo: 优化：优惠金额倒序
-        List<CouponDO> list = couponService.getMatchCouponList(getLoginUserId(), matchReqVO);
-        return success(BeanUtils.toBean(list, AppCouponMatchRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "我的优惠劵列表")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppCouponRespVO>> getCouponPage(AppCouponPageReqVO pageReqVO) {
-        PageResult<CouponDO> pageResult = couponService.getCouponPage(
-                CouponConvert.INSTANCE.convert(pageReqVO, Collections.singleton(getLoginUserId())));
-        return success(BeanUtils.toBean(pageResult, AppCouponRespVO.class));
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得优惠劵")
-    @Parameter(name = "id", description = "优惠劵编号", required = true, example = "1024")
-    @PreAuthenticated
-    public CommonResult<AppCouponRespVO> getCoupon(@RequestParam("id") Long id) {
-        CouponDO coupon = couponService.getCoupon(getLoginUserId(), id);
-        return success(BeanUtils.toBean(coupon, AppCouponRespVO.class));
-    }
-
-    @GetMapping(value = "/get-unused-count")
-    @Operation(summary = "获得未使用的优惠劵数量")
-    @PreAuthenticated
-    public CommonResult<Long> getUnusedCouponCount() {
-        return success(couponService.getUnusedCouponCount(getLoginUserId()));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/coupon/AppCouponTemplateController.java

@@ -1,141 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.coupon;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.common.util.object.ObjectUtils;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.app.coupon.vo.template.AppCouponTemplatePageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.app.coupon.vo.template.AppCouponTemplateRespVO;
-import cn.newfeifan.mall.module.promotion.convert.coupon.CouponTemplateConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.coupon.CouponTemplateDO;
-import cn.newfeifan.mall.module.promotion.enums.common.PromotionProductScopeEnum;
-import cn.newfeifan.mall.module.promotion.enums.coupon.CouponTakeTypeEnum;
-import cn.newfeifan.mall.module.promotion.service.coupon.CouponService;
-import cn.newfeifan.mall.module.promotion.service.coupon.CouponTemplateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-import static java.util.Collections.singletonList;
-
-@Tag(name = "用户 App - 优惠劵模板")
-@RestController
-@RequestMapping("/promotion/coupon-template")
-@Validated
-public class AppCouponTemplateController {
-
-    @Resource
-    private CouponTemplateService couponTemplateService;
-    @Resource
-    private CouponService couponService;
-
-    @Resource
-    private ProductSpuApi productSpuApi;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得优惠劵模版")
-    @Parameter(name = "id", description = "优惠券模板编号", required = true, example = "1024")
-    public CommonResult<AppCouponTemplateRespVO> getCouponTemplate(Long id) {
-        CouponTemplateDO template = couponTemplateService.getCouponTemplate(id);
-        if (template == null) {
-            return success(null);
-        }
-        // 处理是否可领取
-        Map<Long, Boolean> canCanTakeMap = couponService.getUserCanCanTakeMap(getLoginUserId(), singletonList(template));
-        return success(BeanUtils.toBean(template, AppCouponTemplateRespVO.class)
-                .setCanTake(canCanTakeMap.get(template.getId())));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得优惠劵模版列表")
-    @Parameters({
-            @Parameter(name = "spuId", description = "商品 SPU 编号"), // 目前主要给商品详情使用
-            @Parameter(name = "productScope", description = "使用类型"),
-            @Parameter(name = "count", description = "数量", required = true)
-    })
-    public CommonResult<List<AppCouponTemplateRespVO>> getCouponTemplateList(
-            @RequestParam(value = "spuId", required = false) Long spuId,
-            @RequestParam(value = "productScope", required = false) Integer productScope,
-            @RequestParam(value = "count", required = false, defaultValue = "10") Integer count) {
-        // 1.1 处理查询条件：商品范围编号
-        Long productScopeValue = getProductScopeValue(productScope, spuId);
-        // 1.2 处理查询条件：领取方式 = 直接领取
-        List<Integer> canTakeTypes = singletonList(CouponTakeTypeEnum.USER.getValue());
-
-        // 2. 查询
-        List<CouponTemplateDO> list = couponTemplateService.getCouponTemplateList(canTakeTypes, productScope,
-                productScopeValue, count);
-
-        // 3.1 领取数量
-        Map<Long, Boolean> canCanTakeMap = couponService.getUserCanCanTakeMap(getLoginUserId(), list);
-        // 3.2 拼接返回
-        return success(CouponTemplateConvert.INSTANCE.convertAppList(list, canCanTakeMap));
-    }
-
-    @GetMapping("/list-by-ids")
-    @Operation(summary = "获得优惠劵模版列表")
-    @Parameter(name = "ids", description = "优惠券模板编号列表")
-    public CommonResult<List<AppCouponTemplateRespVO>> getCouponTemplateList(
-            @RequestParam(value = "ids", required = false) Set<Long> ids) {
-        // 1. 查询
-        List<CouponTemplateDO> list = couponTemplateService.getCouponTemplateList(ids);
-
-        // 2.1 领取数量
-        Map<Long, Boolean> canCanTakeMap = couponService.getUserCanCanTakeMap(getLoginUserId(), list);
-        // 2.2 拼接返回
-        return success(CouponTemplateConvert.INSTANCE.convertAppList(list, canCanTakeMap));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得优惠劵模版分页")
-    public CommonResult<PageResult<AppCouponTemplateRespVO>> getCouponTemplatePage(AppCouponTemplatePageReqVO pageReqVO) {
-        // 1.1 处理查询条件：商品范围编号
-        Long productScopeValue = getProductScopeValue(pageReqVO.getProductScope(), pageReqVO.getSpuId());
-        // 1.2 处理查询条件：领取方式 = 直接领取
-        List<Integer> canTakeTypes = singletonList(CouponTakeTypeEnum.USER.getValue());
-
-        // 2. 分页查询
-        PageResult<CouponTemplateDO> pageResult = couponTemplateService.getCouponTemplatePage(
-                CouponTemplateConvert.INSTANCE.convert(pageReqVO, canTakeTypes, pageReqVO.getProductScope(), productScopeValue));
-
-        // 3.1 领取数量
-        Map<Long, Boolean> canCanTakeMap = couponService.getUserCanCanTakeMap(getLoginUserId(), pageResult.getList());
-        // 3.2 拼接返回
-        return success(CouponTemplateConvert.INSTANCE.convertAppPage(pageResult, canCanTakeMap));
-    }
-
-    /**
-     * 获得商品的使用范围编号
-     *
-     * @param productScope 商品范围
-     * @param spuId        商品 SPU 编号
-     * @return 商品范围编号
-     */
-    private Long getProductScopeValue(Integer productScope, Long spuId) {
-        // 通用券：没有商品范围
-        if (ObjectUtils.equalsAny(productScope, PromotionProductScopeEnum.ALL.getScope(), null)) {
-            return null;
-        }
-        // 品类券：查询商品的品类编号
-        if (Objects.equals(productScope, PromotionProductScopeEnum.CATEGORY.getScope()) && spuId != null) {
-            ProductSpuRespDTO spu = productSpuApi.getSpu(spuId);
-            return spu != null ? spu.getCategoryId() : null;
-        }
-        // 商品卷：直接返回
-        return spuId;
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/diy/AppDiyPageController.java

@@ -1,38 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.diy;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.promotion.controller.app.diy.vo.AppDiyPagePropertyRespVO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.diy.DiyPageDO;
-import cn.newfeifan.mall.module.promotion.service.diy.DiyPageService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 APP - 装修页面")
-@RestController
-@RequestMapping("/promotion/diy-page")
-@Validated
-public class AppDiyPageController {
-
-    @Resource
-    private DiyPageService diyPageService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得装修页面")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<AppDiyPagePropertyRespVO> getDiyPage(@RequestParam("id") Long id) {
-        DiyPageDO diyPage = diyPageService.getDiyPage(id);
-        return success(BeanUtils.toBean(diyPage, AppDiyPagePropertyRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/diy/AppDiyTemplateController.java

@@ -1,65 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.diy;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.promotion.controller.app.diy.vo.AppDiyTemplatePropertyRespVO;
-import cn.newfeifan.mall.module.promotion.convert.diy.DiyTemplateConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.diy.DiyPageDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.diy.DiyTemplateDO;
-import cn.newfeifan.mall.module.promotion.enums.diy.DiyPageEnum;
-import cn.newfeifan.mall.module.promotion.service.diy.DiyPageService;
-import cn.newfeifan.mall.module.promotion.service.diy.DiyTemplateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.findFirst;
-
-@Tag(name = "用户 APP - 装修模板")
-@RestController
-@RequestMapping("/promotion/diy-template")
-@Validated
-public class AppDiyTemplateController {
-
-    @Resource
-    private DiyTemplateService diyTemplateService;
-    @Resource
-    private DiyPageService diyPageService;
-
-    // TODO @疯狂：要不要把 used 和 get 接口合并哈；不传递 id，直接拿默认；
-    @GetMapping("/used")
-    @Operation(summary = "使用中的装修模板")
-    public CommonResult<AppDiyTemplatePropertyRespVO> getUsedDiyTemplate() {
-        DiyTemplateDO diyTemplate = diyTemplateService.getUsedDiyTemplate();
-        return success(buildVo(diyTemplate));
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得装修模板")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<AppDiyTemplatePropertyRespVO> getDiyTemplate(@RequestParam("id") Long id) {
-        DiyTemplateDO diyTemplate = diyTemplateService.getDiyTemplate(id);
-        return success(buildVo(diyTemplate));
-    }
-
-    private AppDiyTemplatePropertyRespVO buildVo(DiyTemplateDO diyTemplate) {
-        if (diyTemplate == null) {
-            return null;
-        }
-        // 查询模板下的页面
-        List<DiyPageDO> pages = diyPageService.getDiyPageByTemplateId(diyTemplate.getId());
-        String home = findFirst(pages, page -> DiyPageEnum.INDEX.getName().equals(page.getName()), DiyPageDO::getProperty);
-        String user = findFirst(pages, page -> DiyPageEnum.MY.getName().equals(page.getName()), DiyPageDO::getProperty);
-        // 拼接返回
-        return DiyTemplateConvert.INSTANCE.convertPropertyVo2(diyTemplate, home, user);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/reward/AppRewardActivityController.java

@@ -1,38 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.reward;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.promotion.controller.app.reward.vo.AppRewardActivityRespVO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.reward.RewardActivityDO;
-import cn.newfeifan.mall.module.promotion.service.reward.RewardActivityService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 满减送活动")
-@RestController
-@RequestMapping("/promotion/reward-activity")
-@Validated
-public class AppRewardActivityController {
-
-    @Resource
-    private RewardActivityService rewardActivityService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得满减送活动")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<AppRewardActivityRespVO> getRewardActivity(@RequestParam("id") Long id) {
-        RewardActivityDO rewardActivity = rewardActivityService.getRewardActivity(id);
-        return success(BeanUtils.toBean(rewardActivity, AppRewardActivityRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/seckill/AppSeckillActivityController.java

@@ -1,152 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.seckill;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.date.LocalDateTimeUtils;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityDetailRespVO;
-import cn.newfeifan.mall.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityNowRespVO;
-import cn.newfeifan.mall.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityPageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityRespVO;
-import cn.newfeifan.mall.module.promotion.convert.seckill.seckillactivity.SeckillActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.seckill.SeckillActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.seckill.SeckillConfigDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.seckill.SeckillProductDO;
-import cn.newfeifan.mall.module.promotion.service.seckill.SeckillActivityService;
-import cn.newfeifan.mall.module.promotion.service.seckill.SeckillConfigService;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.cache.CacheUtils.buildAsyncReloadingCache;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.findFirst;
-import static cn.newfeifan.mall.framework.common.util.date.LocalDateTimeUtils.isBetween;
-
-@Tag(name = "用户 App - 秒杀活动")
-@RestController
-@RequestMapping("/promotion/seckill-activity")
-@Validated
-public class AppSeckillActivityController {
-
-    /**
-     * {@link AppSeckillActivityNowRespVO} 缓存，通过它异步刷新 {@link #getNowSeckillActivity()} 所要的首页数据
-     */
-    private final LoadingCache<String, AppSeckillActivityNowRespVO> nowSeckillActivityCache = buildAsyncReloadingCache(Duration.ofSeconds(10L),
-            new CacheLoader<String, AppSeckillActivityNowRespVO>() {
-
-                @Override
-                public AppSeckillActivityNowRespVO load(String key) {
-                     return getNowSeckillActivity0();
-                }
-
-            });
-
-    @Resource
-    private SeckillActivityService activityService;
-    @Resource
-    @Lazy
-    private SeckillConfigService configService;
-
-    @Resource
-    private ProductSpuApi spuApi;
-
-    @GetMapping("/get-now")
-    @Operation(summary = "获得当前秒杀活动", description = "获取当前正在进行的活动，提供给首页使用")
-    public CommonResult<AppSeckillActivityNowRespVO> getNowSeckillActivity() {
-        return success(nowSeckillActivityCache.getUnchecked("")); // 缓存
-    }
-
-    private AppSeckillActivityNowRespVO getNowSeckillActivity0() {
-        // 1. 获取当前时间处在哪个秒杀阶段
-        SeckillConfigDO config = configService.getCurrentSeckillConfig();
-        if (config == null) { // 时段不存在直接返回 null
-            return new AppSeckillActivityNowRespVO();
-        }
-
-        // 2.1 查询满足当前阶段的活动
-        List<SeckillActivityDO> activityList = activityService.getSeckillActivityListByConfigIdAndStatus(config.getId(), CommonStatusEnum.ENABLE.getStatus());
-        List<SeckillProductDO> productList = activityService.getSeckillProductListByActivityId(
-                convertList(activityList, SeckillActivityDO::getId));
-        // 2.2 获取 spu 信息
-        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(activityList, SeckillActivityDO::getSpuId));
-        return SeckillActivityConvert.INSTANCE.convert(config, activityList, productList, spuList);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得秒杀活动分页")
-    public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage(AppSeckillActivityPageReqVO pageReqVO) {
-        // 1. 查询满足当前阶段的活动
-        PageResult<SeckillActivityDO> pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-        List<SeckillProductDO> productList = activityService.getSeckillProductListByActivityId(
-                convertList(pageResult.getList(), SeckillActivityDO::getId));
-
-        // 2. 拼接数据
-        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(pageResult.getList(), SeckillActivityDO::getSpuId));
-        return success(SeckillActivityConvert.INSTANCE.convertPage02(pageResult, productList, spuList));
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得秒杀活动明细")
-    @Parameter(name = "id", description = "活动编号", required = true, example = "1024")
-    public CommonResult<AppSeckillActivityDetailRespVO> getSeckillActivity(@RequestParam("id") Long id) {
-        // 1. 获取活动
-        SeckillActivityDO activity = activityService.getSeckillActivity(id);
-        if (activity == null
-                || ObjectUtil.equal(activity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
-            return success(null);
-        }
-
-        // 2. 获取时间段
-        List<SeckillConfigDO> configs = configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        configs.removeIf(config -> !CollUtil.contains(activity.getConfigIds(), config.getId()));
-        // 2.1 优先使用当前时间段
-        SeckillConfigDO config = findFirst(configs, config0 -> isBetween(config0.getStartTime(), config0.getEndTime()));
-        // 2.2 如果没有，则获取最后一个，因为倾向优先展示“未开始” > “已结束”
-        if (config == null) {
-            config = CollUtil.getLast(configs);
-        }
-        if (config == null) {
-            return null;
-        }
-        // 3. 计算开始时间、结束时间
-        LocalDate nowDate;
-        // 3.1 如果在活动日期范围内，则以今天为 nowDate
-        if (LocalDateTimeUtils.isBetween(activity.getStartTime(), activity.getEndTime())) {
-            nowDate = LocalDate.now();
-        } else {
-            // 3.2 如果不在活动时间范围内，则直接以活动的 endTime 作为 nowDate，因为还是倾向优先展示“未开始” > “已结束”
-            nowDate = activity.getEndTime().toLocalDate();
-        }
-        LocalDateTime startTime = LocalDateTime.of(nowDate, LocalTime.parse(config.getStartTime()));
-        LocalDateTime endTime = LocalDateTime.of(nowDate, LocalTime.parse(config.getEndTime()));
-
-        // 4. 拼接数据
-        List<SeckillProductDO> productList = activityService.getSeckillProductListByActivityId(activity.getId());
-        return success(SeckillActivityConvert.INSTANCE.convert3(activity, productList, startTime, endTime));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/app/seckill/AppSeckillConfigController.java

@@ -1,36 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.app.seckill;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
-import cn.newfeifan.mall.module.promotion.convert.seckill.seckillconfig.SeckillConfigConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.seckill.SeckillConfigDO;
-import cn.newfeifan.mall.module.promotion.service.seckill.SeckillConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 秒杀时间段")
-@RestController
-@RequestMapping("/promotion/seckill-config")
-@Validated
-public class AppSeckillConfigController {
-    @Resource
-    private SeckillConfigService configService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得秒杀时间段列表")
-    public CommonResult<List<AppSeckillConfigRespVO>> getSeckillConfigList() {
-        List<SeckillConfigDO> list = configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        return success(SeckillConfigConvert.INSTANCE.convertList2(list));
-    }
-
-}

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/controller/app/package-info.java

@@ -1,4 +0,0 @@
-/**
- * TODO 非繁人：占位
- */
-package cn.newfeifan.mall.module.statistics.controller.app;

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/aftersale/AppAfterSaleController.java

@@ -1,71 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.aftersale;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.trade.controller.admin.aftersale.vo.log.AfterSaleLogRespVO;
-import cn.newfeifan.mall.module.trade.controller.app.aftersale.vo.AppAfterSaleCreateReqVO;
-import cn.newfeifan.mall.module.trade.controller.app.aftersale.vo.AppAfterSaleDeliveryReqVO;
-import cn.newfeifan.mall.module.trade.controller.app.aftersale.vo.AppAfterSaleRespVO;
-import cn.newfeifan.mall.module.trade.convert.aftersale.AfterSaleConvert;
-import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 交易售后")
-@RestController
-@RequestMapping("/trade/after-sale")
-@Validated
-@Slf4j
-public class AppAfterSaleController {
-
-    @Resource
-    private AfterSaleService afterSaleService;
-
-    @GetMapping(value = "/page")
-    @Operation(summary = "获得售后分页")
-    public CommonResult<PageResult<AppAfterSaleRespVO>> getAfterSalePage(PageParam pageParam) {
-        return success(AfterSaleConvert.INSTANCE.convertPage02(
-                afterSaleService.getAfterSalePage(getLoginUserId(), pageParam)));
-    }
-
-    @GetMapping(value = "/get")
-    @Operation(summary = "获得售后订单")
-    @Parameter(name = "id", description = "售后编号", required = true, example = "1")
-    public CommonResult<AppAfterSaleRespVO> getAfterSale(@RequestParam("id") Long id) {
-        return success(AfterSaleConvert.INSTANCE.convert(afterSaleService.getAfterSale(getLoginUserId(), id)));
-    }
-
-    @PostMapping(value = "/create")
-    @Operation(summary = "申请售后")
-    public CommonResult<Long> createAfterSale(@RequestBody AppAfterSaleCreateReqVO createReqVO) {
-        return success(afterSaleService.createAfterSale(getLoginUserId(), createReqVO));
-    }
-
-    @PutMapping(value = "/delivery")
-    @Operation(summary = "退回货物")
-    public CommonResult<Boolean> deliveryAfterSale(@RequestBody AppAfterSaleDeliveryReqVO deliveryReqVO) {
-        afterSaleService.deliveryAfterSale(getLoginUserId(), deliveryReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping(value = "/cancel")
-    @Operation(summary = "取消售后")
-    @Parameter(name = "id", description = "售后编号", required = true, example = "1")
-    public CommonResult<Boolean> cancelAfterSale(@RequestParam("id") Long id) {
-        afterSaleService.cancelAfterSale(getLoginUserId(), id);
-        return success(true);
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/aftersale/AppAfterSaleLogController.java

@@ -1,42 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.aftersale;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.trade.controller.app.aftersale.vo.log.AppAfterSaleLogRespVO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.aftersale.AfterSaleLogDO;
-import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleLogService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 售后日志")
-@RestController
-@RequestMapping("/trade/after-sale-log")
-@Validated
-@Slf4j
-public class AppAfterSaleLogController {
-
-    @Resource
-    private AfterSaleLogService afterSaleLogService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得售后日志列表")
-    @Parameter(name = "afterSaleId", description = "售后编号", required = true, example = "1")
-    public CommonResult<List<AppAfterSaleLogRespVO>> getAfterSaleLogList(
-            @RequestParam("afterSaleId") Long afterSaleId) {
-        List<AfterSaleLogDO> logs = afterSaleLogService.getAfterSaleLogList(afterSaleId);
-        return success(BeanUtils.toBean(logs, AppAfterSaleLogRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/base/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 基础包，放一些通用的 VO 类
- */
-package cn.newfeifan.mall.module.trade.controller.app.base;

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/brokerage/AppBrokerageRecordController.java

@@ -1,52 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.brokerage;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.trade.controller.app.brokerage.vo.record.AppBrokerageProductPriceRespVO;
-import cn.newfeifan.mall.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordPageReqVO;
-import cn.newfeifan.mall.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordRespVO;
-import cn.newfeifan.mall.module.trade.convert.brokerage.BrokerageRecordConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 分销用户")
-@RestController
-@RequestMapping("/trade/brokerage-record")
-@Validated
-@Slf4j
-public class AppBrokerageRecordController {
-    @Resource
-    private BrokerageRecordService brokerageRecordService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得分销记录分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppBrokerageRecordRespVO>> getBrokerageRecordPage(@Valid AppBrokerageRecordPageReqVO pageReqVO) {
-        PageResult<BrokerageRecordDO> pageResult = brokerageRecordService.getBrokerageRecordPage(
-                BrokerageRecordConvert.INSTANCE.convert(pageReqVO, getLoginUserId()));
-        return success(BeanUtils.toBean(pageResult, AppBrokerageRecordRespVO.class));
-    }
-
-    @GetMapping("/get-product-brokerage-price")
-    @Operation(summary = "获得商品的分销金额")
-    public CommonResult<AppBrokerageProductPriceRespVO> getProductBrokeragePrice(@RequestParam("spuId") Long spuId) {
-        return success(brokerageRecordService.calculateProductBrokeragePrice(getLoginUserId(), spuId));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/brokerage/AppBrokerageUserController.java

@@ -1,141 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.brokerage;
-
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.trade.controller.app.brokerage.vo.user.*;
-import cn.newfeifan.mall.module.trade.convert.brokerage.BrokerageRecordConvert;
-import cn.newfeifan.mall.module.trade.convert.brokerage.BrokerageUserConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
-import cn.newfeifan.mall.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
-import cn.newfeifan.mall.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
-import cn.newfeifan.mall.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageRecordService;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageUserService;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageWithdrawService;
-import cn.newfeifan.mall.module.trade.service.brokerage.bo.BrokerageWithdrawSummaryRespBO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 分销用户")
-@RestController
-@RequestMapping("/trade/brokerage-user")
-@Validated
-@Slf4j
-public class AppBrokerageUserController {
-
-    @Resource
-    private BrokerageUserService brokerageUserService;
-    @Resource
-    private BrokerageRecordService brokerageRecordService;
-    @Resource
-    private BrokerageWithdrawService brokerageWithdrawService;
-
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得个人分销信息")
-    @PreAuthenticated
-    public CommonResult<AppBrokerageUserRespVO> getBrokerageUser() {
-        Optional<BrokerageUserDO> user = Optional.ofNullable(brokerageUserService.getBrokerageUser(getLoginUserId()));
-        // 返回数据
-        AppBrokerageUserRespVO respVO = new AppBrokerageUserRespVO()
-                .setBrokerageEnabled(user.map(BrokerageUserDO::getBrokerageEnabled).orElse(false))
-                .setBrokeragePrice(user.map(BrokerageUserDO::getBrokeragePrice).orElse(0))
-                .setFrozenPrice(user.map(BrokerageUserDO::getFrozenPrice).orElse(0));
-        return success(respVO);
-    }
-
-    @PutMapping("/bind")
-    @Operation(summary = "绑定推广员")
-    @PreAuthenticated
-    public CommonResult<Boolean> bindBrokerageUser(@Valid @RequestBody AppBrokerageUserBindReqVO reqVO) {
-        return success(brokerageUserService.bindBrokerageUser(getLoginUserId(), reqVO.getBindUserId()));
-    }
-
-    @GetMapping("/get-summary")
-    @Operation(summary = "获得个人分销统计")
-    @PreAuthenticated
-    public CommonResult<AppBrokerageUserMySummaryRespVO> getBrokerageUserSummary() {
-        // 查询当前登录用户信息
-        BrokerageUserDO brokerageUser = brokerageUserService.getBrokerageUser(getLoginUserId());
-        // 统计用户昨日的佣金
-        LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
-        LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(yesterday);
-        LocalDateTime endTime = LocalDateTimeUtil.endOfDay(yesterday);
-        Integer yesterdayPrice = brokerageRecordService.getSummaryPriceByUserId(brokerageUser.getId(),
-                BrokerageRecordBizTypeEnum.ORDER, BrokerageRecordStatusEnum.SETTLEMENT, beginTime, endTime);
-        // 统计用户提现的佣金
-        Integer withdrawPrice = brokerageWithdrawService.getWithdrawSummaryListByUserId(Collections.singleton(brokerageUser.getId()),
-                        BrokerageWithdrawStatusEnum.AUDIT_SUCCESS).stream()
-                .findFirst().map(BrokerageWithdrawSummaryRespBO::getPrice).orElse(0);
-        // 统计分销用户数量（一级）
-        Long firstBrokerageUserCount = brokerageUserService.getBrokerageUserCountByBindUserId(brokerageUser.getId(), 1);
-        // 统计分销用户数量（二级）
-        Long secondBrokerageUserCount = brokerageUserService.getBrokerageUserCountByBindUserId(brokerageUser.getId(), 2);
-
-        // 拼接返回
-        return success(BrokerageUserConvert.INSTANCE.convert(yesterdayPrice, withdrawPrice, firstBrokerageUserCount, secondBrokerageUserCount, brokerageUser));
-    }
-
-    @GetMapping("/rank-page-by-user-count")
-    @Operation(summary = "获得分销用户排行分页（基于用户量）")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppBrokerageUserRankByUserCountRespVO>> getBrokerageUserRankPageByUserCount(AppBrokerageUserRankPageReqVO pageReqVO) {
-        // 分页查询
-        PageResult<AppBrokerageUserRankByUserCountRespVO> pageResult = brokerageUserService.getBrokerageUserRankPageByUserCount(pageReqVO);
-        // 拼接数据
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(convertSet(pageResult.getList(), AppBrokerageUserRankByUserCountRespVO::getId));
-        return success(BrokerageUserConvert.INSTANCE.convertPage03(pageResult, userMap));
-    }
-
-    @GetMapping("/rank-page-by-price")
-    @Operation(summary = "获得分销用户排行分页（基于佣金）")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppBrokerageUserRankByPriceRespVO>> getBrokerageUserChildSummaryPageByPrice(AppBrokerageUserRankPageReqVO pageReqVO) {
-        // 分页查询
-        PageResult<AppBrokerageUserRankByPriceRespVO> pageResult = brokerageRecordService.getBrokerageUserChildSummaryPageByPrice(pageReqVO);
-        // 拼接数据
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(convertSet(pageResult.getList(), AppBrokerageUserRankByPriceRespVO::getId));
-        return success(BrokerageRecordConvert.INSTANCE.convertPage03(pageResult, userMap));
-    }
-
-    @GetMapping("/child-summary-page")
-    @Operation(summary = "获得下级分销统计分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppBrokerageUserChildSummaryRespVO>> getBrokerageUserChildSummaryPage(
-            AppBrokerageUserChildSummaryPageReqVO pageReqVO) {
-        PageResult<AppBrokerageUserChildSummaryRespVO> pageResult = brokerageUserService.getBrokerageUserChildSummaryPage(pageReqVO, getLoginUserId());
-        return success(pageResult);
-    }
-
-    @GetMapping("/get-rank-by-price")
-    @Operation(summary = "获得分销用户排行（基于佣金）")
-    @Parameter(name = "times", description = "时间段", required = true)
-    public CommonResult<Integer> getRankByPrice(
-            @RequestParam("times") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime[] times) {
-        return success(brokerageRecordService.getUserRankByPrice(getLoginUserId(), times));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java

@@ -1,50 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.brokerage;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawCreateReqVO;
-import cn.newfeifan.mall.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawPageReqVO;
-import cn.newfeifan.mall.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawRespVO;
-import cn.newfeifan.mall.module.trade.convert.brokerage.BrokerageWithdrawConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageWithdrawService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 分销提现")
-@RestController
-@RequestMapping("/trade/brokerage-withdraw")
-@Validated
-@Slf4j
-public class AppBrokerageWithdrawController {
-
-    @Resource
-    private BrokerageWithdrawService brokerageWithdrawService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得分销提现分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppBrokerageWithdrawRespVO>> getBrokerageWithdrawPage(AppBrokerageWithdrawPageReqVO pageReqVO) {
-        PageResult<BrokerageWithdrawDO> pageResult = brokerageWithdrawService.getBrokerageWithdrawPage(
-                BrokerageWithdrawConvert.INSTANCE.convert(pageReqVO, getLoginUserId()));
-        return success(BrokerageWithdrawConvert.INSTANCE.convertPage03(pageResult));
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "创建分销提现")
-    @PreAuthenticated
-    public CommonResult<Long> createBrokerageWithdraw(@RequestBody @Valid AppBrokerageWithdrawCreateReqVO createReqVO) {
-        return success(brokerageWithdrawService.createBrokerageWithdraw(getLoginUserId(), createReqVO));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/cart/AppCartController.http

@@ -1,42 +0,0 @@
-### 请求 /trade/cart/add 接口 => 成功
-POST {{appApi}}/trade/cart/add
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-Content-Type: application/json
-
-{
-  "skuId": 1,
-  "count": 10,
-  "addStatus": true
-}
-
-### 请求 /trade/cart/update 接口 => 成功
-PUT {{appApi}}/trade/cart/update
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-Content-Type: application/json
-
-{
-  "id": 35,
-  "count": 5
-}
-
-### 请求 /trade/cart/delete 接口 => 成功
-DELETE {{appApi}}/trade/cart/delete?ids=1
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /trade/cart/get-count 接口 => 成功
-GET {{appApi}}/trade/cart/get-count
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /trade/cart/get-count-map 接口 => 成功
-GET {{appApi}}/trade/cart/get-count-map
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /trade/cart/list 接口 => 成功
-GET {{appApi}}/trade/cart/list
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/cart/AppCartController.java

@@ -1,87 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.cart;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.trade.controller.app.cart.vo.*;
-import cn.newfeifan.mall.module.trade.service.cart.CartService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 购物车")
-@RestController
-@RequestMapping("/trade/cart")
-@RequiredArgsConstructor
-@Validated
-@Slf4j
-public class AppCartController {
-
-    @Resource
-    private CartService cartService;
-
-    @PostMapping("/add")
-    @Operation(summary = "添加购物车商品")
-    @PreAuthenticated
-    public CommonResult<Long> addCart(@Valid @RequestBody AppCartAddReqVO addCountReqVO) {
-        return success(cartService.addCart(getLoginUserId(), addCountReqVO));
-    }
-
-    @PutMapping("/update-count")
-    @Operation(summary = "更新购物车商品数量")
-    @PreAuthenticated
-    public CommonResult<Boolean> updateCartCount(@Valid @RequestBody AppCartUpdateCountReqVO updateReqVO) {
-        cartService.updateCartCount(getLoginUserId(), updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-selected")
-    @Operation(summary = "更新购物车商品选中")
-    @PreAuthenticated
-    public CommonResult<Boolean> updateCartSelected(@Valid @RequestBody AppCartUpdateSelectedReqVO updateReqVO) {
-        cartService.updateCartSelected(getLoginUserId(), updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/reset")
-    @Operation(summary = "重置购物车商品")
-    @PreAuthenticated
-    public CommonResult<Boolean> resetCart(@Valid @RequestBody AppCartResetReqVO updateReqVO) {
-        cartService.resetCart(getLoginUserId(), updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除购物车商品")
-    @Parameter(name = "ids", description = "购物车商品编号", required = true, example = "1024,2048")
-    @PreAuthenticated
-    public CommonResult<Boolean> deleteCart(@RequestParam("ids") List<Long> ids) {
-        cartService.deleteCart(getLoginUserId(), ids);
-        return success(true);
-    }
-
-    @GetMapping("get-count")
-    @Operation(summary = "查询用户在购物车中的商品数量")
-    @PreAuthenticated
-    public CommonResult<Integer> getCartCount() {
-        return success(cartService.getCartCount(getLoginUserId()));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "查询用户的购物车列表")
-    @PreAuthenticated
-    public CommonResult<AppCartListRespVO> getCartList() {
-        return success(cartService.getCartList(getLoginUserId()));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/config/AppTradeConfigController.java

@@ -1,44 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.config;
-
-import cn.hutool.core.util.ObjUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.trade.controller.app.config.vo.AppTradeConfigRespVO;
-import cn.newfeifan.mall.module.trade.convert.config.TradeConfigConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.config.TradeConfigDO;
-import cn.newfeifan.mall.module.trade.service.config.TradeConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 交易配置")
-@RestController
-@RequestMapping("/trade/config")
-@RequiredArgsConstructor
-@Validated
-@Slf4j
-public class AppTradeConfigController {
-
-    @Resource
-    private TradeConfigService tradeConfigService;
-
-    @Value("${feifan.tencent-lbs-key}")
-    private String tencentLbsKey;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得交易配置")
-    public CommonResult<AppTradeConfigRespVO> getTradeConfig() {
-        TradeConfigDO config = ObjUtil.defaultIfNull(tradeConfigService.getTradeConfig(), new TradeConfigDO());
-        return success(TradeConfigConvert.INSTANCE.convert02(config).setTencentLbsKey(tencentLbsKey));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/delivery/AppDeliverConfigController.java

@@ -1,27 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.delivery;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.trade.controller.app.delivery.vo.config.AppDeliveryConfigRespVO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 配送配置")
-@RestController
-@RequestMapping("/trade/delivery/config")
-@Validated
-public class AppDeliverConfigController {
-
-    // TODO @非繁人：这里后面干掉，合并到 AppTradeConfigController 中
-    @GetMapping("/get")
-    @Operation(summary = "获得配送配置")
-    public CommonResult<AppDeliveryConfigRespVO> getDeliveryConfig() {
-        return success(new AppDeliveryConfigRespVO().setPickUpEnable(true).setTencentLbsKey("123456"));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/delivery/AppDeliverExpressController.java

@@ -1,39 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.delivery;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.trade.controller.app.delivery.vo.express.AppDeliveryExpressRespVO;
-import cn.newfeifan.mall.module.trade.convert.delivery.DeliveryExpressConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
-import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 快递公司")
-@RestController
-@RequestMapping("/trade/delivery/express")
-@Validated
-public class AppDeliverExpressController {
-
-    @Resource
-    private DeliveryExpressService deliveryExpressService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得快递公司列表")
-    public CommonResult<List<AppDeliveryExpressRespVO>> getDeliveryExpressList() {
-        List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        list.sort(Comparator.comparing(DeliveryExpressDO::getSort));
-        return success(DeliveryExpressConvert.INSTANCE.convertList03(list));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/delivery/AppDeliverPickUpStoreController.java

@@ -1,55 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.delivery;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.trade.controller.app.delivery.vo.pickup.AppDeliveryPickUpStoreRespVO;
-import cn.newfeifan.mall.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
-import cn.newfeifan.mall.module.trade.service.delivery.DeliveryPickUpStoreService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 自提门店")
-@RestController
-@RequestMapping("/trade/delivery/pick-up-store")
-@Validated
-public class AppDeliverPickUpStoreController {
-
-    @Resource
-    private DeliveryPickUpStoreService deliveryPickUpStoreService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得自提门店列表")
-    @Parameters({
-            @Parameter(name = "latitude", description = "精度", example = "110"),
-            @Parameter(name = "longitude", description = "纬度", example = "120")
-    })
-    public CommonResult<List<AppDeliveryPickUpStoreRespVO>> getDeliveryPickUpStoreList(
-            @RequestParam(value = "latitude", required = false) Double latitude,
-            @RequestParam(value = "longitude", required = false) Double longitude) {
-        List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(
-                CommonStatusEnum.ENABLE.getStatus());
-        return success(DeliveryPickUpStoreConvert.INSTANCE.convertList(list, latitude, longitude));
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得自提门店")
-    @Parameter(name = "id", description = "门店编号")
-    public CommonResult<AppDeliveryPickUpStoreRespVO> getOrder(@RequestParam("id") Long id) {
-        DeliveryPickUpStoreDO store = deliveryPickUpStoreService.getDeliveryPickUpStore(id);
-        return success(DeliveryPickUpStoreConvert.INSTANCE.convert03(store));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/AppTradeOrderController.http

@@ -1,64 +0,0 @@
-### /trade-order/settlement 获得订单结算信息（基于商品）
-GET {{appApi}}/trade/order/settlement?type=0&items[0].skuId=1&items[0].count=2&items[1].skuId=2&items[1].count=3&couponId=1
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-### /trade-order/settlement 获得订单结算信息（基于购物车）
-GET {{appApi}}/trade/order/settlement?type=0&items[0].cartId=50&couponId=1
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-### /trade-order/create 创建订单（基于商品）【快递】
-POST {{appApi}}/trade/order/create
-Content-Type: application/json
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-{
-  "pointStatus": true,
-  "deliveryType": 1,
-  "addressId": 21,
-  "items": [
-    {
-      "skuId": 1,
-      "count": 2
-    }
-  ],
-  "remark": "我是备注"
-}
-
-### /trade-order/create 创建订单（基于商品）【自提】
-POST {{appApi}}/trade/order/create
-Content-Type: application/json
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-{
-  "pointStatus": true,
-  "deliveryType": 2,
-  "pickUpStoreId": 1,
-  "items": [
-    {
-      "skuId": 1,
-      "count": 2
-    }
-  ],
-  "remark": "我是备注",
-  "receiverName": "土豆",
-  "receiverMobile": "15601691300"
-}
-
-### 获得订单交易的分页
-GET {{appApi}}/trade/order/page?pageNo=1&pageSize=10
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-### 获得订单交易的详细
-GET {{appApi}}/trade/order/get-detail?id=21
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-### 获得交易订单的物流轨迹
-GET {{appApi}}/trade/order/get-express-track-list?id=70
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/AppTradeOrderController.java

@@ -1,182 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.app.order;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
-import cn.newfeifan.mall.module.trade.controller.app.order.vo.*;
-import cn.newfeifan.mall.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO;
-import cn.newfeifan.mall.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
-import cn.newfeifan.mall.module.trade.convert.order.TradeOrderConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.newfeifan.mall.module.trade.enums.order.TradeOrderStatusEnum;
-import cn.newfeifan.mall.module.trade.framework.order.config.TradeOrderProperties;
-import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
-import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
-import com.google.common.collect.Maps;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 交易订单")
-@RestController
-@RequestMapping("/trade/order")
-@Validated
-@Slf4j
-public class AppTradeOrderController {
-
-    @Resource
-    private TradeOrderUpdateService tradeOrderUpdateService;
-    @Resource
-    private TradeOrderQueryService tradeOrderQueryService;
-    @Resource
-    private DeliveryExpressService deliveryExpressService;
-
-    @Resource
-    private AfterSaleService afterSaleService;
-
-    @Resource
-    private TradeOrderProperties tradeOrderProperties;
-
-    @GetMapping("/settlement")
-    @Operation(summary = "获得订单结算信息")
-    @PreAuthenticated
-    public CommonResult<AppTradeOrderSettlementRespVO> settlementOrder(@Valid AppTradeOrderSettlementReqVO settlementReqVO) {
-        return success(tradeOrderUpdateService.settlementOrder(getLoginUserId(), settlementReqVO));
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单")
-    @PreAuthenticated
-    public CommonResult<AppTradeOrderCreateRespVO> createOrder(@Valid @RequestBody AppTradeOrderCreateReqVO createReqVO) {
-        TradeOrderDO order = tradeOrderUpdateService.createOrder(getLoginUserId(), createReqVO);
-        return success(new AppTradeOrderCreateRespVO().setId(order.getId()).setPayOrderId(order.getPayOrderId()));
-    }
-
-    @PostMapping("/update-paid")
-    @Operation(summary = "更新订单为已支付") // 由 pay-module 支付服务，进行回调，可见 PayNotifyJob
-    public CommonResult<Boolean> updateOrderPaid(@RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
-        tradeOrderUpdateService.updateOrderPaid(Long.valueOf(notifyReqDTO.getMerchantOrderId()),
-                notifyReqDTO.getPayOrderId());
-        return success(true);
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得交易订单")
-    @Parameter(name = "id", description = "交易订单编号")
-    public CommonResult<AppTradeOrderDetailRespVO> getOrder(@RequestParam("id") Long id) {
-        // 查询订单
-        TradeOrderDO order = tradeOrderQueryService.getOrder(getLoginUserId(), id);
-        if (order == null) {
-            return success(null);
-        }
-
-        // 查询订单项
-        List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(order.getId());
-        // 查询物流公司
-        DeliveryExpressDO express = order.getLogisticsId() != null && order.getLogisticsId() > 0 ?
-                deliveryExpressService.getDeliveryExpress(order.getLogisticsId()) : null;
-        // 最终组合
-        return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, tradeOrderProperties, express));
-    }
-
-    @GetMapping("/get-express-track-list")
-    @Operation(summary = "获得交易订单的物流轨迹")
-    @Parameter(name = "id", description = "交易订单编号")
-    public CommonResult<List<AppOrderExpressTrackRespDTO>> getOrderExpressTrackList(@RequestParam("id") Long id) {
-        return success(TradeOrderConvert.INSTANCE.convertList02(
-                tradeOrderQueryService.getExpressTrackList(id, getLoginUserId())));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得交易订单分页")
-    public CommonResult<PageResult<AppTradeOrderPageItemRespVO>> getOrderPage(AppTradeOrderPageReqVO reqVO) {
-        // 查询订单
-        PageResult<TradeOrderDO> pageResult = tradeOrderQueryService.getOrderPage(getLoginUserId(), reqVO);
-        // 查询订单项
-        List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(
-                convertSet(pageResult.getList(), TradeOrderDO::getId));
-        // 最终组合
-        return success(TradeOrderConvert.INSTANCE.convertPage02(pageResult, orderItems));
-    }
-
-    @GetMapping("/get-count")
-    @Operation(summary = "获得交易订单数量")
-    public CommonResult<Map<String, Long>> getOrderCount() {
-        Map<String, Long> orderCount = Maps.newLinkedHashMapWithExpectedSize(5);
-        // 全部
-        orderCount.put("allCount", tradeOrderQueryService.getOrderCount(getLoginUserId(), null, null));
-        // 待付款（未支付）
-        orderCount.put("unpaidCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
-                TradeOrderStatusEnum.UNPAID.getStatus(), null));
-        // 待发货
-        orderCount.put("undeliveredCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
-                TradeOrderStatusEnum.UNDELIVERED.getStatus(), null));
-        // 待收货
-        orderCount.put("deliveredCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
-                TradeOrderStatusEnum.DELIVERED.getStatus(), null));
-        // 待评价
-        orderCount.put("uncommentedCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
-                TradeOrderStatusEnum.COMPLETED.getStatus(), false));
-        // 售后数量
-        orderCount.put("afterSaleCount", afterSaleService.getApplyingAfterSaleCount(getLoginUserId()));
-        return success(orderCount);
-    }
-
-    @PutMapping("/receive")
-    @Operation(summary = "确认交易订单收货")
-    @Parameter(name = "id", description = "交易订单编号")
-    public CommonResult<Boolean> receiveOrder(@RequestParam("id") Long id) {
-        tradeOrderUpdateService.receiveOrderByMember(getLoginUserId(), id);
-        return success(true);
-    }
-
-    @DeleteMapping("/cancel")
-    @Operation(summary = "取消交易订单")
-    @Parameter(name = "id", description = "交易订单编号")
-    public CommonResult<Boolean> cancelOrder(@RequestParam("id") Long id) {
-        tradeOrderUpdateService.cancelOrderByMember(getLoginUserId(), id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除交易订单")
-    @Parameter(name = "id", description = "交易订单编号")
-    public CommonResult<Boolean> deleteOrder(@RequestParam("id") Long id) {
-        tradeOrderUpdateService.deleteOrder(getLoginUserId(), id);
-        return success(true);
-    }
-
-    // ========== 订单项 ==========
-
-    @GetMapping("/item/get")
-    @Operation(summary = "获得交易订单项")
-    @Parameter(name = "id", description = "交易订单项编号")
-    public CommonResult<AppTradeOrderItemRespVO> getOrderItem(@RequestParam("id") Long id) {
-        TradeOrderItemDO item = tradeOrderQueryService.getOrderItem(getLoginUserId(), id);
-        return success(TradeOrderConvert.INSTANCE.convert03(item));
-    }
-
-    @PostMapping("/item/create-comment")
-    @Operation(summary = "创建交易订单项的评价")
-    public CommonResult<Long> createOrderItemComment(@RequestBody AppTradeOrderItemCommentCreateReqVO createReqVO) {
-        return success(tradeOrderUpdateService.createOrderItemCommentByMember(getLoginUserId(), createReqVO));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/address/AppAddressController.http

@@ -1,54 +0,0 @@
-### 请求 /create 接口 => 成功
-POST {{appApi}}//member/address/create
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-{
-  "name": "yunai",
-  "mobile": "15601691300",
-  "areaId": "610632",
-  "postCode": "200000",
-  "detailAddress": "非繁源码 233 号 666 室",
-  "defaulted": true
-}
-
-### 请求 /update 接口 => 成功
-PUT {{appApi}}//member/address/update
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-{
-  "id": "1",
-  "name": "yunai888",
-  "mobile": "15601691300",
-  "areaId": "610632",
-  "postCode": "200000",
-  "detailAddress": "非繁源码 233 号 666 室",
-  "defaulted": false
-}
-
-### 请求 /delete 接口 => 成功
-DELETE {{appApi}}//member/address/delete?id=2
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /get 接口 => 成功
-GET {{appApi}}//member/address/get?id=1
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /get-default 接口 => 成功
-GET {{appApi}}//member/address/get-default
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}
-
-### 请求 /list 接口 => 成功
-GET {{appApi}}//member/address/list
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-Authorization: Bearer {{appToken}}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/address/AppAddressController.java

@@ -1,82 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.address;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.member.controller.app.address.vo.AppAddressCreateReqVO;
-import cn.newfeifan.mall.module.member.controller.app.address.vo.AppAddressRespVO;
-import cn.newfeifan.mall.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
-import cn.newfeifan.mall.module.member.convert.address.AddressConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.address.MemberAddressDO;
-import cn.newfeifan.mall.module.member.service.address.AddressService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 用户收件地址")
-@RestController
-@RequestMapping("/member/address")
-@Validated
-public class AppAddressController {
-
-    @Resource
-    private AddressService addressService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建用户收件地址")
-    @PreAuthenticated
-    public CommonResult<Long> createAddress(@Valid @RequestBody AppAddressCreateReqVO createReqVO) {
-        return success(addressService.createAddress(getLoginUserId(), createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新用户收件地址")
-    @PreAuthenticated
-    public CommonResult<Boolean> updateAddress(@Valid @RequestBody AppAddressUpdateReqVO updateReqVO) {
-        addressService.updateAddress(getLoginUserId(), updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除用户收件地址")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthenticated
-    public CommonResult<Boolean> deleteAddress(@RequestParam("id") Long id) {
-        addressService.deleteAddress(getLoginUserId(), id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得用户收件地址")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthenticated
-    public CommonResult<AppAddressRespVO> getAddress(@RequestParam("id") Long id) {
-        MemberAddressDO address = addressService.getAddress(getLoginUserId(), id);
-        return success(AddressConvert.INSTANCE.convert(address));
-    }
-
-    @GetMapping("/get-default")
-    @Operation(summary = "获得默认的用户收件地址")
-    @PreAuthenticated
-    public CommonResult<AppAddressRespVO> getDefaultUserAddress() {
-        MemberAddressDO address = addressService.getDefaultUserAddress(getLoginUserId());
-        return success(AddressConvert.INSTANCE.convert(address));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得用户收件地址列表")
-    @PreAuthenticated
-    public CommonResult<List<AppAddressRespVO>> getAddressList() {
-        List<MemberAddressDO> list = addressService.getAddressList(getLoginUserId());
-        return success(AddressConvert.INSTANCE.convertList(list));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/auth/AppAuthController.http

@@ -1,67 +0,0 @@
-### 请求 /login 接口 => 成功
-POST {{appApi}}/member/auth/login
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "mobile": "15601691388",
-  "password": "admin123"
-}
-
-### 请求 /send-sms-code 接口 => 成功
-POST {{appApi}}/member/auth/send-sms-code
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "mobile": "15601691388",
-  "scene": 1
-}
-
-### 请求 /sms-login 接口 => 成功
-POST {{appApi}}/member/auth/sms-login
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-terminal: 30
-
-{
-  "mobile": "15601691388",
-  "code": 9999
-}
-
-### 请求 /social-login 接口 => 成功
-POST {{appApi}}/member/auth/social-login
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "type": 34,
-  "code": "0e1oc9000CTjFQ1oim200bhtb61oc90g",
-  "state": "default"
-}
-
-### 请求 /weixin-mini-app-login 接口 => 成功
-POST {{appApi}}/member/auth/weixin-mini-app-login
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-{
-  "phoneCode": "618e6412e0c728f5b8fc7164497463d0158a923c9e7fd86af8bba393b9decbc5",
-  "loginCode": "001frTkl21JUf94VGxol2hSlff1frTkR"
-}
-
-### 请求 /logout 接口 => 成功
-POST {{appApi}}/member/auth/logout
-Content-Type: application/json
-Authorization: Bearer c1b76bdaf2c146c581caa4d7fd81ee66
-tenant-id: {{appTenentId}}
-
-### 请求 /auth/refresh-token 接口 => 成功
-POST {{appApi}}/member/auth/refresh-token?refreshToken=bc43d929094849a28b3a69f6e6940d70
-Content-Type: application/json
-tenant-id: {{appTenentId}}
-
-### 请求 /auth/create-weixin-jsapi-signature 接口 => 成功
-POST {{appApi}}/member/auth/create-weixin-jsapi-signature?url=http://www.zhongxing.cn
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/auth/AppAuthController.java

@@ -1,128 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.auth;
-
-import cn.hutool.core.util.StrUtil;
-import cn.newfeifan.mall.framework.common.enums.UserTypeEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.framework.security.config.SecurityProperties;
-import cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils;
-import cn.newfeifan.mall.module.member.controller.app.auth.vo.*;
-import cn.newfeifan.mall.module.member.convert.auth.AuthConvert;
-import cn.newfeifan.mall.module.member.service.auth.MemberAuthService;
-import cn.newfeifan.mall.module.system.api.social.SocialClientApi;
-import cn.newfeifan.mall.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 认证")
-@RestController
-@RequestMapping("/member/auth")
-@Validated
-@Slf4j
-public class AppAuthController {
-
-    @Resource
-    private MemberAuthService authService;
-
-    @Resource
-    private SocialClientApi socialClientApi;
-
-    @Resource
-    private SecurityProperties securityProperties;
-
-    @PostMapping("/login")
-    @Operation(summary = "使用手机 + 密码登录")
-    public CommonResult<AppAuthLoginRespVO> login(@RequestBody @Valid AppAuthLoginReqVO reqVO) {
-        return success(authService.login(reqVO));
-    }
-
-    @PostMapping("/logout")
-    @PermitAll
-    @Operation(summary = "登出系统")
-    public CommonResult<Boolean> logout(HttpServletRequest request) {
-        String token = SecurityFrameworkUtils.obtainAuthorization(request,
-                securityProperties.getTokenHeader(), securityProperties.getTokenParameter());
-        if (StrUtil.isNotBlank(token)) {
-            authService.logout(token);
-        }
-        return success(true);
-    }
-
-    @PostMapping("/refresh-token")
-    @Operation(summary = "刷新令牌")
-    @Parameter(name = "refreshToken", description = "刷新令牌", required = true)
-    @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
-    public CommonResult<AppAuthLoginRespVO> refreshToken(@RequestParam("refreshToken") String refreshToken) {
-        return success(authService.refreshToken(refreshToken));
-    }
-
-    // ========== 短信登录相关 ==========
-
-    @PostMapping("/sms-login")
-    @Operation(summary = "使用手机 + 验证码登录")
-    public CommonResult<AppAuthLoginRespVO> smsLogin(@RequestBody @Valid AppAuthSmsLoginReqVO reqVO) {
-        return success(authService.smsLogin(reqVO));
-    }
-
-    @PostMapping("/send-sms-code")
-    @Operation(summary = "发送手机验证码")
-    public CommonResult<Boolean> sendSmsCode(@RequestBody @Valid AppAuthSmsSendReqVO reqVO) {
-        authService.sendSmsCode(getLoginUserId(), reqVO);
-        return success(true);
-    }
-
-    @PostMapping("/validate-sms-code")
-    @Operation(summary = "校验手机验证码")
-    public CommonResult<Boolean> validateSmsCode(@RequestBody @Valid AppAuthSmsValidateReqVO reqVO) {
-        authService.validateSmsCode(getLoginUserId(), reqVO);
-        return success(true);
-    }
-
-    // ========== 社交登录相关 ==========
-
-    @GetMapping("/social-auth-redirect")
-    @Operation(summary = "社交授权的跳转")
-    @Parameters({
-            @Parameter(name = "type", description = "社交类型", required = true),
-            @Parameter(name = "redirectUri", description = "回调路径")
-    })
-    public CommonResult<String> socialAuthRedirect(@RequestParam("type") Integer type,
-                                                   @RequestParam("redirectUri") String redirectUri) {
-        return CommonResult.success(authService.getSocialAuthorizeUrl(type, redirectUri));
-    }
-
-    @PostMapping("/social-login")
-    @Operation(summary = "社交快捷登录，使用 code 授权码", description = "适合未登录的用户，但是社交账号已绑定用户")
-    public CommonResult<AppAuthLoginRespVO> socialLogin(@RequestBody @Valid AppAuthSocialLoginReqVO reqVO) {
-        return success(authService.socialLogin(reqVO));
-    }
-
-    @PostMapping("/weixin-mini-app-login")
-    @Operation(summary = "微信小程序的一键登录")
-    public CommonResult<AppAuthLoginRespVO> weixinMiniAppLogin(@RequestBody @Valid AppAuthWeixinMiniAppLoginReqVO reqVO) {
-        return success(authService.weixinMiniAppLogin(reqVO));
-    }
-
-    @PostMapping("/create-weixin-jsapi-signature")
-    @Operation(summary = "创建微信 JS SDK 初始化所需的签名",
-            description = "参考 https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html 文档")
-    public CommonResult<SocialWxJsapiSignatureRespDTO> createWeixinMpJsapiSignature(@RequestParam("url") String url) {
-        SocialWxJsapiSignatureRespDTO signature = socialClientApi.createWxMpJsapiSignature(
-                UserTypeEnum.MEMBER.getValue(), url);
-        return success(AuthConvert.INSTANCE.convert(signature));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/level/AppMemberExperienceRecordController.java

@@ -1,43 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.level;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.member.controller.app.level.vo.experience.AppMemberExperienceRecordRespVO;
-import cn.newfeifan.mall.module.member.convert.level.MemberExperienceRecordConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.level.MemberExperienceRecordDO;
-import cn.newfeifan.mall.module.member.service.level.MemberExperienceRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 会员经验记录")
-@RestController
-@RequestMapping("/member/experience-record")
-@Validated
-public class AppMemberExperienceRecordController {
-
-    @Resource
-    private MemberExperienceRecordService experienceLogService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员经验记录分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppMemberExperienceRecordRespVO>> getExperienceRecordPage(
-            @Valid PageParam pageParam) {
-        PageResult<MemberExperienceRecordDO> pageResult = experienceLogService.getExperienceRecordPage(
-                getLoginUserId(), pageParam);
-        return success(MemberExperienceRecordConvert.INSTANCE.convertPage02(pageResult));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/level/AppMemberLevelController.java

@@ -1,36 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.level;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.member.controller.app.level.vo.level.AppMemberLevelRespVO;
-import cn.newfeifan.mall.module.member.convert.level.MemberLevelConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.level.MemberLevelDO;
-import cn.newfeifan.mall.module.member.service.level.MemberLevelService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 会员等级")
-@RestController
-@RequestMapping("/member/level")
-@Validated
-public class AppMemberLevelController {
-
-    @Resource
-    private MemberLevelService levelService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得会员等级列表")
-    public CommonResult<List<AppMemberLevelRespVO>> getLevelList() {
-        List<MemberLevelDO> result = levelService.getEnableLevelList();
-        return success(MemberLevelConvert.INSTANCE.convertList02(result));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/point/AppMemberPointRecordController.java

@@ -1,44 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.point;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO;
-import cn.newfeifan.mall.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
-import cn.newfeifan.mall.module.member.convert.point.MemberPointRecordConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.point.MemberPointRecordDO;
-import cn.newfeifan.mall.module.member.service.point.MemberPointRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 签到记录")
-@RestController
-@RequestMapping("/member/point/record")
-@Validated
-public class AppMemberPointRecordController {
-
-    @Resource
-    private MemberPointRecordService pointRecordService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得用户积分记录分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppMemberPointRecordRespVO>> getPointRecordPage(
-            @Valid AppMemberPointRecordPageReqVO pageReqVO) {
-        PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(getLoginUserId(), pageReqVO);
-        return success(BeanUtils.toBean(pageResult, AppMemberPointRecordRespVO.class));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/signin/AppMemberSignInConfigController.java

@@ -1,37 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.signin;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO;
-import cn.newfeifan.mall.module.member.convert.signin.MemberSignInConfigConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.signin.MemberSignInConfigDO;
-import cn.newfeifan.mall.module.member.service.signin.MemberSignInConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 签到规则")
-@RestController
-@RequestMapping("/member/sign-in/config")
-@Validated
-public class AppMemberSignInConfigController {
-
-    @Resource
-    private MemberSignInConfigService signInConfigService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得签到规则列表")
-    public CommonResult<List<AppMemberSignInConfigRespVO>> getSignInConfigList() {
-        List<MemberSignInConfigDO> pageResult = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus());
-        return success(MemberSignInConfigConvert.INSTANCE.convertList02(pageResult));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/signin/AppMemberSignInRecordController.java

@@ -1,64 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.signin;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
-import cn.newfeifan.mall.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO;
-import cn.newfeifan.mall.module.member.convert.signin.MemberSignInRecordConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.signin.MemberSignInRecordDO;
-import cn.newfeifan.mall.module.member.service.signin.MemberSignInRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - 签到记录")
-@RestController
-@RequestMapping("/member/sign-in/record")
-@Validated
-public class AppMemberSignInRecordController {
-
-    @Resource
-    private MemberSignInRecordService signInRecordService;
-
-    @GetMapping("/get-summary")
-    @Operation(summary = "获得个人签到统计")
-    @PreAuthenticated
-    public CommonResult<AppMemberSignInRecordSummaryRespVO> getSignInRecordSummary() {
-        return success(signInRecordService.getSignInRecordSummary(getLoginUserId()));
-    }
-
-    @GetMapping("/get-sign-in-record")
-    @Operation(summary = "获得人员签到统计")
-    @PreAuthenticated
-    public CommonResult<AppMemberSignInRecordSummaryRespVO> getSignInRecordByUserId(Long userId) {
-        return success(signInRecordService.getSignInRecordSummary(userId));
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "签到")
-    @PreAuthenticated
-    public CommonResult<AppMemberSignInRecordRespVO> createSignInRecord() {
-        MemberSignInRecordDO recordDO = signInRecordService.createSignRecord(getLoginUserId());
-        return success(MemberSignInRecordConvert.INSTANCE.coverRecordToAppRecordVo(recordDO));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得签到记录分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppMemberSignInRecordRespVO>> getSignRecordPage(PageParam pageParam) {
-        PageResult<MemberSignInRecordDO> pageResult = signInRecordService.getSignRecordPage(getLoginUserId(), pageParam);
-        return success(MemberSignInRecordConvert.INSTANCE.convertPage02(pageResult));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/social/AppSocialUserController.java

@@ -1,63 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.social;
-
-import cn.newfeifan.mall.framework.common.enums.UserTypeEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.member.controller.app.social.vo.AppSocialUserBindReqVO;
-import cn.newfeifan.mall.module.member.controller.app.social.vo.AppSocialUserRespVO;
-import cn.newfeifan.mall.module.member.controller.app.social.vo.AppSocialUserUnbindReqVO;
-import cn.newfeifan.mall.module.system.api.social.SocialUserApi;
-import cn.newfeifan.mall.module.system.api.social.dto.SocialUserBindReqDTO;
-import cn.newfeifan.mall.module.system.api.social.dto.SocialUserRespDTO;
-import cn.newfeifan.mall.module.system.api.social.dto.SocialUserUnbindReqDTO;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 App - 社交用户")
-@RestController
-@RequestMapping("/member/social-user")
-@Validated
-public class AppSocialUserController {
-
-    @Resource
-    private SocialUserApi socialUserApi;
-
-    @PostMapping("/bind")
-    @Operation(summary = "社交绑定，使用 code 授权码")
-    public CommonResult<String> socialBind(@RequestBody @Valid AppSocialUserBindReqVO reqVO) {
-        SocialUserBindReqDTO reqDTO = new SocialUserBindReqDTO(getLoginUserId(), UserTypeEnum.MEMBER.getValue(),
-                reqVO.getType(), reqVO.getCode(), reqVO.getState());
-        String openid = socialUserApi.bindSocialUser(reqDTO);
-        return success(openid);
-    }
-
-    @DeleteMapping("/unbind")
-    @Operation(summary = "取消社交绑定")
-    @PreAuthenticated
-    public CommonResult<Boolean> socialUnbind(@RequestBody AppSocialUserUnbindReqVO reqVO) {
-        SocialUserUnbindReqDTO reqDTO = new SocialUserUnbindReqDTO(getLoginUserId(), UserTypeEnum.MEMBER.getValue(),
-                reqVO.getType(), reqVO.getOpenid());
-        socialUserApi.unbindSocialUser(reqDTO);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得社交用户")
-    @Parameter(name = "type", description = "社交平台的类型，参见 SocialTypeEnum 枚举值", required = true, example = "10")
-    @PreAuthenticated
-    public CommonResult<AppSocialUserRespVO> getSocialUser(@RequestParam("type") Integer type) {
-        SocialUserRespDTO socialUser = socialUserApi.getSocialUserByUserId(UserTypeEnum.MEMBER.getValue(), getLoginUserId(), type);
-        return success(BeanUtils.toBean(socialUser, AppSocialUserRespVO.class));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/user/AppMemberUserController.http

@@ -1,4 +0,0 @@
-### 请求 /member/user/profile/get 接口 => 没有权限
-GET {{appApi}}/member/user/get
-Authorization: Bearer test245
-tenant-id: {{appTenentId}}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/user/AppMemberUserController.java

@@ -1,84 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.app.user;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.member.controller.app.user.vo.*;
-import cn.newfeifan.mall.module.member.convert.user.MemberUserConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.level.MemberLevelDO;
-import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
-import cn.newfeifan.mall.module.member.service.level.MemberLevelService;
-import cn.newfeifan.mall.module.member.service.user.MemberUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 用户个人中心")
-@RestController
-@RequestMapping("/member/user")
-@Validated
-@Slf4j
-public class AppMemberUserController {
-
-    @Resource
-    private MemberUserService userService;
-    @Resource
-    private MemberLevelService levelService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得基本信息")
-    @PreAuthenticated
-    public CommonResult<AppMemberUserInfoRespVO> getUserInfo() {
-        MemberUserDO user = userService.getUser(getLoginUserId());
-        MemberLevelDO level = levelService.getLevel(user.getLevelId());
-        return success(MemberUserConvert.INSTANCE.convert(user, level));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "修改基本信息")
-    @PreAuthenticated
-    public CommonResult<Boolean> updateUser(@RequestBody @Valid AppMemberUserUpdateReqVO reqVO) {
-        userService.updateUser(getLoginUserId(), reqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-mobile")
-    @Operation(summary = "修改用户手机")
-    @PreAuthenticated
-    public CommonResult<Boolean> updateUserMobile(@RequestBody @Valid AppMemberUserUpdateMobileReqVO reqVO) {
-        userService.updateUserMobile(getLoginUserId(), reqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-mobile-by-weixin")
-    @Operation(summary = "基于微信小程序的授权码，修改用户手机")
-    @PreAuthenticated
-    public CommonResult<Boolean> updateUserMobileByWeixin(@RequestBody @Valid AppMemberUserUpdateMobileByWeixinReqVO reqVO) {
-        userService.updateUserMobileByWeixin(getLoginUserId(), reqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-password")
-    @Operation(summary = "修改用户密码", description = "用户修改密码时使用")
-    @PreAuthenticated
-    public CommonResult<Boolean> updateUserPassword(@RequestBody @Valid AppMemberUserUpdatePasswordReqVO reqVO) {
-        userService.updateUserPassword(getLoginUserId(), reqVO);
-        return success(true);
-    }
-
-    @PutMapping("/reset-password")
-    @Operation(summary = "重置密码", description = "用户忘记密码时使用")
-    public CommonResult<Boolean> resetUserPassword(@RequestBody @Valid AppMemberUserResetPasswordReqVO reqVO) {
-        userService.resetUserPassword(reqVO);
-        return success(true);
-    }
-
-}
-

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/channel/AppPayChannelController.java

@@ -1,39 +0,0 @@
-package cn.newfeifan.mall.module.pay.controller.app.channel;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.pay.dal.dataobject.channel.PayChannelDO;
-import cn.newfeifan.mall.module.pay.service.channel.PayChannelService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "用户 App - 支付渠道")
-@RestController
-@RequestMapping("/pay/channel")
-@Validated
-public class AppPayChannelController {
-
-    @Resource
-    private PayChannelService channelService;
-
-    @GetMapping("/get-enable-code-list")
-    @Operation(summary = "获得指定应用的开启的支付渠道编码列表")
-    @Parameter(name = "appId", description = "应用编号", required = true, example = "1")
-    public CommonResult<Set<String>> getEnableChannelCodeList(@RequestParam("appId") Long appId) {
-        List<PayChannelDO> channels = channelService.getEnableChannelList(appId);
-        return success(convertSet(channels, PayChannelDO::getCode));
-    }
-
-}

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/order/AppPayOrderController.http

@@ -1,63 +0,0 @@
-### /pay/create 提交支付订单【alipay_pc】
-POST {{appApi}}/pay/order/submit
-Content-Type: application/json
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-{
-  "id": 174,
-  "channelCode": "alipay_pc"
-}
-
-### /pay/create 提交支付订单【wx_bar】
-POST {{appApi}}/pay/order/submit
-Content-Type: application/json
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-{
-  "id": 202,
-  "channelCode": "wx_bar",
-  "channelExtras": {
-    "authCode": "134042110834344848"
-  }
-}
-
-### /pay/create 提交支付订单【wx_pub】
-POST {{appApi}}/pay/order/submit
-Content-Type: application/json
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-{
-  "id": 202,
-  "channelCode": "wx_pub",
-  "channelExtras": {
-    "openid": "ockUAwIZ-0OeMZl9ogcZ4ILrGba0"
-  }
-}
-
-### /pay/create 提交支付订单【wx_lite】
-POST {{appApi}}/pay/order/submit
-Content-Type: application/json
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-{
-  "id": 202,
-  "channelCode": "wx_lite",
-  "channelExtras": {
-    "openid": "oLefc4g5GjKWHJjLjMSXB3wX0fD0"
-  }
-}
-
-### /pay/create 提交支付订单【wx_native】
-POST {{appApi}}/pay/order/submit
-Content-Type: application/json
-Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
-
-{
-  "id": 202,
-  "channelCode": "wx_native"
-}

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/order/AppPayOrderController.java

@@ -1,65 +0,0 @@
-package cn.newfeifan.mall.module.pay.controller.app.order;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderRespVO;
-import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
-import cn.newfeifan.mall.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
-import cn.newfeifan.mall.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
-import cn.newfeifan.mall.module.pay.convert.order.PayOrderConvert;
-import cn.newfeifan.mall.module.pay.framework.pay.core.WalletPayClient;
-import cn.newfeifan.mall.module.pay.service.order.PayOrderService;
-import com.google.common.collect.Maps;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-import java.util.Map;
-import java.util.Objects;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.servlet.ServletUtils.getClientIP;
-import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
-
-@Tag(name = "用户 APP - 支付订单")
-@RestController
-@RequestMapping("/pay/order")
-@Validated
-@Slf4j
-public class AppPayOrderController {
-
-    @Resource
-    private PayOrderService payOrderService;
-
-    // TODO 非繁人：临时 demo，技术打样。
-    @GetMapping("/get")
-    @Operation(summary = "获得支付订单")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id) {
-        return success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrder(id)));
-    }
-
-    @PostMapping("/submit")
-    @Operation(summary = "提交支付订单")
-    public CommonResult<AppPayOrderSubmitRespVO> submitPayOrder(@RequestBody AppPayOrderSubmitReqVO reqVO) {
-        // 1. 钱包支付事，需要额外传 user_id 和 user_type
-        if (Objects.equals(reqVO.getChannelCode(), PayChannelEnum.WALLET.getCode())) {
-            Map<String, String> channelExtras = reqVO.getChannelExtras() == null ?
-                    Maps.newHashMapWithExpectedSize(2) : reqVO.getChannelExtras();
-            channelExtras.put(WalletPayClient.USER_ID_KEY, String.valueOf(getLoginUserId()));
-            channelExtras.put(WalletPayClient.USER_TYPE_KEY, String.valueOf(getLoginUserType()));
-            reqVO.setChannelExtras(channelExtras);
-        }
-
-        // 2. 提交支付
-        PayOrderSubmitRespVO respVO = payOrderService.submitOrder(reqVO, getClientIP());
-        return success(PayOrderConvert.INSTANCE.convert3(respVO));
-    }
-
-}

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/refund/package-info.java

@@ -1,4 +0,0 @@
-/**
- * TODO 非繁人：占个位置，没啥用
- */
-package cn.newfeifan.mall.module.pay.controller.app.refund;

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/wallet/AppPayWalletController.java

@@ -1,44 +0,0 @@
-package cn.newfeifan.mall.module.pay.controller.app.wallet;
-
-import cn.newfeifan.mall.framework.common.enums.UserTypeEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.pay.controller.app.wallet.vo.wallet.AppPayWalletRespVO;
-import cn.newfeifan.mall.module.pay.convert.wallet.PayWalletConvert;
-import cn.newfeifan.mall.module.pay.dal.dataobject.wallet.PayWalletDO;
-import cn.newfeifan.mall.module.pay.service.wallet.PayWalletService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-/**
- * @author jason
- */
-@Tag(name = "用户 APP - 钱包")
-@RestController
-@RequestMapping("/pay/wallet")
-@Validated
-@Slf4j
-public class AppPayWalletController {
-
-    @Resource
-    private PayWalletService payWalletService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获取钱包")
-    @PreAuthenticated
-    public CommonResult<AppPayWalletRespVO> getPayWallet() {
-        PayWalletDO wallet = payWalletService.getOrCreateWallet(getLoginUserId(), UserTypeEnum.MEMBER.getValue());
-        return success(PayWalletConvert.INSTANCE.convert(wallet));
-    }
-
-}

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/wallet/AppPayWalletRechargeController.java

@@ -1,72 +0,0 @@
-package cn.newfeifan.mall.module.pay.controller.app.wallet;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.enums.UserTypeEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateReqVO;
-import cn.newfeifan.mall.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateRespVO;
-import cn.newfeifan.mall.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeRespVO;
-import cn.newfeifan.mall.module.pay.convert.wallet.PayWalletConvert;
-import cn.newfeifan.mall.module.pay.convert.wallet.PayWalletRechargeConvert;
-import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
-import cn.newfeifan.mall.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
-import cn.newfeifan.mall.module.pay.service.order.PayOrderService;
-import cn.newfeifan.mall.module.pay.service.wallet.PayWalletRechargeService;
-import com.google.common.collect.Lists;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.newfeifan.mall.framework.common.util.servlet.ServletUtils.getClientIP;
-import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
-
-@Tag(name = "用户 APP - 钱包充值")
-@RestController
-@RequestMapping("/pay/wallet-recharge")
-@Validated
-@Slf4j
-public class AppPayWalletRechargeController {
-
-    @Resource
-    private PayWalletRechargeService walletRechargeService;
-    @Resource
-    private PayOrderService payOrderService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建钱包充值记录（发起充值）")
-    public CommonResult<AppPayWalletRechargeCreateRespVO> createWalletRecharge(
-            @Valid @RequestBody  AppPayWalletRechargeCreateReqVO reqVO) {
-        PayWalletRechargeDO walletRecharge = walletRechargeService.createWalletRecharge(
-                getLoginUserId(), getLoginUserType(), getClientIP(), reqVO);
-        return success(PayWalletRechargeConvert.INSTANCE.convert(walletRecharge));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得钱包充值记录分页")
-    public CommonResult<PageResult<AppPayWalletRechargeRespVO>> getWalletRechargePage(@Valid PageParam pageReqVO) {
-        PageResult<PayWalletRechargeDO> pageResult = walletRechargeService.getWalletRechargePackagePage(
-                getLoginUserId(), UserTypeEnum.MEMBER.getValue(), pageReqVO, true);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-        // 拼接数据
-        List<PayOrderDO> payOrderList = payOrderService.getOrderList(
-                convertList(pageResult.getList(), PayWalletRechargeDO::getPayOrderId));
-        return success(PayWalletRechargeConvert.INSTANCE.convertPage(pageResult, payOrderList));
-    }
-
-}

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/wallet/AppPayWalletRechargePackageController.java

@@ -1,42 +0,0 @@
-package cn.newfeifan.mall.module.pay.controller.app.wallet;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.pay.controller.app.wallet.vo.recharge.AppPayWalletPackageRespVO;
-import cn.newfeifan.mall.module.pay.dal.dataobject.wallet.PayWalletRechargePackageDO;
-import cn.newfeifan.mall.module.pay.service.wallet.PayWalletRechargePackageService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 APP - 钱包充值套餐")
-@RestController
-@RequestMapping("/pay/wallet-recharge-package")
-@Validated
-@Slf4j
-public class AppPayWalletRechargePackageController {
-
-    @Resource
-    private PayWalletRechargePackageService walletRechargePackageService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得钱包充值套餐列表")
-    public CommonResult<List<AppPayWalletPackageRespVO>> getWalletRechargePackageList() {
-        List<PayWalletRechargePackageDO> list = walletRechargePackageService.getWalletRechargePackageList(
-                CommonStatusEnum.ENABLE.getStatus());
-        list.sort(Comparator.comparingInt(PayWalletRechargePackageDO::getPayPrice));
-        return success(BeanUtils.toBean(list, AppPayWalletPackageRespVO.class));
-    }
-
-}

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/wallet/AppPayWalletTransactionController.java

@@ -1,60 +0,0 @@
-package cn.newfeifan.mall.module.pay.controller.app.wallet;
-
-import cn.newfeifan.mall.framework.common.enums.UserTypeEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionPageReqVO;
-import cn.newfeifan.mall.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionRespVO;
-import cn.newfeifan.mall.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionSummaryRespVO;
-import cn.newfeifan.mall.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
-import cn.newfeifan.mall.module.pay.service.wallet.PayWalletTransactionService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.time.LocalDateTime;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "用户 APP - 钱包余额明细")
-@RestController
-@RequestMapping("/pay/wallet-transaction")
-@Validated
-@Slf4j
-public class AppPayWalletTransactionController {
-
-    @Resource
-    private PayWalletTransactionService payWalletTransactionService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得钱包流水分页")
-    public CommonResult<PageResult<AppPayWalletTransactionRespVO>> getWalletTransactionPage(
-            @Valid AppPayWalletTransactionPageReqVO pageReqVO) {
-        PageResult<PayWalletTransactionDO> pageResult = payWalletTransactionService.getWalletTransactionPage(
-                getLoginUserId(), UserTypeEnum.MEMBER.getValue(), pageReqVO);
-        return success(BeanUtils.toBean(pageResult, AppPayWalletTransactionRespVO.class));
-    }
-
-    @GetMapping("/get-summary")
-    @Operation(summary = "获得钱包流水统计")
-    @Parameter(name = "times", description = "时间段", required = true)
-    public CommonResult<AppPayWalletTransactionSummaryRespVO> getWalletTransactionSummary(
-            @RequestParam("createTime") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime[] createTime) {
-        AppPayWalletTransactionSummaryRespVO summary = payWalletTransactionService.getWalletTransactionSummary(
-                getLoginUserId(), UserTypeEnum.MEMBER.getValue(), createTime);
-        return success(summary);
-    }
-
-}

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/controller/app/dict/AppDictDataController.java

@@ -1,41 +0,0 @@
-package cn.newfeifan.mall.module.system.controller.app.dict;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.system.controller.app.dict.vo.AppDictDataRespVO;
-import cn.newfeifan.mall.module.system.dal.dataobject.dict.DictDataDO;
-import cn.newfeifan.mall.module.system.service.dict.DictDataService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 字典数据")
-@RestController
-@RequestMapping("/system/dict-data")
-@Validated
-public class AppDictDataController {
-
-    @Resource
-    private DictDataService dictDataService;
-
-    @GetMapping("/type")
-    @Operation(summary = "根据字典类型查询字典数据信息")
-    @Parameter(name = "type", description = "字典类型", required = true, example = "common_status")
-    public CommonResult<List<AppDictDataRespVO>> getDictDataListByType(@RequestParam("type") String type) {
-        List<DictDataDO> list = dictDataService.getDictDataList(
-                CommonStatusEnum.ENABLE.getStatus(), type);
-        return success(BeanUtils.toBean(list, AppDictDataRespVO.class));
-    }
-
-}

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/controller/app/dict/vo/AppDictDataRespVO.java

@@ -1,29 +0,0 @@
-package cn.newfeifan.mall.module.system.controller.app.dict.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-@Schema(description = "用户 App - 字典数据信息 Response VO")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class AppDictDataRespVO {
-
-    @Schema(description = "字典数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long id;
-
-    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁")
-    private String label;
-
-    @Schema(description = "字典值", requiredMode = Schema.RequiredMode.REQUIRED, example = "iocoder")
-    private String value;
-
-    @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "sys_common_sex")
-    private String dictType;
-
-}

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/controller/app/ip/AppAreaController.java

@@ -1,34 +0,0 @@
-package cn.newfeifan.mall.module.system.controller.app.ip;
-
-import cn.hutool.core.lang.Assert;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.ip.core.Area;
-import cn.newfeifan.mall.framework.ip.core.utils.AreaUtils;
-import cn.newfeifan.mall.module.system.controller.app.ip.vo.AppAreaNodeRespVO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "用户 App - 地区")
-@RestController
-@RequestMapping("/system/area")
-@Validated
-public class AppAreaController {
-
-    @GetMapping("/tree")
-    @Operation(summary = "获得地区树")
-    public CommonResult<List<AppAreaNodeRespVO>> getAreaTree() {
-        Area area = AreaUtils.getArea(Area.ID_CHINA);
-        Assert.notNull(area, "获取不到中国");
-        return success(BeanUtils.toBean(area.getChildren(), AppAreaNodeRespVO.class));
-    }
-
-}

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/controller/app/ip/vo/AppAreaNodeRespVO.java

@@ -1,23 +0,0 @@
-package cn.newfeifan.mall.module.system.controller.app.ip.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description = "用户 App - 地区节点 Response VO")
-@Data
-public class AppAreaNodeRespVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "110000")
-    private Integer id;
-
-    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "北京")
-    private String name;
-
-    /**
-     * 子节点
-     */
-    private List<AppAreaNodeRespVO> children;
-
-}