From 1c930a8b1ab9abdb851a486b2da55bcda34cd082 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 21 四月 2026 09:20:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 4e9ea0d..5098a38 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -1981,9 +1981,10 @@
@Override
@Transactional(rollbackFor = {Exception.class, BusinessException.class})
- public PayResponse payShopDeposit(Integer shopId) {
+ public PayResponse payShopDeposit(Integer memberId) {
// 1. 鏌ヨ闂ㄥ簵淇℃伅
- ShopInfo shopInfo = shopInfoMapper.selectById(shopId);
+ ShopInfo shopInfo = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
+ .eq(ShopInfo::getRegionMemberId,memberId));
if (shopInfo == null) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "闂ㄥ簵涓嶅瓨鍦�");
}
@@ -2007,7 +2008,7 @@
otherOrders.setMemberId(shopInfo.getRegionMemberId());
otherOrders.setPayAccount(shopInfo.getDepositAmount());
otherOrders.setPayStatus(Constants.ZERO);
- otherOrders.setCode("SD" + new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(now) + shopId);
+ otherOrders.setCode("SD" + new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(now) + shopInfo.getId());
otherOrders.setOutTradeNo(outTradeNo);
otherOrders.setDeleted(Constants.ZERO);
otherOrders.setCreateTime(now);
--
Gitblit v1.9.3