From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 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 5ba6f89..1bff040 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
@@ -1,11 +1,8 @@
package com.matrix.system.fenxiao.action;
import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.matrix.biz.bean.BizUser;
-import com.matrix.biz.dao.BizUserDao;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
@@ -18,10 +15,11 @@
import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
import com.matrix.system.fenxiao.dto.*;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
-import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
import com.matrix.system.fenxiao.vo.*;
import com.matrix.system.hive.action.util.QueryUtil;
+import com.matrix.system.hive.bean.SysVipInfo;
+import com.matrix.system.hive.dao.SysVipInfoDao;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
@@ -42,7 +40,7 @@
@Autowired
private ShopSalesmanApplyDao shopSalesmanApplyDao;
@Autowired
- private BizUserDao bizUserDao;
+ private SysVipInfoDao sysVipInfoDao;
@Autowired
private ShopSalesmanGradeDao shopSalesmanGradeDao;
@Autowired
@@ -61,10 +59,7 @@
//设置用户公司ID
QueryUtil.setQueryLimitCom(loadParamSettingBasicDto);
AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
- //根据OPENID查询基础信息
- String userId = loadParamSettingBasicDto.getUserId();
- String applyId = loadParamSettingBasicDto.getApplyId();
- SalesmanBasicDetailVo salesmanBasicDetailVo = shopSalesmanApplyService.selectShopSalesmanDetailByOpenId(userId,Long.parseLong(applyId));
+ SalesmanBasicDetailVo salesmanBasicDetailVo = shopSalesmanApplyService.selectShopSalesmanDetailByOpenId(loadParamSettingBasicDto.getUserId(),loadParamSettingBasicDto.getApplyId());
result.putInMap("basicdetail", salesmanBasicDetailVo);
return result;
}
@@ -345,19 +340,12 @@
@PostMapping(value = "/addSaleManApply")
public @ResponseBody
AjaxResult addSaleManApply(@RequestBody AddSaleManApplyDto addSaleManApplyDto) {
- String gradeId = addSaleManApplyDto.getGradeId();
- if(StrUtil.isBlankOrUndefined(gradeId)) {
- return AjaxResult.buildFailInstance("请选择分销等级");
- }
- ShopSalesmanGrade selectById = shopSalesmanGradeDao.selectById(Long.parseLong(gradeId));
- if(ObjectUtil.isEmpty(selectById)) {
- return AjaxResult.buildFailInstance("请选择分销等级");
- }
-
- //设置用户公司ID
- QueryUtil.setQueryLimitCom(addSaleManApplyDto);
- shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getOpenId(),gradeId);
+ if(addSaleManApplyDto.getGradeId()==null) {
+ return AjaxResult.buildFailInstance("请选择分销等级");
+ }
+
+ shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getUserId(), addSaleManApplyDto.getGradeId());
return AjaxResult.buildSuccessInstance("设置成功");
}
@@ -380,15 +368,14 @@
AjaxResult examineSaleManApply(@RequestBody ExamineSaleManApplyDto examineSaleManApplyDto) {
//设置用户公司ID
QueryUtil.setQueryLimitCom(examineSaleManApplyDto);
- String userId = examineSaleManApplyDto.getUserId();
//待审核状态才允许提交
ShopSalesmanApply shopSalesmanApply = shopSalesmanApplyDao.selectById(examineSaleManApplyDto.getApplyId());
if(ObjectUtil.isEmpty(shopSalesmanApply)) {
return AjaxResult.buildFailInstance("当前记录有误");
}
- BizUser bizUser = bizUserDao.findByOpenId(userId);
- if(ObjectUtil.isEmpty(bizUser)) {
+ SysVipInfo sysVipInfo = sysVipInfoDao.selectById(examineSaleManApplyDto.getUserId());
+ if(ObjectUtil.isEmpty(sysVipInfo)) {
return AjaxResult.buildFailInstance("当前记录有误");
}
--
Gitblit v1.9.1