From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +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 8de04d0..0aae790 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
@@ -115,7 +115,9 @@
goodsOrder.setPayOrderId(paymentNo);
goodsOrder.setStatus(Constants.OrderStatus.PAY_DONE.getKey());
//鐢熸垚鏍搁攢鐮�
- goodsOrder.setExchangeCode(Constants.equalsInteger(goodsOrder.getReceiveType(),Constants.ZERO)?null:Constants.getRandomNumber());
+ if(Constants.equalsInteger(goodsOrder.getReceiveType(),Constants.ONE)){
+ goodsOrder.setExchangeCode(goodsorderService.createExchangeCode());
+ }
goodsOrder.setPayMethod(Constants.ZERO);
goodsorderService.updateById(goodsOrder);
if(Objects.nonNull(goodsOrder.getPickUpShopId())){
--
Gitblit v1.9.3