From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/mall/PaymentCallback.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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 2f254cb..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
@@ -100,6 +100,41 @@
fundService.create(fund);
break;
}
+ case "shopGoods": {
+ Goodsorder DBGoodsOrder = new Goodsorder();
+ DBGoodsOrder.setCode(Long.valueOf(outTradeNo));
+ Goodsorder goodsOrder = goodsorderService.findOne(DBGoodsOrder);
+ if(Objects.isNull(goodsOrder)){
+ return WxPayNotifyResponse.fail( "鏀粯鍥炶皟淇℃伅("+ wxId + ") = > 鏈煡璇㈠埌鏀粯瀵硅薄淇℃伅!");
+ }
+ if(goodsOrder.getStatus().equals(Constants.ONE)){
+ return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
+ }
+ goodsOrder.setPayStatus(Constants.ONE);
+ goodsOrder.setPayDate(new Date());
+ goodsOrder.setPayOrderId(paymentNo);
+ 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();
+ fund.setOrderCode(goodsOrder.getPayOrderId());
+ fund.setCreator(goodsOrder.getMemberId());
+ fund.setCreateDate(new Date());
+ fund.setIsdeleted(Constants.ZERO);
+ fund.setRemark(goodsOrder.getCode().toString());
+ fund.setMemberId(goodsOrder.getMemberId());
+ fund.setTitle("璁㈠崟鏀粯");
+ fund.setContent("璁㈠崟鏀粯");
+ fund.setObjId(goodsOrder.getId());
+ fund.setObjType(Constants.ONE);
+ fund.setType(Constants.ZERO);
+ fund.setNum(goodsOrder.getPrice());
+ fundService.create(fund);
+ break;
+ }
+
}
return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
}
--
Gitblit v1.9.3