修改bug5

jyy

2021-03-17 a25c3ef238596506a984b8bc89d37bc620a293e0

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