From 60d996294b436d557a86817ab5db50a8814da5fe Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 17:58:01 +0800
Subject: [PATCH] 新增配置查询3

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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..c9373ec 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,17 @@
     public AjaxResult applyToBeAnSalesman(@RequestBody Map<String,String> param) {
         BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
         String invitationId = param.get("invitationId");
-        ShopSalesmanApply shopSalesmanApply= shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getOpenId(),"",invitationId,ShopSalesmanApply.APPLY_WAY_SELF);
-        loginUser=bizUserDao.selectById(loginUser.getUserId());
-        redisUserLoginUtils.updateUserInfo(loginUser);
-        return AjaxResult.buildSuccessInstance(shopSalesmanApply);
+        BizUser invitationUser = bizUserDao.findByOpenId(invitationId);
+        if(invitationUser.getOpenId().equals(loginUser.getOpenId())){
+            return AjaxResult.buildFailInstance("不能邀请自己成为推广员");
+        }else{
+            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 +123,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