diff --git a/src/main/java/com/example/demo/controller/cash/CashAuditController.java b/src/main/java/com/example/demo/controller/cash/CashAuditController.java index 0ace10f..b9b5125 100644 --- a/src/main/java/com/example/demo/controller/cash/CashAuditController.java +++ b/src/main/java/com/example/demo/controller/cash/CashAuditController.java @@ -2,6 +2,7 @@ package com.example.demo.controller.cash; import com.example.demo.config.interfac.Log; import com.example.demo.domain.vo.coin.AuditRequest; +import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.cash.CashAuditService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -32,9 +33,13 @@ public class CashAuditController { //收款审核 @Log("收款审核") @PostMapping("/collectionAudit") - public ResponseEntity collectionAudit( + public Result collectionAudit( @RequestBody AuditRequest request){ - boolean result = cashAuditService.auditCollection(request.getToken(),request.getAuditId(),request.getOrderCode(), request.getAction(),request.getRejectReason()); - return ResponseEntity.ok(result); - } + try { + boolean result = cashAuditService.auditCollection(request.getToken(),request.getAuditId(),request.getOrderCode(), request.getAction(),request.getRejectReason()); + + return Result.success(result); + }catch (Exception e){ + return Result.error(e.getMessage()); + }} } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java index 55b9bc2..5db9dac 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -1,6 +1,7 @@ package com.example.demo.serviceImpl.cash; import com.example.demo.domain.entity.CashRecord; +import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.mapper.cash.CashAuditMapper; import com.example.demo.mapper.cash.CashCollectionMapper; import com.example.demo.mapper.coin.AuditMapper; @@ -9,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; + /** * @program: gold-java * @ClassName CashAuditServiceImpl