Merge branch 'dev-meta-dz' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/web/UserBalanceController.java

@@ -1,5 +1,6 @@
 package com.izouma.nineth.web;
 
+import cn.hutool.core.math.Money;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.kevinsawicki.http.HttpRequest;
@@ -14,21 +15,29 @@ import com.izouma.nineth.enums.PayMethod;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.*;
 import com.izouma.nineth.service.UserBalanceService;
+import com.izouma.nineth.utils.DateTimeUtils;
 import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.SnowflakeIdWorker;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.springframework.core.io.InputStreamResource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.util.concurrent.ExecutionException;
 
@@ -55,7 +64,7 @@ public class UserBalanceController extends BaseController {
     }
 
     @PostMapping("/records")
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasAnyRole('ADMIN','ORDERINFO')")
     public Page<BalanceRecord> records(@RequestBody PageQuery pageQuery) {
         return balanceRecordRepo
                 .findAll(JpaUtils.toSpecification(pageQuery, BalanceRecord.class), JpaUtils.toPageRequest(pageQuery));

src/main/java/com/izouma/nineth/web/WithdrawApplyController.java

@@ -51,19 +51,19 @@ public class WithdrawApplyController extends BaseController {
         return withdrawApplyService.apply(SecurityUtils.getAuthenticatedUser().getId(), amount);
     }
 
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasAnyRole('ADMIN','ORDERINFO')")
     @PostMapping("/finish")
     public WithdrawApply finish(@RequestParam Long id, @RequestParam boolean approve, String reason) {
         return withdrawApplyService.finishWithdrawApply(id, approve, reason);
     }
 
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasAnyRole('ADMIN','ORDERINFO')")
     @PostMapping("/approveAll")
     public void approveAll() throws ExecutionException, InterruptedException {
         withdrawApplyService.approveAllAsync();
     }
 
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasAnyRole('ADMIN','ORDERINFO')")
     @PostMapping("/applyAll")
     public void applyAll() throws ExecutionException, InterruptedException {
         withdrawApplyService.applyAll();