From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 155 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 f462439..f0fe454 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,7 +1,7 @@
package com.matrix.system.fenxiao.action;
import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
@@ -10,20 +10,27 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
+import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
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 io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
@RestController
@@ -38,6 +45,8 @@
private BizUserDao bizUserDao;
@Autowired
private ShopSalesmanGradeDao shopSalesmanGradeDao;
+ @Autowired
+ private BusParameterSettingsDao busParameterSettingsDao;
/**
* 分销员详情页面信息
@@ -54,7 +63,8 @@
AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
//根据OPENID查询基础信息
String userId = shopSalesmanDetailDto.getUserId();
- SalesmanBasicDetailVo salesmanBasicDetailVo = shopSalesmanApplyService.selectShopSalesmanDetailByOpenId(userId);
+ String applyId = shopSalesmanDetailDto.getApplyId();
+ SalesmanBasicDetailVo salesmanBasicDetailVo = shopSalesmanApplyService.selectShopSalesmanDetailByOpenId(userId,Long.parseLong(applyId));
result.putInMap("basicdetail", salesmanBasicDetailVo);
//排序
if(StringUtils.isBlank(shopSalesmanDetailDto.getSort())){
@@ -97,6 +107,136 @@
public @ResponseBody
AjaxResult unbundlingSaleMan(@RequestBody UnbundlingSaleManDto unbundlingSaleManDto) {
return shopSalesmanApplyService.unbundlingSaleMan(unbundlingSaleManDto);
+ }
+
+ /**
+ *推广图片
+ */
+ @ApiOperation(value = "推广图片")
+ @PostMapping(value = "/updateTgtp")
+ public @ResponseBody
+ AjaxResult updateTgtp(@RequestBody UpdateTgtpDto updateTgtpDto) {
+ return shopSalesmanApplyService.updateTgtp(updateTgtpDto);
+ }
+
+ /**
+ *推广图片
+ */
+ @RequestMapping(value = "/loadTgtpSetting")
+ public AjaxResult loadTgtpSetting() {
+
+ AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ Long companyId = user.getCompanyId();
+
+ //推广文案
+ String[] FXKGCode={FenxiaoSettingConstant.FX_TG_POSTER};
+ String[] FXKGName={"推广图片"};
+ List<FenXiaoSettingVo> fxkgRuleSettingsVo = getRuleSettingsVo(FXKGCode,FXKGName,companyId);
+ result.putInMap("tgtp", fxkgRuleSettingsVo.get(0));
+ return result;
+ }
+
+ /**
+ *推广计划更新
+ */
+ @ApiOperation(value = "推广计划更新")
+ @PostMapping(value = "/updateTgjh")
+ public @ResponseBody
+ AjaxResult updateTgjh(@RequestBody UpdateTgjhDto updateTgjhDto) {
+ return shopSalesmanApplyService.updateTgjh(updateTgjhDto);
+ }
+ /**
+ *查询推广计划
+ */
+ @RequestMapping(value = "/loadTgwaSetting")
+ public AjaxResult loadTgwaSetting() {
+
+ AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ Long companyId = user.getCompanyId();
+
+ //推广文案
+ String[] FXKGCode={FenxiaoSettingConstant.FX_TG_PLAN};
+ String[] FXKGName={"推广文案"};
+ List<FenXiaoSettingVo> fxkgRuleSettingsVo = getRuleSettingsVo(FXKGCode,FXKGName,companyId);
+ result.putInMap("tgwa", fxkgRuleSettingsVo.get(0));
+ return result;
+ }
+
+ /**
+ *获取对应的规则设置数据
+ * @param ArrayCode
+ * @param ArrayName
+ * @param companyId
+ * @return
+ */
+ private List<FenXiaoSettingVo> getRuleSettingsVo(String[] ArrayCode,String[] ArrayName,Long companyId){
+ List<BusParameterSettings> dataList = busParameterSettingsDao.selectByCodesAndCompanyId(Arrays.asList(ArrayCode), companyId);
+ List<FenXiaoSettingVo> scoreRuleSettingsVos=new ArrayList<FenXiaoSettingVo>();
+ int index=0;
+ for (BusParameterSettings item:dataList){
+ FenXiaoSettingVo paramVo=new FenXiaoSettingVo();
+ BeanUtils.copyProperties(item,paramVo);
+ paramVo.setParamName(ArrayName[index]);
+ scoreRuleSettingsVos.add(paramVo);
+ index++;
+ }
+ return scoreRuleSettingsVos;
+ }
+
+ /**
+ * 分佣方案
+ */
+ @ApiOperation(value = "查询分佣方案")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "OK", response = FyfaManageVo.class)
+ })
+ @PostMapping(value = "/findFyfaManageList")
+ public @ResponseBody
+ AjaxResult findFyfaManageList(@RequestBody FyfaManageDto fyfaManageDto) {
+ //设置用户公司ID
+ QueryUtil.setQueryLimitCom(fyfaManageDto);
+ //排序
+ if(StringUtils.isBlank(fyfaManageDto.getSort())){
+ fyfaManageDto.setSort("create_time");
+ fyfaManageDto.setOrder("asc");
+ }
+ Page<FyfaManageVo> page = new Page(fyfaManageDto.getPageNum(), fyfaManageDto.getPageSize());
+ IPage<FyfaManageVo> rows = shopSalesmanApplyService.findFyfaManageList(page,fyfaManageDto);
+ AjaxResult result = AjaxResult.buildSuccessInstance(rows.getRecords(),rows.getTotal());
+ return result;
+ }
+
+ /**
+ *新增分佣方案
+ */
+ @ApiOperation(value = "新增分佣方案")
+ @RequestMapping(value = "/addFyfa")
+ private @ResponseBody AjaxResult addFyfa(){
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ shopSalesmanApplyService.addFyfa(user);
+ return AjaxResult.buildSuccessInstance("新增成功");
+ }
+
+ /**
+ *修改分佣方案
+ */
+ @ApiOperation(value = "修改分佣方案")
+ @PostMapping(value = "/updateFyfa")
+ public @ResponseBody
+ AjaxResult updateFyfa(@RequestBody UpdateFyfaDto updateFyfaDto) {
+ return shopSalesmanApplyService.updateFyfa(updateFyfaDto);
+ }
+
+ /**
+ *删除分佣方案
+ */
+ @ApiOperation(value = "删除分佣方案")
+ @PostMapping(value = "/delFyfaApply")
+ public @ResponseBody
+ AjaxResult delFyfaApply(@RequestBody DelFyfaApplyDto delFyfaApplyDto) {
+ return shopSalesmanApplyService.delFyfaApply(delFyfaApplyDto);
}
/**
@@ -155,13 +295,21 @@
@ApiOperation(value = "新增分销员")
@PostMapping(value = "/addSaleManApply")
public @ResponseBody
- AjaxResult findShopSalesmanAppliingList(@RequestBody AddSaleManApplyDto addSaleManApplyDto) {
+ AjaxResult addSaleManApply(@RequestBody AddSaleManApplyDto addSaleManApplyDto) {
+ String gradeId = addSaleManApplyDto.getGradeId();
+ if(StrUtil.isBlankOrUndefined(gradeId)) {
+ return AjaxResult.buildSuccessInstance("请选择分销等级");
+ }
+ ShopSalesmanGrade selectById = shopSalesmanGradeDao.selectById(Long.parseLong(gradeId));
+ if(ObjectUtil.isEmpty(selectById)) {
+ return AjaxResult.buildSuccessInstance("请选择分销等级");
+ }
+
//设置用户公司ID
QueryUtil.setQueryLimitCom(addSaleManApplyDto);
- AjaxResult result= AjaxResult.buildSuccessInstance("设置成功");
- shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getUserId(),addSaleManApplyDto.getGradeId());
- return result;
+ shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getOpenId(),gradeId);
+ return AjaxResult.buildSuccessInstance("设置成功");
}
/**
@@ -185,10 +333,7 @@
QueryUtil.setQueryLimitCom(examineSaleManApplyDto);
String userId = examineSaleManApplyDto.getUserId();
//待审核状态才允许提交
- QueryWrapper<ShopSalesmanApply> queryWrapperOrepool = new QueryWrapper<>();
- queryWrapperOrepool.eq("user_id", userId);
- queryWrapperOrepool.eq("company_id", examineSaleManApplyDto.getCompanyId());
- ShopSalesmanApply shopSalesmanApply = shopSalesmanApplyDao.selectOne(queryWrapperOrepool);
+ ShopSalesmanApply shopSalesmanApply = shopSalesmanApplyDao.selectById(examineSaleManApplyDto.getApplyId());
if(ObjectUtil.isEmpty(shopSalesmanApply)) {
return AjaxResult.buildFailInstance("当前记录有误");
}
--
Gitblit v1.9.1