Browse Source

对接拼团数据1

master
wangfukang 2 weeks ago
parent
commit
080142a1a0
  1. 16
      hiver-admin/test-output/test-report.html
  2. 7
      hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java
  3. 4
      hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java
  4. 2
      hiver-modules/hiver-mall/src/main/resources/db/shop_area_errand_planet_visible.sql
  5. 22
      hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml

16
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">十月 26, 2026 15:39:53</span></a>
<a href="#"><span class="badge badge-primary">十月 28, 2026 10:04:17</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>15:39:54 下午</span> / <span>0.022 secs</span></p>
<p class="text-sm"><span>10:04:18 上午</span> / <span>0.023 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.26.2026 15:39:54</span>
<span class='badge badge-danger'>10.26.2026 15:39:54</span>
<span class='badge badge-default'>0.022 secs</span>
<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>
</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>15:39:54</td>
<td>10:04:18</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>十月 26, 2026 15:39:53</h3>
<h3>十月 28, 2026 10:04:17</h3>
</div></div>
</div>
<div class="col-md-3">
<div class="card"><div class="card-body">
<p class="m-b-0">Ended</p>
<h3>十月 26, 2026 15:39:54</h3>
<h3>十月 28, 2026 10:04:18</h3>
</div></div>
</div>
<div class="col-md-3">

7
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);

4
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 = "父节点名称")

2
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隐藏';

22
hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml

@ -24,11 +24,13 @@
<result column="geo_polygon" property="geoPolygon" jdbcType="LONGVARCHAR" />
<result column="area_kind" property="areaKind" jdbcType="INTEGER" />
<result column="express_errand_enabled" property="expressErrandEnabled" jdbcType="INTEGER" />
<result column="errand_planet_visible" property="errandPlanetVisible" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List" >
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
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
@ -45,14 +47,16 @@
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)
values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
#{isParent,jdbcType=BIT}, #{parentId,jdbcType=VARCHAR}, #{sortOrder,jdbcType=DECIMAL},
#{status,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{isCanteen,jdbcType=INTEGER}, #{deliveryEnabled,jdbcType=INTEGER},
#{parentAgentId,jdbcType=VARCHAR}, #{parentAgentName,jdbcType=VARCHAR}, #{commissionRatio,jdbcType=INTEGER},
#{centerLng,jdbcType=DECIMAL}, #{centerLat,jdbcType=DECIMAL}, #{radiusMeters,jdbcType=INTEGER},
#{geoPolygon,jdbcType=LONGVARCHAR}, #{areaKind,jdbcType=INTEGER}, #{expressErrandEnabled,jdbcType=INTEGER})
#{geoPolygon,jdbcType=LONGVARCHAR}, #{areaKind,jdbcType=INTEGER}, #{expressErrandEnabled,jdbcType=INTEGER},
#{errandPlanetVisible,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="cc.hiver.mall.entity.ShopArea" >
insert into t_shop_area
@ -123,6 +127,9 @@
<if test="expressErrandEnabled != null" >
express_errand_enabled,
</if>
<if test="errandPlanetVisible != null" >
errand_planet_visible,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
@ -191,6 +198,9 @@
<if test="expressErrandEnabled != null" >
#{expressErrandEnabled,jdbcType=INTEGER},
</if>
<if test="errandPlanetVisible != null" >
#{errandPlanetVisible,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="cc.hiver.mall.entity.ShopArea" >
@ -259,6 +269,9 @@
<if test="expressErrandEnabled != null" >
express_errand_enabled = #{expressErrandEnabled,jdbcType=INTEGER},
</if>
<if test="errandPlanetVisible != null" >
errand_planet_visible = #{errandPlanetVisible,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
@ -284,7 +297,8 @@
radius_meters = #{radiusMeters,jdbcType=INTEGER},
geo_polygon = #{geoPolygon,jdbcType=LONGVARCHAR},
area_kind = #{areaKind,jdbcType=INTEGER},
express_errand_enabled = #{expressErrandEnabled,jdbcType=INTEGER}
express_errand_enabled = #{expressErrandEnabled,jdbcType=INTEGER},
errand_planet_visible = #{errandPlanetVisible,jdbcType=INTEGER}
where id = #{id,jdbcType=VARCHAR}
</update>
</mapper>
Loading…
Cancel
Save