From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/mall/PaymentCallback.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/PaymentCallback.java b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/PaymentCallback.java
index 744e51f..3d69e28 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/PaymentCallback.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/PaymentCallback.java
@@ -113,7 +113,9 @@
goodsOrder.setPayStatus(Constants.ONE);
goodsOrder.setPayDate(new Date());
goodsOrder.setPayOrderId(paymentNo);
- goodsOrder.setStatus(Constants.equalsInteger(goodsOrder.getReceiveType(),Constants.ZERO)?Constants.OrderStatus.PAY_DONE.getKey():Constants.OrderStatus.WAIT_RECEIVE.getKey());
+ goodsOrder.setStatus(Constants.OrderStatus.PAY_DONE.getKey());
+ //鐢熸垚鏍搁攢鐮�
+ goodsOrder.setExchangeCode(Constants.equalsInteger(goodsOrder.getReceiveType(),Constants.ZERO)?null:Constants.getRandomNumber());
goodsOrder.setPayMethod(Constants.ZERO);
goodsorderService.updateById(goodsOrder);
Fund fund = new Fund();
--
Gitblit v1.9.3