From 8ae03a86af4e4ce05e6fdc3b15d36b8deacf52b0 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Wed, 28 Oct 2026 10:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8B=BC=E5=9B=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hiver-admin/test-output/test-report.html      | 16 ++---
 .../ReturnCommissionController.java           | 20 ++++++
 .../hiver/mall/controller/ShopController.java | 69 +++++++++++++++++++
 3 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html
index 5cb27ab4..bc1699d2 100644
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">十月 28, 2026 10:04:17</span></a>
+<a href="#"><span class="badge badge-primary">十月 28, 2026 10:46:04</span></a>
 </li>
 </ul>
 </div>
@@ -84,7 +84,7 @@
           <div class="test-detail">
             <span class="meta text-white badge badge-sm"></span>
             <p class="name">passTest</p>
-            <p class="text-sm"><span>10:04:18 上午</span> / <span>0.023 secs</span></p>
+            <p class="text-sm"><span>10:46:04 上午</span> / <span>0.022 secs</span></p>
           </div>
           <div class="test-contents d-none">
 <div class="detail-head">
@@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>10.28.2026 10:04:18</span>
-<span class='badge badge-danger'>10.28.2026 10:04:18</span>
-<span class='badge badge-default'>0.023 secs</span>
+<span class='badge badge-success'>10.28.2026 10:46:04</span>
+<span class='badge badge-danger'>10.28.2026 10:46:04</span>
+<span class='badge badge-default'>0.022 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@@ -104,7 +104,7 @@
   <tbody>
       <tr class="event-row">
         <td><span class="badge log pass-bg">Pass</span></td>
-        <td>10:04:18</td>
+        <td>10:46:04</td>
         <td>
           Test passed
         </td>
@@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>十月 28, 2026 10:04:17</h3>
+<h3>十月 28, 2026 10:46:04</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>十月 28, 2026 10:04:18</h3>
+<h3>十月 28, 2026 10:46:05</h3>
 </div></div>
 </div>
 <div class="col-md-3">
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
index 81b36c12..2db60bae 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
@@ -190,6 +190,10 @@ public class ReturnCommissionController {
             if (!isShopWalletWithdrawEnabled(shop)) {
                 return ResultUtil.error("璇ュ簵閾哄凡璁剧疆涓嶆樉绀洪挶鍖呬綑棰濅笖涓嶅彲鎻愮幇锛�");
             }
+            final Result shopAliInfoValidateResult = validateShopAliInfo(returnCommission, shop);
+            if (shopAliInfoValidateResult != null) {
+                return shopAliInfoValidateResult;
+            }
             returnCommission.setRemark("鍟嗗" + shop.getShopName() + "鎻愮幇");
             final BigDecimal shopBalance = shop.getBalance() == null ? BigDecimal.ZERO : shop.getBalance();
             if (shopBalance.compareTo(returnCommission.getCommission()) < 0) {
@@ -522,6 +526,22 @@ public class ReturnCommissionController {
         return shop != null && !Integer.valueOf(0).equals(shop.getShowWalletWithdraw());
     }
 
+    private Result validateShopAliInfo(ReturnCommission returnCommission, Shop shop) {
+        if (!equalsTrim(returnCommission.getAliAccount(), shop.getAliAccount())
+                || !equalsTrim(returnCommission.getAliName(), shop.getAliName())) {
+            return ResultUtil.error("鏀粯瀹濊处鍙锋垨鎴峰悕涓庡簵閾虹粦瀹氫俊鎭笉涓�鑷达紝涓嶅彲鎻愮幇锛�");
+        }
+        return null;
+    }
+
+    private boolean equalsTrim(String left, String right) {
+        return trimToEmpty(left).equals(trimToEmpty(right));
+    }
+
+    private String trimToEmpty(String value) {
+        return value == null ? "" : value.trim();
+    }
+
     private boolean isValidAliAccount(String aliAccount) {
         final String account = aliAccount == null ? "" : aliAccount.trim();
         return PHONE_PATTERN.matcher(account).matches() || EMAIL_PATTERN.matcher(account).matches();
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
index a38b2916..0022fa8b 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
@@ -60,6 +60,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -243,6 +244,57 @@ public class ShopController {
         return ResultUtil.success("缂栬緫鎴愬姛");
     }
 
+    @RequestMapping(value = "/changeOwnerByMobile", method = RequestMethod.POST)
+    @ResponseBody
+    @Transactional
+    @ApiOperation("鏍规嵁鎵嬫満鍙锋崲缁戝簵閾哄晢瀹惰处鍙�")
+    public Result<Object> changeOwnerByMobile(@RequestParam String shopId,
+                                              @RequestParam String mobile) {
+        if (CharSequenceUtil.isBlank(shopId)) {
+            return ResultUtil.error("搴楅摵id涓嶈兘涓虹┖");
+        }
+        mobile = mobile == null ? "" : mobile.trim();
+        if (CharSequenceUtil.isBlank(mobile)) {
+            return ResultUtil.error("鎵嬫満鍙蜂笉鑳戒负绌�");
+        }
+        final Shop shop = shopService.get(shopId);
+        if (shop == null) {
+            return ResultUtil.error("搴楅摵涓嶅瓨鍦�");
+        }
+        final User targetUser = userService.findByMobile(mobile);
+        if (targetUser == null) {
+            return ResultUtil.error("鏈壘鍒拌鎵嬫満鍙峰搴旂殑鐢ㄦ埛锛岃鍟嗗鍏堢櫥褰曞皬绋嬪簭骞舵巿鏉冩墜鏈哄彿");
+        }
+
+        final String oldOwnerId = shop.getShopOwnerId();
+        shop.setShopOwnerId(targetUser.getId());
+        shop.setShopMangerId(targetUser.getId());
+        shop.setContactPhone(mobile);
+        shopService.update(shop);
+
+        if (CharSequenceUtil.isNotBlank(oldOwnerId) && !oldOwnerId.equals(targetUser.getId())) {
+            shopUserService.deleteAllByShopIdAndUserId(shop.getId(), oldOwnerId);
+        }
+        ShopUser shopUser = shopUserService.selectByUserIdAndShopId(targetUser.getId(), shop.getId());
+        if (shopUser == null) {
+            shopUser = new ShopUser();
+            shopUser.setUser(targetUser);
+            shopUser.setShop(shop);
+        }
+        shopUser.setUserName(targetUser.getUsername());
+        shopUser.setShopName(shop.getShopName());
+        shopUser.setType(ShopUserConstant.SHOP_ADMIN_COST[0]);
+        if (shopUser.getId() == null) {
+            shopUserService.save(shopUser);
+        } else {
+            shopUserService.update(shopUser);
+        }
+
+        ensureShopUserType(targetUser);
+        shopService.refreshShopCache(shop.getId(), shop.getRegionId());
+        return ResultUtil.success("鎹㈢粦鎴愬姛");
+    }
+
     @RequestMapping(value = "/bindPrinter", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation("缁戝畾浜戞墦鍗版満")
@@ -1162,6 +1214,23 @@ public class ShopController {
         return ResultUtil.data(shop);
     }
 
+    private void ensureShopUserType(User user) {
+        if (user == null || hasUserType(user.getType(), UserConstant.USER_TYPE_NORMAL)) {
+            return;
+        }
+        user.setType(CharSequenceUtil.isBlank(user.getType())
+                ? UserConstant.USER_TYPE_NORMAL
+                : user.getType() + "," + UserConstant.USER_TYPE_NORMAL);
+        userService.save(user);
+    }
+
+    private boolean hasUserType(String userType, String targetType) {
+        if (CharSequenceUtil.isBlank(userType) || CharSequenceUtil.isBlank(targetType)) {
+            return false;
+        }
+        return Arrays.asList(userType.split(",")).contains(targetType);
+    }
+
     @Data
     public static class CloudPrinterBindForm {
         private String shopId;