From 403fac44275710b6edbee656809890b97d68aa97 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 8 Oct 2025 16:31:02 +0800 Subject: [PATCH] =?UTF-8?q?10-08-=E7=8E=B0=E9=87=91=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/Util/BaseDES.java | 2 +- .../demo/controller/cash/CashAuditController.java | 20 +++++++++++++------- .../example/demo/mapper/cash/CashAuditMapper.java | 19 +++++++++++++++++++ .../demo/serviceImpl/cash/CashAuditServiceImpl.java | 21 +++++++++++++++++++-- src/main/resources/cashMapper/CashAuditMapper.xml | 12 ++++++++++++ .../resources/cashMapper/CashCollectionMapper.xml | 2 +- 6 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java create mode 100644 src/main/resources/cashMapper/CashAuditMapper.xml diff --git a/src/main/java/com/example/demo/Util/BaseDES.java b/src/main/java/com/example/demo/Util/BaseDES.java index aeb930e..0ed4dd0 100644 --- a/src/main/java/com/example/demo/Util/BaseDES.java +++ b/src/main/java/com/example/demo/Util/BaseDES.java @@ -91,7 +91,7 @@ public class BaseDES { public static void main(String args[]) { try { BaseDES d = new BaseDES(); - String encryptedText = d.encrypt("94616995"); + String encryptedText = d.encrypt("90048130"); System.out.println("加密结果：" + encryptedText); System.out.println("加密字符串：90005179》"+d.encrypt("90005179")); System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff")); 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 de1a222..f4571c9 100644 --- a/src/main/java/com/example/demo/controller/cash/CashAuditController.java +++ b/src/main/java/com/example/demo/controller/cash/CashAuditController.java @@ -2,8 +2,10 @@ 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.service.cash.CashAuditService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -23,12 +25,16 @@ import org.springframework.web.bind.annotation.*; @CrossOrigin public class CashAuditController { + + @Autowired + private CashAuditService cashAuditService; + //收款审核 - // @Log("收款审核") - // @PostMapping("collectionAudit") - // public ResponseEntity collectionAudit( - // @RequestBody AuditRequest request){ - // boolean result = cashAuditService.collectionAudit(request.getToken(),request.getOrderCode(), request.getAction(),request.getRejectReason()); - //return ResponseEntity.ok(result); - // } + @Log("收款审核") + @PostMapping("/collectionAudit") + public ResponseEntity collectionAudit( + @RequestBody AuditRequest request){ + boolean result = cashAuditService.auditCollection(request.getToken(),request.getOrderCode(), request.getAction(),request.getRejectReason()); + return ResponseEntity.ok(result); + } } diff --git a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java new file mode 100644 index 0000000..94db695 --- /dev/null +++ b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java @@ -0,0 +1,19 @@ +package com.example.demo.mapper.cash; + +import com.example.demo.domain.entity.CashRecord; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @program: gold-java + * @ClassName cashAuditMapper + * @description: + * @author: Ethan + * @create: 2025−10-08 15:02 + * @Version 1.0 + **/ +@Mapper +public interface CashAuditMapper { + //更新订单 + void updateOrder (CashRecord updateOrder); +} 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 8795031..86948fc 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.mapper.cash.CashAuditMapper; import com.example.demo.mapper.cash.CashCollectionMapper; import com.example.demo.service.cash.CashAuditService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,11 +20,27 @@ import org.springframework.transaction.annotation.Transactional; public class CashAuditServiceImpl implements CashAuditService { @Autowired private CashCollectionMapper cashCollectionMapper; - + @Autowired + private CashAuditMapper cashAuditMapper; @Transactional @Override public boolean auditCollection(String token, String orderCode, Integer action, String rejectReason) { CashRecord order = cashCollectionMapper.selectUnAuditByOrderCode(orderCode); - return false; + if (order==null || order.getStatus()!=0){ + throw new IllegalArgumentException("订单不存在或已被审核"); + } + //判断是通过还是驳回，更新审核状态 + CashRecord updateOrder = new CashRecord(); + updateOrder.setOrderCode(orderCode); + if (action==1){ //通过 + updateOrder.setStatus(1); + } + else if (action==2){ //驳回 + updateOrder.setStatus(2); + updateOrder.setRejectReason(rejectReason); + } + //更新订单 + cashAuditMapper.updateOrder(updateOrder); + return true; } } diff --git a/src/main/resources/cashMapper/CashAuditMapper.xml b/src/main/resources/cashMapper/CashAuditMapper.xml new file mode 100644 index 0000000..9de8075 --- /dev/null +++ b/src/main/resources/cashMapper/CashAuditMapper.xml @@ -0,0 +1,12 @@ + + + + + + + update cash_record + set status=#{status}, + reject_reason=#{rejectReason} + where order_code=#{orderCode} and status=0 + + \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index a72329c..48f68de 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -113,6 +113,6 @@ \ No newline at end of file