From 35449a389144c9d92633b2ec0e78465776ccc7c0 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Mon, 10 Aug 2026 18:13:39 +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 ++++++++--------
 .../hiver/mall/controller/ShopController.java   | 17 +++++++++++++++++
 .../main/java/cc/hiver/mall/entity/Shop.java    |  5 +++++
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html
index a1ec99e8..8fd8a4fe 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">八月 05, 2026 16:31:50</span></a>
+<a href="#"><span class="badge badge-primary">八月 10, 2026 18:10:46</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>16:31:51 下午</span> / <span>0.024 secs</span></p>
+            <p class="text-sm"><span>18:10:46 下午</span> / <span>0.017 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'>08.05.2026 16:31:51</span>
-<span class='badge badge-danger'>08.05.2026 16:31:51</span>
-<span class='badge badge-default'>0.024 secs</span>
+<span class='badge badge-success'>08.10.2026 18:10:46</span>
+<span class='badge badge-danger'>08.10.2026 18:10:46</span>
+<span class='badge badge-default'>0.017 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>16:31:51</td>
+        <td>18:10:46</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>八月 05, 2026 16:31:50</h3>
+<h3>八月 10, 2026 18:10:46</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>八月 05, 2026 16:31:51</h3>
+<h3>八月 10, 2026 18:10:46</h3>
 </div></div>
 </div>
 <div class="col-md-3">
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 351432cd..091a92b7 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
@@ -43,6 +43,7 @@ import cc.hiver.mall.service.ShopAreaService;
 import cc.hiver.mall.service.ShopService;
 import cc.hiver.mall.service.ShopTakeawayService;
 import cc.hiver.mall.service.ShopUserService;
+import cc.hiver.mall.service.mybatis.BaseDeliveryFeeSettingService;
 import cc.hiver.mall.utils.UpdateUtils;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.json.JSONObject;
@@ -104,6 +105,9 @@ public class ShopController {
     @Autowired
     private WorkerService workerService;
 
+    @Autowired
+    private BaseDeliveryFeeSettingService baseDeliveryFeeSettingService;
+
     @RequestMapping(value = "/getAll", method = RequestMethod.GET)
     @ApiOperation("鑾峰彇鍏ㄩ儴鏁版嵁")
     public Result<List<Shop>> getAll() {
@@ -319,6 +323,7 @@ public class ShopController {
                 try {
                     ShopListPageCache cache = JSONUtil.toBean(cacheJson, ShopListPageCache.class);
                     if (cache != null && cache.getContent() != null) {
+                        fillBaseDeliveryFee(cache.getContent(), regionId);
                         Page<Shop> pageResult = new PageImpl<>(cache.getContent(), PageUtil.initPage(pageVo), cache.getTotalElements());
                         return new ResultUtil<Page<Shop>>().setData(pageResult);
                     }
@@ -484,6 +489,7 @@ public class ShopController {
                     }
                 }
                 fillGroupDeliveryTime(pageList, regionId);
+                fillBaseDeliveryFee(pageList, regionId);
 
                 Page<Shop> pageResult = new PageImpl<>(pageList, PageUtil.initPage(pageVo), allShops.size());
                 cacheDefaultGroupBuyPage(defaultPageCacheKey, pageList, allShops.size());
@@ -528,6 +534,7 @@ public class ShopController {
                 e.setShopTakeaway(takeawayByShopId.get(e.getId()));
             });
             fillGroupDeliveryTime(page.getContent(), shop.getRegionId());
+            fillBaseDeliveryFee(page.getContent(), shop.getRegionId());
         }
         cacheDefaultGroupBuyPage(defaultPageCacheKey, page.getContent(), page.getTotalElements());
         logSlowShopListQuery("db", queryStartTime, page.getTotalElements(), page.getContent().size(), shop.getRegionId());
@@ -655,6 +662,16 @@ public class ShopController {
         }
     }
 
+    private void fillBaseDeliveryFee(List<Shop> shops, String regionId) {
+        if (shops == null || shops.isEmpty() || CharSequenceUtil.isBlank(regionId)) {
+            return;
+        }
+        BigDecimal baseDeliveryFee = baseDeliveryFeeSettingService.getFeeByRegionId(regionId);
+        for (Shop shop : shops) {
+            shop.setBaseDeliveryFee(baseDeliveryFee);
+        }
+    }
+
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @ApiOperation("鍚敤搴楅摵")
     public Result enable(@RequestParam String id) {
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
index e47ec807..a75dbff5 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
@@ -227,6 +227,11 @@ public class Shop extends HiverBaseEntity {
     @ApiModelProperty(value = "鎷煎洟棰勮閰嶉�佹椂闀�")
     private Integer groupDeliveryTime;
 
+    @Transient
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鍖哄煙鍩虹閰嶉�佽垂")
+    private BigDecimal baseDeliveryFee;
+
     @Transient
     @TableField(exist = false)
     @ApiModelProperty(value = "妯＄硦鎼滅储鏉′欢")