From 5857fd14f4608ace25724ba6386d72d210e20870 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 25 Mar 2021 10:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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..4f0b0d9 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;
@@ -167,6 +168,8 @@
loginUser = bizUserDao.selectById(loginUser.getUserId());
if(loginUser.getIsSales()==1){
return AjaxResult.buildSuccessInstance("只有非分销员才能被绑定成客户");
+ }if (StringUtils.isNotBlank(loginUser.getParentOpenId())){
+ return AjaxResult.buildSuccessInstance("已经被绑定");
}else{
if (StringUtils.isBlank(loginUser.getParentOpenId())) {
Map<String, Object> updateParam = new HashMap<>();
@@ -202,7 +205,7 @@
String urlPath = baseSaveUrl + "/" + "wxacode" + "/" + targetImg;
- String qrcodeSavePath = WxacodeUtil.getWxacode(loginUser.getOpenId() + "", "pages/distributorCenter/applyFor/applyFor", MD5Util.strToMD5(loginUser.getOpenId())+"qrcode"
+ String qrcodeSavePath = WxacodeUtil.getWxacode(loginUser.getUserId() + "", "pages/distributorCenter/applyFor/applyFor", MD5Util.strToMD5(loginUser.getOpenId())+"qrcode"
,weChatApiTools.getAppid(loginUser.getCompanyId()),weChatApiTools.getSecret(loginUser.getCompanyId()));
BufferedImage qrcordImgBuf = ImageIO.read(new File(qrcodeSavePath));
@@ -292,15 +295,19 @@
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())));
+ 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:
//判断用户是否有确认收货的产品
- applyConditionInfo.setCondition("消费任意产品确认收货");
+ applyConditionInfo.setCondition("消费任意产品并确认收货");
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
Double zdje=Double.parseDouble(applyCondition.getParamValue2());
--
Gitblit v1.9.1