新增 站点管理配置下发二维码地址

This commit is contained in:
Lemon
2023-03-31 16:19:26 +08:00
parent 310d08336f
commit c337b9f035
11 changed files with 159 additions and 9 deletions

View File

@@ -38,6 +38,11 @@ public class PileStationInfo extends BaseEntity {
private String deptId;
/**
* 二维码前缀
*/
private String qrcodePrefix;
/**
* 是否独立报桩0-否1-是)
*/

View File

@@ -17,6 +17,8 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Builder
public class QueryStationDTO extends BaseEntity {
private String stationId;
/**
* 站点名称
*/
@@ -61,4 +63,9 @@ public class QueryStationDTO extends BaseEntity {
* 是否对外开放0-否1-是)
*/
private String publicFlag;
/**
* 站点二维码前缀
*/
private String qrcodePrefix;
}

View File

@@ -92,6 +92,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
vo.setId(pileStationInfo.getId().toString());
vo.setAreaCode(pileStationInfo.getAreaCode());
vo.setAddress(pileStationInfo.getAddress());
if (StringUtils.isNotBlank(pileStationInfo.getQrcodePrefix())) {
vo.setQrcodePrefix(pileStationInfo.getQrcodePrefix());
}
vo.setMerchantId(pileStationInfo.getMerchantId().toString());
// vo.setMerchantName(pileStationInfo.getmer());
vo.setMerchantAdminName(pileStationInfo.getStationAdminName());

View File

@@ -44,6 +44,11 @@ public class PileStationVO {
*/
private String address;
/**
* 二维码前缀
*/
private String qrcodePrefix;
/**
* 充电设备数量
*/

View File

@@ -9,6 +9,7 @@
<result property="merchantId" column="merchant_id" />
<result property="stationName" column="station_name" />
<result property="deptId" column="dept_id" />
<result property="qrcodePrefix" column="qrcode_prefix" />
<result property="aloneApply" column="alone_apply" />
<result property="accountNumber" column="account_number" />
<result property="capacity" column="capacity" />
@@ -56,7 +57,7 @@
</resultMap>
<sql id="selectPileStationInfoVo">
select id,merchant_id, station_name, dept_id, alone_apply, account_number, capacity, public_parking, parking_number,
select id,merchant_id, station_name, dept_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number,
country_code, area_code, address, station_tel, service_tel, station_type, station_status, station_admin_name, park_nums,
station_lng, station_lat, site_guide, construction, pictures, match_cars, park_info, park_owner,
park_manager, open_all_day, business_hours, park_free, payment, support_order, remark, public_flag,
@@ -71,6 +72,7 @@
<if test="merchantId != null and merchantId != ''"> and merchant_id = #{merchantId}</if>
<if test="stationName != null and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
<if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
<if test="qrcodePrefix != null and qrcodePrefix != ''"> and qrcode_prefix = #{qrcodePrefix}</if>
<if test="aloneApply != null and aloneApply != ''"> and alone_apply = #{aloneApply}</if>
<if test="accountNumber != null and accountNumber != ''"> and account_number = #{accountNumber}</if>
<if test="capacity != null "> and capacity = #{capacity}</if>
@@ -125,6 +127,7 @@
<if test="merchantId != null">merchant_id,</if>
<if test="stationName != null">station_name,</if>
<if test="deptId != null">dept_id,</if>
<if test="qrcodePrefix != null">qrcode_prefix,</if>
<if test="aloneApply != null">alone_apply,</if>
<if test="accountNumber != null">account_number,</if>
<if test="capacity != null">capacity,</if>
@@ -175,6 +178,7 @@
<if test="merchantId != null">#{merchantId},</if>
<if test="stationName != null">#{stationName},</if>
<if test="deptId != null">#{deptId},</if>
<if test="qrcodePrefix != null">#{qrcodePrefix},</if>
<if test="aloneApply != null">#{aloneApply},</if>
<if test="accountNumber != null">#{accountNumber},</if>
<if test="capacity != null">#{capacity},</if>
@@ -228,6 +232,7 @@
<if test="merchantId != null">merchant_id = #{merchantId},</if>
<if test="stationName != null">station_name = #{stationName},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="qrcodePrefix != null">qrcode_prefix = #{qrcodePrefix},</if>
<if test="aloneApply != null">alone_apply = #{aloneApply},</if>
<if test="accountNumber != null">account_number = #{accountNumber},</if>
<if test="capacity != null">capacity = #{capacity},</if>
@@ -290,6 +295,7 @@
count(t2.id) as pileNum,
t1.area_code as areaCode,
t1.address as address,
t1.qrcode_prefix as qrcodePrefix,
t1.station_type as stationType,
t1.station_status as stationStatus,
t1.create_time as createTime,