From b09b6f7ece1841091e2265a538a7f5fcd17c7ad1 Mon Sep 17 00:00:00 2001 From: wangqx Date: Mon, 7 Jul 2025 10:46:28 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BC=98=E5=8C=96pom=E5=92=8C=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../controller/DivideController.java | 6 +++--- .../transaction/service/IDivideService.java | 2 +- .../service/impl/DivideServiceImpl.java | 19 ++++++++++--------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 89644bb00..856d09f85 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -215,7 +215,7 @@ sms: supplier: tencent access-key-id: AKIDvhEVWHm0xe5JGxOZXGitnRovlKcfRzIN access-key-secret: qPhiTxA7oENFrCH5dvxiCQN4UdWAYgYA - signature: 无终街科技 + signature: 无终街天津科技 sdk-app-id: 1400966042 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java index ff516fac7..25c55c31a 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java @@ -66,9 +66,9 @@ public class DivideController { @Tag(name = "根据订单id分账") @Log(title = "分账", businessType = BusinessType.DELETE) - @DeleteMapping("/divide/{orderNo}") - public R divide(@PathVariable String orderNo) { - return R.ok(service.divide(orderNo)); + @GetMapping("/divide/{orderId}") + public R divide(@PathVariable Long orderId) { + return R.ok(service.divide(orderId)); } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideService.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideService.java index 3b7119c29..4d9584fc4 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideService.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/IDivideService.java @@ -12,7 +12,7 @@ public interface IDivideService extends IService { DivideVO getVOById( Long divideId); - boolean divide(String orderNo); + boolean divide(Long orderId); boolean cancelDivide(String orderNo); diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java index 0dd24a698..d17bc1657 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java @@ -141,18 +141,18 @@ public class DivideServiceImpl extends ServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) - public boolean divide(String orderNo) { + public boolean divide(Long orderId) { //获取订单信息 - Order order = orderService.getByNo(orderNo); + Order order = orderService.getById(orderId); if (order == null) { throw new ServiceException("订单不存在"); } - if (order.getStatus() != 1) { + if (order.getStatus() != 3) { //订单状态为已完成 throw new ServiceException("订单状态不正确"); } - Divide divide = this.getByOrderNo(orderNo); - if (divide == null) { + Divide divide = this.getById(orderId); + if (divide != null) { throw new ServiceException("已存在分账记录，无需再次分账"); } //查找分账规则 @@ -175,7 +175,7 @@ public class DivideServiceImpl extends ServiceImpl impleme .orderMoney(totalAmount) .fee(totalFee) .actualMoney(totalAmount.subtract(totalFee)) - .orderSn(orderNo) + .orderSn(order.getOrderSn()) .status(DivideStatus.PENDING.getCode()) .build(); super.save(divide); @@ -331,9 +331,10 @@ public class DivideServiceImpl extends ServiceImpl impleme } MemberAccount account = accountService.getMemberAccount(tenant.getId()); - if (account == null) { - return null; - } +// if (account == null) +// +// return null; +// } return new HashMap<>() {{ put("accountId", account.getId() + ""); put("accountName", account.getName());