|
@@ -35,6 +35,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
|
|
import com.qunzhixinxi.hnqz.admin.util.AmountToCNUtil;
|
|
import com.qunzhixinxi.hnqz.admin.util.AmountToCNUtil;
|
|
import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils;
|
|
import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils;
|
|
|
|
+import com.qunzhixinxi.hnqz.common.core.exception.BizException;
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
import com.qunzhixinxi.hnqz.common.ding.enums.DingEnum;
|
|
import com.qunzhixinxi.hnqz.common.ding.enums.DingEnum;
|
|
import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
|
|
import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
|
|
@@ -49,6 +50,7 @@ import org.apache.commons.lang3.RandomStringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
import org.springframework.data.redis.core.script.DefaultRedisScript;
|
|
import org.springframework.data.redis.core.script.DefaultRedisScript;
|
|
|
|
+import org.springframework.security.access.AccessDeniedException;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -408,13 +410,13 @@ public class WmPayOffController {
|
|
*/
|
|
*/
|
|
@SysLog("导出结算单")
|
|
@SysLog("导出结算单")
|
|
@GetMapping("/exportSettlementProof")
|
|
@GetMapping("/exportSettlementProof")
|
|
- public void exportSettlementProof(@RequestParam("packageIds") List<String> packageIds, HttpServletResponse response) {
|
|
|
|
|
|
+ public void exportSettlementProof(@RequestParam("packageIds") List<String> packageIds, HttpServletResponse response) throws IllegalAccessException {
|
|
log.info("导出结算单参数packageIds={}", packageIds);
|
|
log.info("导出结算单参数packageIds={}", packageIds);
|
|
|
|
|
|
Integer deptId = SecurityUtils.getUser().getDeptId();
|
|
Integer deptId = SecurityUtils.getUser().getDeptId();
|
|
SysDept dept = sysDeptService.getById(deptId);
|
|
SysDept dept = sysDeptService.getById(deptId);
|
|
if (!ArrayUtil.contains(dept.getDeptPermissions(), DeptPermissionEnum.SETTLEMENT_PROOF.val())) {
|
|
if (!ArrayUtil.contains(dept.getDeptPermissions(), DeptPermissionEnum.SETTLEMENT_PROOF.val())) {
|
|
- throw new RuntimeException("没有权限");
|
|
|
|
|
|
+ throw new AccessDeniedException("没有权限");
|
|
}
|
|
}
|
|
|
|
|
|
// 查询积分包
|
|
// 查询积分包
|
|
@@ -424,7 +426,7 @@ public class WmPayOffController {
|
|
wmScorePackageSettleNoteService.list(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
|
|
wmScorePackageSettleNoteService.list(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
|
|
.in(WmScorePackageSettleNote::getPackageId, packageIds));
|
|
.in(WmScorePackageSettleNote::getPackageId, packageIds));
|
|
if (CollUtil.isEmpty(settleNoteList)) {
|
|
if (CollUtil.isEmpty(settleNoteList)) {
|
|
- throw new RuntimeException("结算信息为空");
|
|
|
|
|
|
+ throw new BizException("结算信息为空");
|
|
}
|
|
}
|
|
|
|
|
|
Map<String, List<WmScorePackageSettleNote>> settleNoteMap = settleNoteList.stream()
|
|
Map<String, List<WmScorePackageSettleNote>> settleNoteMap = settleNoteList.stream()
|