From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
index 3fec8ed..c6e4822 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
@@ -182,13 +182,17 @@
if (pageWrap.getModel().getCreateEndTime() != null) {
queryWrapper.le(WithdrawalOrders::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateEndTime()));
}
- for (PageWrap.SortData sortData : pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
+ // 闂ㄥ簵绔細鎸夐棬搴楀悕绉版垨鑱旂郴浜烘ā绯婃悳绱�
+ if (StringUtils.isNotBlank(pageWrap.getModel().getShopName())) {
+ queryWrapper.and(i -> i.like(ShopInfo::getName, pageWrap.getModel().getShopName())
+ .or().like(ShopInfo::getLinkName, pageWrap.getModel().getShopName()));
}
+ // 鍙告満绔細鎸夊徃鏈哄鍚嶆ā绯婃悳绱�
+ if (StringUtils.isNotBlank(pageWrap.getModel().getMemberName())) {
+ queryWrapper.like(DriverInfo::getName, pageWrap.getModel().getMemberName());
+ }
+
+ queryWrapper.orderByDesc(WithdrawalOrders::getId);
return PageData.from(withdrawalOrdersMapper.selectJoinPage(page, WithdrawalOrders.class, queryWrapper));
}
@@ -208,7 +212,10 @@
queryWrapper.select("IFNULL(SUM(amount), 0) as amount");
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.lambda().eq(WithdrawalOrders::getDeleted, Constants.ZERO);
- queryWrapper.lambda().in(WithdrawalOrders::getStatus, Arrays.asList(Constants.ZERO, Constants.ONE));
+ queryWrapper.lambda().eq(WithdrawalOrders::getStatus, Constants.ONE);
+ if (pageWrap.getModel().getMemberType() != null) {
+ queryWrapper.lambda().eq(WithdrawalOrders::getMemberType, pageWrap.getModel().getMemberType());
+ }
if (pageWrap.getModel().getOutBillNo() != null) {
queryWrapper.lambda().like(WithdrawalOrders::getOutBillNo, pageWrap.getModel().getOutBillNo());
}
@@ -273,7 +280,7 @@
}
} else if (Constants.equalsInteger(order.getMemberType(), Constants.TWO)) {
ShopInfo shop = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
- .eq(ShopInfo::getRegionMemberId, order.getMemberId())
+ .eq(ShopInfo::getId, order.getMemberId())
.eq(ShopInfo::getDeleted, Constants.ZERO)
.last("limit 1"));
if (shop != null) {
@@ -293,7 +300,7 @@
}
} else if (Constants.equalsInteger(order.getMemberType(), Constants.TWO)) {
ShopInfo shop = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
- .eq(ShopInfo::getRegionMemberId, order.getMemberId())
+ .eq(ShopInfo::getId, order.getMemberId())
.eq(ShopInfo::getDeleted, Constants.ZERO)
.last("limit 1"));
if (shop != null) {
@@ -378,7 +385,7 @@
} else if (Constants.equalsInteger(order.getMemberType(), Constants.TWO)) {
// 闂ㄥ簵锛氶�氳繃 memberId 鏌� ShopInfo锛岄��鍥� balance
ShopInfo shop = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
- .eq(ShopInfo::getRegionMemberId, order.getMemberId())
+ .eq(ShopInfo::getId, order.getMemberId())
.eq(ShopInfo::getDeleted, Constants.ZERO)
.last("limit 1"));
if (shop != null) {
@@ -478,12 +485,22 @@
order.setType(Constants.ZERO);
order.setOutBillNo(billNo);
order.setAliAccount(dto.getAliAccount());
- order.setAliName(driver.getAliName());
+ order.setAliName(dto.getAliName());
order.setDeleted(Constants.ZERO);
order.setCreateTime(now);
order.setUpdateTime(now);
order.setCreateUser(memberId);
withdrawalOrdersMapper.insert(order);
+ // 鏀粯瀹濊处鎴锋垨濮撳悕鏈夊彉鍖栨椂鏇存柊鍙告満淇℃伅
+ boolean aliChanged = !dto.getAliAccount().equals(driver.getAliAccount())
+ || (dto.getAliName() != null && !dto.getAliName().equals(driver.getAliName()));
+ if (aliChanged) {
+ DriverInfo update = new DriverInfo();
+ update.setId(driver.getId());
+ update.setAliAccount(dto.getAliAccount());
+ update.setAliName(dto.getAliName());
+ driverInfoMapper.updateById(update);
+ }
// 鍒涘缓鏀嚭 Revenue 璁板綍
Revenue revenue = new Revenue();
revenue.setMemberId(memberId);
@@ -523,22 +540,32 @@
.eq(ShopInfo::getId, shopId));
// 鍒涘缓鎻愮幇璁板綍
WithdrawalOrders order = new WithdrawalOrders();
- order.setMemberId(shop.getRegionMemberId());
+ order.setMemberId(shop.getId());
order.setMemberType(Constants.TWO);
order.setAmount(amountFen);
order.setStatus(Constants.ZERO);
order.setType(Constants.ZERO);
order.setOutBillNo(billNo);
order.setAliAccount(dto.getAliAccount());
- order.setAliName(shop.getAliName());
+ order.setAliName(dto.getAliName());
order.setDeleted(Constants.ZERO);
order.setCreateTime(now);
order.setUpdateTime(now);
order.setCreateUser(shop.getRegionMemberId());
withdrawalOrdersMapper.insert(order);
+ // 鏀粯瀹濊处鎴锋垨濮撳悕鏈夊彉鍖栨椂鏇存柊闂ㄥ簵淇℃伅
+ boolean aliChanged = !dto.getAliAccount().equals(shop.getAliAccount())
+ || (dto.getAliName() != null && !dto.getAliName().equals(shop.getAliName()));
+ if (aliChanged) {
+ ShopInfo update = new ShopInfo();
+ update.setId(shopId);
+ update.setAliAccount(dto.getAliAccount());
+ update.setAliName(dto.getAliName());
+ shopInfoMapper.updateById(update);
+ }
// 鍒涘缓鏀嚭 Revenue 璁板綍
Revenue revenue = new Revenue();
- revenue.setMemberId(shop.getRegionMemberId());
+ revenue.setMemberId(shop.getId());
revenue.setMemberType(Constants.TWO);
revenue.setType(Constants.ONE); // 1=鎻愮幇鏀嚭
revenue.setOptType(-Constants.ONE); // -1=鏀嚭
--
Gitblit v1.9.3