From 033ce8ddc88ef653635bf7cb2a273d901399629c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 18 Mar 2021 15:32:11 +0800
Subject: [PATCH] 积分商城2
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 11 ++++++++---
1 files changed, 8 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 d2d94e3..7e81a21 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
@@ -23,6 +23,7 @@
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
+import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.shopXcx.api.WeChatApiTools;
import com.matrix.system.shopXcx.dao.ShopProductDao;
import com.matrix.system.shopXcx.vo.SalesmanApplyCondition;
@@ -294,9 +295,13 @@
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
applyConditionInfo.setCondition("消费指定产品并确认收货");
List<String> strings = StringUtils.strToColl(applyCondition.getParamValue1(), ",");
- applyConditionInfo.setProductList(
- shopProductDao.selectByIds(
- strings.stream().filter(i->StringUtils.isNotBlank(i)).map(i -> Integer.parseInt(i + "")).distinct().collect(Collectors.toList())));
+ List<Integer> ids = strings.stream().filter(i -> StringUtils.isNotBlank(i)).map(i -> Integer.parseInt(i + "")).distinct().collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(ids)){
+ applyConditionInfo.setProductList(shopProductDao.selectByIds(ids));
+ }else{
+ return AjaxResult.buildFailInstance("未配置消费产品，请联系管理员");
+ }
+
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFRYCP:
//判断用户是否有确认收货的产品
--
Gitblit v1.9.1