From 11e35e0257e48667292b4f563ddf6ce02a3a22bb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 13:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/mall/PaymentCallback.java | 10 +++++++++-
1 files changed, 9 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..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
@@ -113,9 +113,17 @@
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());
+ //鐢熸垚鏍搁攢鐮�
+ if(Constants.equalsInteger(goodsOrder.getReceiveType(),Constants.ONE)){
+ goodsOrder.setExchangeCode(goodsorderService.createExchangeCode());
+ }
goodsOrder.setPayMethod(Constants.ZERO);
goodsorderService.updateById(goodsOrder);
+ if(Objects.nonNull(goodsOrder.getPickUpShopId())){
+ //鍙戦�佺珯鍐呬俊 - 缁忛攢鍟�
+ noticeService.orderPayNotice(goodsOrder.getPickUpShopId(),goodsOrder.getId(),goodsOrder.getReceiveType());
+ }
Fund fund = new Fund();
fund.setOrderCode(goodsOrder.getPayOrderId());
fund.setCreator(goodsOrder.getMemberId());
--
Gitblit v1.9.3