merge

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/CommonDistributionController.java

@@ -4,15 +4,19 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
+import com.zhongzheng.modules.distribution.vo.DistributionGoodsListVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,9 +31,10 @@ import java.util.Map;
 @RequestMapping("/app/common/distribution")
 public class CommonDistributionController extends BaseController {
 
-
     private final IDistributionActivityPosterService iDistributionActivityPosterService;
 
+    private final IDistributionActivityService iDistributionActivityService;
+
     @ApiOperation("获取分享页面参数")
     @PreAuthorize("@ss.hasPermi('system:poster:query')")
     @GetMapping("/sharePoster")
@@ -38,4 +43,17 @@ public class CommonDistributionController extends BaseController {
         return AjaxResult.success("成功",iDistributionActivityPosterService.sharePoster(bo));
     }
 
+    /**
+     * 获取活动商品信息
+     * @author change
+     * @date 2023/3/28 9:41
+     * @param distributionId
+     * @return null
+     */
+    @ApiOperation("获取活动商品信息")
+    @GetMapping("/goods/list/{distributionId}")
+    public AjaxResult<List<DistributionGoodsListVo>> getGoodsList(@PathVariable("distributionId") Long distributionId) {
+        return AjaxResult.success(iDistributionActivityService.getGoodsList(distributionId));
+    }
+
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityController.java

@@ -10,12 +10,10 @@ import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsSer
 import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityVo;
-import com.zhongzheng.modules.distribution.vo.DistributionGoodsListVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -107,20 +105,12 @@ public class DistributionActivityController extends BaseController {
      * 查询【请填写功能名称】列表
      */
     @ApiOperation("查询活动详情商品列表")
-    @PreAuthorize("@ss.hasPermi('system:activity:list')")
     @GetMapping("/goodsList")
     public TableDataInfo<DistributionActivityGoodsVo> getDetailGoodsList(DistributionActivityGoodsQueryBo bo) {
         startPage();
         List<DistributionActivityGoodsVo> list = iDistributionActivityGoodsService.getDetailGoodsList(bo);
         return getDataTable(list);
     }
-     /* 获取活动商品信息
-     */
-    @ApiOperation("获取活动商品信息")
-    @GetMapping("/goods/list/{distributionId}")
-    public AjaxResult<List<DistributionGoodsListVo>> getGoodsList(@PathVariable("distributionId") Long distributionId) {
-        return AjaxResult.success(iDistributionActivityService.getGoodsList(distributionId));
-    }
 
 
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionAdminCashWithdrawalController.java

@@ -1,27 +1,21 @@
 package com.zhongzheng.controller.distribution;
 
-import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalQueryBo;
 import com.zhongzheng.modules.distribution.bo.DistributionCheckHandleBo;
 import com.zhongzheng.modules.distribution.bo.DistributionCheckQueryBo;
 import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
-import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
 import com.zhongzheng.modules.distribution.vo.DistributionCheckDetailVo;
 import com.zhongzheng.modules.distribution.vo.DistributionCheckVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -45,41 +39,36 @@ public class DistributionAdminCashWithdrawalController extends BaseController {
     private final TokenService tokenService;
 
     /**
-     * 查询分销业务员提现申请列表
+     * 审核列表
      */
-    @ApiOperation("查询分销业务员提现申请列表")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:list')")
+    @ApiOperation("审核列表")
     @GetMapping("/list")
-    public TableDataInfo<DistributionCashWithdrawalVo> list(DistributionCashWithdrawalQueryBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
+    public TableDataInfo<DistributionCheckVo> list(DistributionCheckQueryBo bo) {
         startPage();
-        List<DistributionCashWithdrawalVo> list = iDistributionCashWithdrawalService.queryList(bo);
+        List<DistributionCheckVo> list = iDistributionCashWithdrawalService.queryCheckList(bo);
         return getDataTable(list);
     }
 
-
     /**
-     * 获取分销业务员提现申请详细信息
+     * 审核
      */
-    @ApiOperation("获取分销业务员提现申请详细信息")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<DistributionCashWithdrawalVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionCashWithdrawalService.queryById(id));
+    @ApiOperation("审核")
+    @PostMapping("/handle")
+    public AjaxResult<Void> checkHandle(@RequestBody DistributionCheckHandleBo bo) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setAuditorId(loginUser.getUser().getUserId());
+        bo.setAuditor(SecurityUtils.getUsername());
+        return toAjax(iDistributionCashWithdrawalService.checkHandle(bo)? 1 : 0);
     }
 
     /**
-     * 新增分销业务员提现申请
+     * 审核详情
      */
-    @ApiOperation("新增分销业务员提现申请")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
-    @Log(title = "分销业务员提现申请", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionCashWithdrawalAddBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        return toAjax(iDistributionCashWithdrawalService.insertByAddBo(bo) ? 1 : 0);
+    @ApiOperation("审核详情")
+    @GetMapping("/detail/{id}")
+    public AjaxResult<List<DistributionCheckDetailVo>> checkDetail(@PathVariable("id") Long id) {
+        List<DistributionCheckDetailVo> detailVos = iDistributionCashWithdrawalService.checkDetail(id);
+        return AjaxResult.success(detailVos);
     }
 
 

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionCashWithdrawalController.java

@@ -12,15 +12,6 @@ import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalQueryBo;
 import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
 import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionCheckHandleBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCheckQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
-import com.zhongzheng.modules.distribution.vo.DistributionCheckDetailVo;
-import com.zhongzheng.modules.distribution.vo.DistributionCheckVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -41,7 +32,6 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/distribution/withdrawal")
-
 public class DistributionCashWithdrawalController extends BaseController {
 
     private final IDistributionCashWithdrawalService iDistributionCashWithdrawalService;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionCashWithdrawalServiceImpl.java

@@ -3,15 +3,6 @@ package com.zhongzheng.modules.distribution.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.type.EncryptHandler;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.distribution.bo.DistributionCashLogAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionCashWithdrawal;
-import com.zhongzheng.modules.distribution.domain.DistributionSeller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -25,14 +16,12 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.distribution.bo.*;
 import com.zhongzheng.modules.distribution.domain.DistributionCashWithdrawal;
 import com.zhongzheng.modules.distribution.domain.DistributionCheck;
+import com.zhongzheng.modules.distribution.domain.DistributionSeller;
 import com.zhongzheng.modules.distribution.mapper.DistributionCashWithdrawalMapper;
 import com.zhongzheng.modules.distribution.service.IDistributionCashLogService;
 import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
-import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
-import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
-import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.distribution.service.IDistributionCheckService;
+import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
 import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
 import com.zhongzheng.modules.distribution.vo.DistributionCheckDetailVo;
 import com.zhongzheng.modules.distribution.vo.DistributionCheckVo;
@@ -60,9 +49,9 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
 
     @Autowired
     private IDistributionSellerService iDistributionSellerService;
-
     @Autowired
     private IDistributionCashLogService iDistributionCashLogService;
+    @Autowired
     private ISysRoleService iSysRoleService;
     @Autowired
     public ISysUserService iSysUserService;
@@ -198,7 +187,7 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
     @Override
     public boolean checkHandle(DistributionCheckHandleBo bo) {
         DistributionCashWithdrawal warning = getById(bo.getCwId());
-        if (ObjectUtils.isNotNull(warning)){
+        if (ObjectUtils.isNull(warning)){
             throw new CustomException("提现记录获取失败！");
         }
 //        validStatus(bo,warning);
@@ -210,7 +199,7 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
         String roleKey2 = "accounting";
         String roleKey3 = "boss";
         Integer checkStatus = 0;
-        if (bo.getCheckStatus() == 1){
+        if (bo.getCheckStatus() == 0){
             //一审教务
             validPermission(bo,roleKey1);
             if (bo.getCheckResult() == 1){
@@ -220,10 +209,10 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
             }else {
                 //拒绝 打回上一层
                 addNextAuditor(check,1,roleKey1);
-                checkStatus = 0;
+                checkStatus = -1;
             }
         }
-        if (bo.getCheckStatus() == 2){
+        if (bo.getCheckStatus() == 1){
             //二审财务
             validPermission(bo,roleKey2);
             if (bo.getCheckResult() == 1){
@@ -233,10 +222,10 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
             }else {
                 //拒绝 打回上一层
                 addNextAuditor(check,1,roleKey1);
-                checkStatus = 1;
+                checkStatus = 0;
             }
         }
-        if (bo.getCheckStatus() == 3){
+        if (bo.getCheckStatus() == 2){
             //三审老板
             validPermission(bo,roleKey3);
             if (bo.getCheckResult() == 1){
@@ -245,7 +234,7 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
             }else {
                 //拒绝 打回上一层
                 addNextAuditor(check,2,roleKey2);
-                checkStatus = 2;
+                checkStatus = 1;
             }
         }
         //保存审核记录
@@ -276,7 +265,9 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
     }
 
     private void validPermission(DistributionCheckHandleBo bo,String roleKey) {
-
+        if (bo.getAuditor().equals("admin")){
+            return;
+        }
         SysRole edu = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleKey, roleKey));
         if (ObjectUtils.isNull(edu)){
             throw new CustomException("没有当前审核角色");

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionCheckVo.java

@@ -17,6 +17,9 @@ import java.math.BigDecimal;
 @ApiModel("分销审核")
 public class DistributionCheckVo implements Serializable {
 
+	/** 提现Id */
+	@ApiModelProperty("提现Id")
+	private Long id;
 	/** 提现单号 */
 	@ApiModelProperty("提现单号")
 	private String cwSn;

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionCashWithdrawalMapper.xml

@@ -22,13 +22,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryCheckList" parameterType="com.zhongzheng.modules.distribution.bo.DistributionCheckQueryBo" resultType="com.zhongzheng.modules.distribution.vo.DistributionCheckVo">
         SELECT
+            dcw.id,
             dcw.apply_time,
             dcw.cw_sn,
             dcw.cash,
             dcw.cw_status,
             ds.realname as sellerName,
-            ds.telphone
-        FROM distribution_cash_withdrawal dcw LEFT JOIN distribution_seller ds ON dcm.seller_id = ds.seller_id
+            su.phonenumber as telphone
+        FROM distribution_cash_withdrawal dcw
+            LEFT JOIN distribution_seller ds ON dcw.seller_id = ds.seller_id
+            LEFT JOIN sys_user su ON ds.seller_id = su.seller_id
         WHERE dcw.`status` = 1
         <if test="cwStatus != null and cwStatus.size()!=0 ">
             AND dcw.cw_status in