From 3954537f11c1c6fbfc62a6233102c530e3202ba1 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 10 Jul 2021 14:25:55 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
index cf48b9f..d2d94e3 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -292,15 +292,15 @@
applyConditionInfo.setCondition("您已满足申请条件");
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
- applyConditionInfo.setCondition("消费指定产品确认收货");
+ applyConditionInfo.setCondition("消费指定产品并确认收货");
List<String> strings = StringUtils.strToColl(applyCondition.getParamValue1(), ",");
applyConditionInfo.setProductList(
shopProductDao.selectByIds(
- strings.stream().map(i -> Integer.parseInt(i + "")).collect(Collectors.toList())));
+ strings.stream().filter(i->StringUtils.isNotBlank(i)).map(i -> Integer.parseInt(i + "")).distinct().collect(Collectors.toList())));
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFRYCP:
//判断用户是否有确认收货的产品
- applyConditionInfo.setCondition("消费任意产品确认收货");
+ applyConditionInfo.setCondition("消费任意产品并确认收货");
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
Double zdje=Double.parseDouble(applyCondition.getParamValue2());
--
Gitblit v1.9.1