feat(all): 修改日仓租成本计算校验

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);