From 51b1242dc2f55276b65f287974e7f86dcab8c74d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:56:27 +0800
Subject: [PATCH] 修改商品查询bug1

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 3e67c28..ed74a5d 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
@@ -100,10 +100,20 @@
     public AjaxResult applyToBeAnSalesman(@RequestBody Map<String,String> param) {
         BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
         String invitationId = param.get("invitationId");
+        if(StringUtils.isNotBlank(invitationId)){
+            BizUser invitationUser = bizUserDao.findByOpenId(invitationId);
+            if(invitationUser!=null && invitationUser.getOpenId().equals(loginUser.getOpenId())) {
+                return AjaxResult.buildFailInstance("不能邀请自己成为推广员");
+            }
+        }
+
         ShopSalesmanApply shopSalesmanApply= shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getOpenId(),"",invitationId,ShopSalesmanApply.APPLY_WAY_SELF);
         loginUser=bizUserDao.selectById(loginUser.getUserId());
         redisUserLoginUtils.updateUserInfo(loginUser);
         return AjaxResult.buildSuccessInstance(shopSalesmanApply);
+
+
+
     }
 
 
@@ -116,6 +126,7 @@
         BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
         QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id",loginUser.getOpenId());
+        queryWrapper.eq("apply_status",ShopSalesmanApply.APPLY_STATUS_DSH);
         ShopSalesmanApply shopSalesmanApply = salesmanApplyDao.selectOne(queryWrapper);
         return AjaxResult.buildSuccessInstance(shopSalesmanApply);
     }

--
Gitblit v1.9.1