From 5806ff1a45baa0264c413eb78ff15b8d6e619872 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Sat, 28 Sep 2024 22:23:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E4=BB=93=E7=A7=9F=E6=88=90=E6=9C=AC=E8=AE=A1=E7=AE=97=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/statistics/feign/ExpenseDispatchClient.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java
index d779be43f..8b0e11cad 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java
@@ -44,7 +44,10 @@ public class ExpenseDispatchClient implements IExpenseDispatchClient {
 		if(CollUtil.isNotEmpty(list)){
 			ExpenseDispatchClientDTO dto = new ExpenseDispatchClientDTO();
 			Long templateId = list.get(0).getTemplateId();
-			ExpenseDispatchPriceRuleEntity rule = ruleService.getOne(Wrappers.<ExpenseDispatchPriceRuleEntity>lambdaQuery().eq(ExpenseDispatchPriceRuleEntity::getTemplateId, templateId));
+			ExpenseDispatchPriceRuleEntity rule = ruleService.getOne(Wrappers.<ExpenseDispatchPriceRuleEntity>lambdaQuery()
+				.eq(ExpenseDispatchPriceRuleEntity::getTemplateId, templateId)
+				.eq(ExpenseDispatchPriceRuleEntity::getType, StrUtil.equals(dispatchType, "商配") ? 1: 2)
+			);
 			if(ObjectUtil.isNotEmpty(rule)){
 				ExpenseDispatchPriceRuleDTO expenseDispatchPriceRuleDTO = BeanUtil.copyProperties(rule, ExpenseDispatchPriceRuleDTO.class);
 				dto.setRule(expenseDispatchPriceRuleDTO);