diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 79fb416f..5cb27ab4 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -35,7 +35,7 @@ Hiver
  • -ʮÔÂ 26, 2026 15:39:53 +ʮÔÂ 28, 2026 10:04:17
  • @@ -84,7 +84,7 @@

    passTest

    -

    15:39:54 ÏÂÎç / 0.022 secs

    +

    10:04:18 ÉÏÎç / 0.023 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -10.26.2026 15:39:54 -10.26.2026 15:39:54 -0.022 secs +10.28.2026 10:04:18 +10.28.2026 10:04:18 +0.023 secs
    @@ -104,7 +104,7 @@ Pass - 15:39:54 + 10:04:18 Test passed @@ -128,13 +128,13 @@

    Started

    -

    ʮÔÂ 26, 2026 15:39:53

    +

    ʮÔÂ 28, 2026 10:04:17

    Ended

    -

    ʮÔÂ 26, 2026 15:39:54

    +

    ʮÔÂ 28, 2026 10:04:18

    diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java index f0258e4e..03b5c8dd 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java @@ -312,6 +312,7 @@ public class ShopAreaController { shopArea.setGeoPolygon(null); shopArea.setAreaKind(1); shopArea.setExpressErrandEnabled(1); + shopArea.setErrandPlanetVisible(1); return null; } Integer areaKind = shopArea.getAreaKind(); @@ -330,6 +331,12 @@ public class ShopAreaController { return ResultUtil.error("快递/跑腿开关仅支持:1开启,0关闭"); } } + Integer errandPlanetVisible = shopArea.getErrandPlanetVisible(); + if (errandPlanetVisible == null) { + shopArea.setErrandPlanetVisible(1); + } else if (errandPlanetVisible != 0 && errandPlanetVisible != 1) { + return ResultUtil.error("跑腿星球显示开关仅支持:1显示,0隐藏"); + } Integer commissionRatio = shopArea.getCommissionRatio(); if (commissionRatio == null) { shopArea.setCommissionRatio(0); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java index f520c472..16bc3857 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java @@ -87,6 +87,10 @@ public class ShopArea extends HiverBaseEntity { @Column(nullable = false, columnDefinition = "int default 1") private Integer expressErrandEnabled = 1; + @ApiModelProperty(value = "是否显示跑腿星球:1显示,0隐藏") + @Column(nullable = false, columnDefinition = "int default 1") + private Integer errandPlanetVisible = 1; + @Transient @TableField(exist = false) @ApiModelProperty(value = "父节点名称") diff --git a/hiver-modules/hiver-mall/src/main/resources/db/shop_area_errand_planet_visible.sql b/hiver-modules/hiver-mall/src/main/resources/db/shop_area_errand_planet_visible.sql new file mode 100644 index 00000000..50f3e5c4 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/resources/db/shop_area_errand_planet_visible.sql @@ -0,0 +1,2 @@ +ALTER TABLE `t_shop_area` + ADD COLUMN `errand_planet_visible` int(11) NOT NULL DEFAULT 1 COMMENT '是否显示跑腿星球:1显示,0隐藏'; diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml index 6e96f805..32bfe310 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml @@ -24,11 +24,13 @@ + id, create_by, create_time, del_flag, update_by, update_time, is_parent, parent_id, sort_order, status, title, is_canteen, delivery_enabled, parent_agent_id, parent_agent_name, - commission_ratio, center_lng, center_lat, radius_meters, geo_polygon, area_kind, express_errand_enabled + commission_ratio, center_lng, center_lat, radius_meters, geo_polygon, area_kind, express_errand_enabled, + errand_planet_visible