From 47f0d9fe4cac4f0eccbb26aa6b7a4903d1749d43 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 11:37:10 +0800
Subject: [PATCH] 分销员后台5
---
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 8 ++++----
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 2 +-
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 5 -----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
index 1aafb7c..3b9a014 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
@@ -104,10 +104,5 @@
shopSalesmanApplyService.addSaleManApply(userId,gradeId);
return result;
}
-
-
- public static void main(String[] args) {
- System.out.println("===="+Long.parseLong(""));
- }
}
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
index 1d0e79a..4b888a2 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -60,7 +60,7 @@
* @param invitationId
* @return
*/
- public ShopSalesmanApply applyToBeAnSalesman(String openId,long gradeId,String invitationId) {
+ public ShopSalesmanApply applyToBeAnSalesman(String openId,String gradeId,String invitationId) {
BizUser loginUser=bizUserDao.findByOpenId(openId);
//校验审核状态，和是否重复发起
@@ -88,8 +88,8 @@
//如果曾经是被邀请进来的则自动绑定为之前邀请人的下级
shopSalesmanApply.setParentUserId(loginUser.getParentOpenId());
}
- if(ObjectUtil.isNotEmpty(gradeId)){
- shopSalesmanApply.setGradeId(gradeId);
+ if(StringUtils.isNotBlank(gradeId)){
+ shopSalesmanApply.setGradeId(Long.parseLong(gradeId));
}else{
//获取初始等级ID（公司id，是否为初始等级）
Wrapper<ShopSalesmanGrade> queryWrapperOrepool = new QueryWrapper<>();
@@ -137,7 +137,7 @@
public void addSaleManApply(String userId,long gradeId) {
BizUser user = bizUserDao.selectById(userId);
- applyToBeAnSalesman(user.getOpenId(),gradeId, "");
+ applyToBeAnSalesman(user.getOpenId(),gradeId+"", "");
}
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 610ba20..4188581 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
@@ -84,7 +84,7 @@
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(),Long.parseLong(""),invitationId);
+ ShopSalesmanApply shopSalesmanApply= shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getOpenId(),"",invitationId);
loginUser=bizUserDao.selectById(loginUser.getUserId());
redisUserLoginUtils.updateUserInfo(loginUser);
return AjaxResult.buildSuccessInstance(shopSalesmanApply);
--
Gitblit v1.9.1