submit

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

@@ -45,6 +45,9 @@ public class DistributionAdminCashWithdrawalController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<DistributionCheckVo> list(DistributionCheckQueryBo bo) {
         startPage();
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setAuditorId(loginUser.getUser().getUserId());
+        bo.setAuditor(SecurityUtils.getUsername());
         List<DistributionCheckVo> list = iDistributionCashWithdrawalService.queryCheckList(bo);
         return getDataTable(list);
     }

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

@@ -6,6 +6,7 @@ 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;
@@ -83,6 +84,9 @@ public class DistributionCashWithdrawalController extends BaseController {
     @Log(title = "打款", businessType = BusinessType.INSERT)
     @PostMapping("/payCash")
     public AjaxResult<Void> payCash(@RequestBody DistributionCheckQueryBo bo) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setAuditorId(loginUser.getUser().getUserId());
+        bo.setAuditor(SecurityUtils.getUsername());
         return toAjax(iDistributionCashWithdrawalService.payCash(bo) ? 1 : 0);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionCheckQueryBo.java

@@ -47,4 +47,8 @@ public class DistributionCheckQueryBo extends BaseEntity {
 	/** 提现状态 0未审核 1初审通过 2二审通过 3三审通过 4已打款 -1已拒绝 */
 	@ApiModelProperty("提现状态 0未审核 1初审通过 2二审通过 3三审通过 4已打款 -1已拒绝")
 	private List<Integer> cwStatus;
+	@ApiModelProperty("审核人ID")
+	private Long auditorId;
+	@ApiModelProperty("审核人")
+	private String auditor;
 }

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

@@ -193,9 +193,39 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
     @Override
     public List<DistributionCheckVo> queryCheckList(DistributionCheckQueryBo bo) {
         List<DistributionCheckVo> checkVos = baseMapper.queryCheckList(bo);
+        //是否显示打款
+        DistributionCheckHandleBo check = new DistributionCheckHandleBo();
+        check.setAuditorId(bo.getAuditorId());
+        check.setAuditor(bo.getAuditor());
+        Integer cashier = validCashier(check, "cashier");
+        checkVos.forEach(item -> {
+            item.setCashier(cashier);
+        });
         return checkVos;
     }
 
+    private Integer validCashier(DistributionCheckHandleBo bo, String roleKey) {
+        if (bo.getAuditor().equals("admin")){
+            return 1;
+        }
+        SysRole edu = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleKey, roleKey));
+        if (ObjectUtils.isNull(edu)){
+            return 0;
+        }
+        List<SysUserRole> list = iSysUserRoleService
+                .list(new LambdaQueryWrapper<SysUserRole>()
+                        .eq(SysUserRole::getRoleId, edu.getRoleId()));
+        if (CollectionUtils.isEmpty(list)){
+            return 0;
+        }
+
+        List<SysUser> sysUsers = iSysUserService.listByIds(list.stream().map(SysUserRole::getUserId).collect(Collectors.toList()));
+        if (sysUsers.stream().noneMatch(item -> item.getUserId().equals(bo.getAuditorId()))){
+            return 0;
+        }
+        return 1;
+    }
+
     @Override
     public boolean checkHandle(DistributionCheckHandleBo bo) {
         DistributionCashWithdrawal warning = getById(bo.getCwId());
@@ -279,7 +309,11 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
         if(Validator.isEmpty(seller)||Validator.isEmpty(seller.getGzhOpenId())){
             throw new CustomException("非法业务员或不存在openID");
         }
-
+        //校验打款权限
+        DistributionCheckHandleBo check = new DistributionCheckHandleBo();
+        check.setAuditor(bo.getAuditor());
+        check.setAuditorId(bo.getAuditorId());
+        validPermission(check,"cashier");
         Map<String, String> params = new HashMap<>();
         Long nowTime = DateUtils.getNowTime();
         String sign = ToolsUtils.EncoderByMd5(withdrawal.getCwSn()+nowTime.toString()+"pubilc2022");

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

@@ -41,4 +41,6 @@ public class DistributionCheckVo implements Serializable {
 	/** 提现状态 0未审核 1初审通过 2二审通过 3三审通过 4已打款 -1已拒绝 */
 	@ApiModelProperty("提现状态 0未审核 1初审通过 2二审通过 3三审通过 4已打款 -1已拒绝")
 	private Integer cwStatus;
+	@ApiModelProperty("是否显示打款：1显示")
+	private Integer cashier;
 }