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
> 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 pageResult = new PageImpl<>(cache.getContent(), PageUtil.initPage(pageVo), cache.getTotalElements());
return new ResultUtil>().setData(pageResult);
}
@@ -484,6 +489,7 @@ public class ShopController {
}
}
fillGroupDeliveryTime(pageList, regionId);
+ fillBaseDeliveryFee(pageList, regionId);
Page 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 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 = "妯＄硦鎼滅储鏉′欢")