From bf0c13ac0d300e0af0b3bfba24deb41dc3be23fc Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 30 Dec 2024 16:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC=E6=97=B6?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/book/service/PayPaymentOrderService.java   | 2 +-
 .../modules/book/service/impl/PayPaymentOrderServiceImpl.java | 4 ++--
 .../peanut/modules/pay/IOSPay/controller/AppController.java   | 3 +--
 .../modules/pay/alipay/service/impl/AliPayServiceImpl.java    | 2 +-
 .../pay/applePay/service/impl/ApplePayServiceImpl.java        | 2 +-
 .../modules/pay/paypal/controller/PaypalController.java       | 2 +-
 .../modules/pay/weChatPay/service/impl/WxpayServiceImpl.java  | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/service/PayPaymentOrderService.java b/src/main/java/com/peanut/modules/book/service/PayPaymentOrderService.java
index 8c07de86..ef4dd7ac 100644
--- a/src/main/java/com/peanut/modules/book/service/PayPaymentOrderService.java
+++ b/src/main/java/com/peanut/modules/book/service/PayPaymentOrderService.java
@@ -19,6 +19,6 @@ public interface PayPaymentOrderService extends IService<PayPaymentOrderEntity>
 
     PageUtils queryPage(Map<String, Object> params);
 
-    void insertDetail(MyUserEntity user, BookBuyConfigEntity bookBuyConfigEntity, int payXxxOrderId);
+    void insertDetail(MyUserEntity user, BookBuyConfigEntity bookBuyConfigEntity, String payXxxOrderId);
 }
 
diff --git a/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java
index 9957fc7d..43880c67 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java
@@ -37,10 +37,10 @@ public class PayPaymentOrderServiceImpl extends ServiceImpl<PayPaymentOrderDao,
     }
 
     @Override
-    public void insertDetail(MyUserEntity user, BookBuyConfigEntity bookBuyConfigEntity,int payXxxOrderId) {
+    public void insertDetail(MyUserEntity user, BookBuyConfigEntity bookBuyConfigEntity,String payXxxOrderId) {
         PayPaymentOrderEntity payPaymentOrderEntity = new PayPaymentOrderEntity();
         payPaymentOrderEntity.setUserId(user.getId());
-        payPaymentOrderEntity.setOrderId(payXxxOrderId+"");
+        payPaymentOrderEntity.setOrderId(payXxxOrderId);
         payPaymentOrderEntity.setRealAmount(new BigDecimal(bookBuyConfigEntity.getRealMoney()));
         payPaymentOrderEntity.setRechargeAmount(new BigDecimal(bookBuyConfigEntity.getMoney()));
         payPaymentOrderEntity.setRechargeChannel(bookBuyConfigEntity.getQudao());
diff --git a/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java b/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java
index 5d5f7c2a..4abbd0af 100644
--- a/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java
+++ b/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java
@@ -127,12 +127,11 @@ public class AppController {
                         //插入虚拟币消费记录
                         transactionDetailsService.rechargeRecord(userEntity,realMoney,order.getId(),"苹果",order.getOrderid());
                         //插入花生币充值记录
-                        payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,Integer.parseInt(order.getTransactionId()));
+                        payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,order.getTransactionId());
                         buyOrderService.updateOrderStatus(Integer.valueOf(customerid), dto.getOrderId(), "2");
                         order.setMoney(Integer.valueOf(bookBuyConfigEntity.getRealMoney()));
                         order.setUsername(userEntity.getName());
                         orderService.saveOrUpdate(order);
-                        orderService.update();
                         return Result.ok0();
                     }else {
                         return Result.nook(500,"订单id错误或者商品id");
diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
index 7237933a..8b9daf4b 100644
--- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
+++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
@@ -231,7 +231,7 @@ public class AliPayServiceImpl  implements AliPayService {
                         //插入虚拟币消费记录
                         transactionDetailsService.rechargeRecord(userEntity,realMoney,oldPayZfbOrderEntity.getId().intValue(),"支付宝",order.getOrderSn());
                         //插入花生币充值记录
-                        payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,oldPayZfbOrderEntity.getId().intValue());
+                        payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,oldPayZfbOrderEntity.getId().toString());
                         buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2");
                     }
                     if ("order".equals(subject)) {
diff --git a/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java b/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java
index f0ed9734..9034afb2 100644
--- a/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java
+++ b/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java
@@ -171,7 +171,7 @@ public class ApplePayServiceImpl implements ApplePayService {
                     //插入虚拟币消费记录
                     transactionDetailsService.rechargeRecord(userEntity,realMoney,wechat.getId().intValue(),"苹果支付",order.getOrderSn());
                     //插入花生币充值记录
-                    payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,wechat.getId().intValue());
+                    payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,wechat.getId().toString());
                     buyOrderService.updateOrderStatus(Integer.valueOf(order.getUserId()),order.getOrderSn(),"2");
                 }
             }
diff --git a/src/main/java/com/peanut/modules/pay/paypal/controller/PaypalController.java b/src/main/java/com/peanut/modules/pay/paypal/controller/PaypalController.java
index 3b778012..d7084b5d 100644
--- a/src/main/java/com/peanut/modules/pay/paypal/controller/PaypalController.java
+++ b/src/main/java/com/peanut/modules/pay/paypal/controller/PaypalController.java
@@ -114,7 +114,7 @@ public class PaypalController {
                     //插入虚拟币消费记录
                     transactionDetailsService.rechargeRecord(userEntity,realMoney,payPaypalOrder.getId(),"PayPal",buyOrder.getOrderSn());
                     //插入花生币充值记录
-                    payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,payPaypalOrder.getId());
+                    payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,payPaypalOrder.getId().toString());
                 }
                 return R.ok();
             }
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
index 0d4338ff..896b2019 100644
--- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
@@ -302,7 +302,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
             //插入虚拟币消费记录
             transactionDetailsService.rechargeRecord(userEntity,realMoney,buy_order_id.getId().intValue(),"微信",order.getOrderSn());
             //插入花生币充值记录
-            payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,buy_order_id.getId().intValue());
+            payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,buy_order_id.getId().toString());
             buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "2");
         }
     }