oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spring AI 1.0.0 M6 适配：增加知识库、工具调用（function calling）、工作流、豆包/混元/硅基流动等模型的接入

Browse Source
This commit is contained in:
YunaiV
2025-03-14 23:34:20 +08:00
parent c2de5d9c8c
commit e2e4b000e6
189 changed files with 4825 additions and 7145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
View File

@@ -121,6 +121,10 @@ public class CouponServiceImpl implements CouponService {
@Transactional(rollbackFor = Exception.class)
public Map<Long, List<Long>> takeCoupon(Long templateId, Set<Long> userIds, CouponTakeTypeEnum takeType) {
CouponTemplateDO template = couponTemplateService.getCouponTemplate(templateId);
return takeCoupon(template, userIds, takeType);
}
private Map<Long, List<Long>> takeCoupon(CouponTemplateDO template, Set<Long> userIds, CouponTakeTypeEnum takeType) {
// 1. 过滤掉达到领取限制的用户
removeTakeLimitUser(userIds, template);
// 2. 校验优惠劵是否可以领取
@@ -131,7 +135,7 @@ public class CouponServiceImpl implements CouponService {
couponMapper.insertBatch(couponList);
// 4. 增加优惠劵模板的领取数量
couponTemplateService.updateCouponTemplateTakeCount(templateId, userIds.size());
couponTemplateService.updateCouponTemplateTakeCount(template.getId(), userIds.size());
return convertMultiMap(couponList, CouponDO::getUserId, CouponDO::getId);
}
@@ -208,7 +212,7 @@ public class CouponServiceImpl implements CouponService {
public void takeCouponByRegister(Long userId) {
List<CouponTemplateDO> templates = couponTemplateService.getCouponTemplateListByTakeType(CouponTakeTypeEnum.REGISTER);
for (CouponTemplateDO template : templates) {
takeCoupon(template.getId(), CollUtil.newHashSet(userId), CouponTakeTypeEnum.REGISTER);
takeCoupon(template, CollUtil.newHashSet(userId), CouponTakeTypeEnum.REGISTER);
}
}

7
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
View File

@@ -91,9 +91,10 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
public PageResult<TradeOrderDO> getOrderPage(TradeOrderPageReqVO reqVO) {
// 根据用户查询条件构建用户编号列表
Set<Long> userIds = buildQueryConditionUserIds(reqVO);
if (CollUtil.isEmpty(userIds)) { // 没查询到用户，说明肯定也没他的订单
if (userIds == null) { // 没查询到用户，说明肯定也没他的订单
return PageResult.empty();
}
// 分页查询
return tradeOrderMapper.selectPage(reqVO, userIds);
}
@@ -122,11 +123,11 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
public TradeOrderSummaryRespVO getOrderSummary(TradeOrderPageReqVO reqVO) {
// 根据用户查询条件构建用户编号列表
Set<Long> userIds = buildQueryConditionUserIds(reqVO);
if (CollUtil.isEmpty(userIds)) { // 没查询到用户，说明肯定也没他的订单
if (userIds == null) { // 没查询到用户，说明肯定也没他的订单
return new TradeOrderSummaryRespVO();
}
// 查询每个售后状态对应的数量、金额
List<Map<String, Object>> list = tradeOrderMapper.selectOrderSummaryGroupByRefundStatus(reqVO, null);
List<Map<String, Object>> list = tradeOrderMapper.selectOrderSummaryGroupByRefundStatus(reqVO, userIds);
TradeOrderSummaryRespVO vo = new TradeOrderSummaryRespVO().setAfterSaleCount(0L).setAfterSalePrice(0L);
for (Map<String, Object> map : list) {