From 1cdccaf0a06161fcc2a5797e617508c8a7e1f300 Mon Sep 17 00:00:00 2001 From: p-honggang.li <p-honggang.li@pcitc.com> Date: 星期六, 06 九月 2025 03:14:53 +0800 Subject: [PATCH] 修改订单创建,发起工作流调用,采用后端处理,增加事务,修改审核同通过和驳回处理,修改根据用户id获取工作流代办信息,再根据代办ids查询订单信息 --- src/main/java/com/webmanage/service/impl/PointsFlowServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/webmanage/service/impl/PointsFlowServiceImpl.java b/src/main/java/com/webmanage/service/impl/PointsFlowServiceImpl.java index 00d5dfd..a75f266 100644 --- a/src/main/java/com/webmanage/service/impl/PointsFlowServiceImpl.java +++ b/src/main/java/com/webmanage/service/impl/PointsFlowServiceImpl.java @@ -182,10 +182,10 @@ } // 姣忔棩涓婇檺鏍¢獙锛堝垎鍒牎楠岋級 - if (applyUser && userRule.getIsLimit() != null && userRule.getIsLimit() == 0) { + if (applyUser && userRule.getIsLimit() != null && userRule.getIsLimit() == 1) { checkDailyLimitByRule(userId, unitId, userRule, userPointsChange); } - if (applyProvider && providerRule.getIsLimit() != null && providerRule.getIsLimit() == 0) { + if (applyProvider && providerRule.getIsLimit() != null && providerRule.getIsLimit() == 1) { checkDailyLimitByRule(providerId, providerId, providerRule, providerPointsChange); } @@ -357,11 +357,14 @@ QueryWrapper<PointsFlow> wrapper = new QueryWrapper<>(); wrapper.eq("deleted", 0) .eq("user_id", userId) - .eq("unit_id", unitId) // .eq("data_category", pointsRule.getRuleName()) .eq("rule_id",pointsRule.getId()) + .eq("data_type", 0) .ge("flow_time", startOfDay) .le("flow_time", endOfDay); + if(StringUtils.hasText(unitId)){ + wrapper.eq("unit_id", unitId); + } List<PointsFlow> todayFlows = list(wrapper); -- Gitblit v1.8.0