From c51de64d5ee334d914c90f5e4f82a13f159492ca Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 四月 2026 20:08:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 0d0b4c4..227dc93 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,6 +182,15 @@
if (pageWrap.getModel().getCreateEndTime() != null) {
queryWrapper.le(WithdrawalOrders::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateEndTime()));
}
+ // 闂ㄥ簵绔細鎸夐棬搴楀悕绉版垨鑱旂郴浜烘ā绯婃悳绱�
+ 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());
+ }
for (PageWrap.SortData sortData : pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -258,7 +267,7 @@
String doneInfo = null;
if (Constants.ONE.equals(dto.getStatus())) {
String aliAccount = order.getAliAccount();
- String aliName = null;
+ String aliName = order.getAliName();
// 浠庡徃鏈烘垨闂ㄥ簵鑾峰彇鏀粯瀹濊处鎴峰拰瀹炲悕濮撳悕
if (StringUtils.isBlank(aliAccount)) {
@@ -478,6 +487,7 @@
order.setType(Constants.ZERO);
order.setOutBillNo(billNo);
order.setAliAccount(dto.getAliAccount());
+ order.setAliName(driver.getAliName());
order.setDeleted(Constants.ZERO);
order.setCreateTime(now);
order.setUpdateTime(now);
@@ -529,6 +539,7 @@
order.setType(Constants.ZERO);
order.setOutBillNo(billNo);
order.setAliAccount(dto.getAliAccount());
+ order.setAliName(shop.getAliName());
order.setDeleted(Constants.ZERO);
order.setCreateTime(now);
order.setUpdateTime(now);
--
Gitblit v1.9.3