From 353ec2376201dbfaac3477262deb40bf35ad3154 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 14:06:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index 04526ed..6426061 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -111,7 +111,8 @@
one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
orderAuctionBondMapper.updateById(one1);
- if (one1.getBond().compareTo(new BigDecimal(0))==0){
+
+ if (one1.getBond()==null||one1.getBond().compareTo(new BigDecimal(0))==0){
one1.setBoundStatus(BondStatusEnum.PAID);
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("Type",1);
@@ -127,6 +128,12 @@
page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
+ if (page1.getTotalAmount().compareTo(new BigDecimal(0))==0){
+ Map<String, Object> returnMap = new HashMap<>();
+ returnMap.put("Type",1);
+ return R.ok(returnMap);
+ }
if(page1.getOrderNo().contains("SP")){
--
Gitblit v1.7.1