zianxin/xrhome-api
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
zhangji committed 2025-10-14 14:35:41 +08:00
1 parent 510a254c9f
commit 01892098f2
3 files changed
+11 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.http
+1 -1
View File
@@ -14,5 +14,5 @@ Authorization: Bearer {{appToken}}
tenant-id: {{appTenantId}}
### 获得商品 SPU 明细
GET {{appApi}}/product/spu/get-detail?id=102
GET {{appApi}}/product/spu/get-detail?id=650
tenant-id: {{appTenantId}}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/giftvoucher/GiftVoucherService.java
+5 -8
View File
@@ -1,19 +1,16 @@
package cn.iocoder.yudao.module.promotion.service.giftvoucher;
import java.util.*;
import javax.validation.*;
import cn.hutool.core.map.MapUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.promotion.api.giftvoucher.dto.GiftVoucherUseReqDTO;
import cn.iocoder.yudao.module.promotion.controller.admin.giftvoucher.vo.*;
import cn.iocoder.yudao.module.promotion.controller.admin.giftvoucher.vo.giftvoucher.GiftVoucherPageReqVO;
import cn.iocoder.yudao.module.promotion.controller.admin.giftvoucher.vo.giftvoucher.GiftVoucherSaveReqVO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.giftvoucher.GiftVoucherDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.promotion.enums.coupon.CouponTakeTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.giftvoucher.GiftVoucherTypeEnum;
import javax.validation.Valid;
import java.util.*;
/**
* 提货劵 Service 接口
*
@@ -69,7 +66,7 @@ public interface GiftVoucherService {
*/
Map<Long, List<Long>> takeGiftVoucher(Long templateId, Set<Long> userIds, GiftVoucherTypeEnum takeType);
default Map<Long, List<Long>> takeGiftVoucherByAdmin(Long templateId, Set<Long> userIds){
default Map<Long, List<Long>> takeGiftVoucherByAdmin(Long templateId, Set<Long> userIds) {
return takeGiftVoucher(templateId, userIds, GiftVoucherTypeEnum.ADMIN);
}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/giftvoucher/GiftVoucherServiceImpl.java
+5 -11
View File
@@ -4,34 +4,28 @@ import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.promotion.api.giftvoucher.dto.GiftVoucherUseReqDTO;
import cn.iocoder.yudao.module.promotion.controller.admin.giftvoucher.vo.giftvoucher.GiftVoucherPageReqVO;
import cn.iocoder.yudao.module.promotion.controller.admin.giftvoucher.vo.giftvoucher.GiftVoucherSaveReqVO;
import cn.iocoder.yudao.module.promotion.convert.giftvoucher.GiftVoucherConvert;
import cn.iocoder.yudao.module.promotion.dal.dataobject.giftvoucher.GiftVoucherDO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.giftvoucher.GiftVoucherTemplateDO;
import cn.iocoder.yudao.module.promotion.enums.coupon.CouponTakeTypeEnum;
import cn.iocoder.yudao.module.promotion.dal.mysql.giftvoucher.GiftVoucherMapper;
import cn.iocoder.yudao.module.promotion.enums.giftvoucher.GiftVoucherStatusEnum;
import cn.iocoder.yudao.module.promotion.enums.giftvoucher.GiftVoucherTemplateValidityTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.giftvoucher.GiftVoucherTypeEnum;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import cn.iocoder.yudao.module.promotion.controller.admin.giftvoucher.vo.*;
import cn.iocoder.yudao.module.promotion.dal.dataobject.giftvoucher.GiftVoucherDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.promotion.dal.mysql.giftvoucher.GiftVoucherMapper;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;