From 095210f9149c73e6e00d997b39fd6c44a65e4d38 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:04:17 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 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 cb33c0e..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
@@ -191,13 +191,8 @@
         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());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
-            }
-        }
+
+        queryWrapper.orderByDesc(WithdrawalOrders::getId);
         return PageData.from(withdrawalOrdersMapper.selectJoinPage(page, WithdrawalOrders.class, queryWrapper));
     }
 
@@ -285,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) {
@@ -305,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) {
@@ -390,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) {
@@ -490,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);
@@ -535,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