autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-03 01:20:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增字段

Browse Source
This commit is contained in:
Lemon
2023-08-25 09:36:07 +08:00
parent 4929b5a4a0
commit e7fa7fac8b
8 changed files with 317 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java
View File

@@ -38,6 +38,11 @@ public class PileStationInfo extends BaseEntity {
private String deptId;
/**
* 停车场配置表id
*/
private String parkingId;
/**
* 二维码前缀
*/

61
jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdpartyParkingConfig.java Normal file
View File

@@ -0,0 +1,61 @@
package com.jsowell.pile.domain;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* TODO
*
* @Date 2023/8/24 16:50
* @author Lemon
*/
@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ThirdpartyParkingConfig {
private Integer id;
/**
* 停车场库名称
*/
private String parkingName;
/**
* 停车场库appId
*/
private String appId;
/**
* 停车场库secretKey
*/
private String secretKey;
/**
* 停车场库商户id
*/
private String parkingMerchantId;
/**
* 票券id
*/
private String couponId;
private Date createTime;
private String createBy;
private Date updateTime;
private String updateBy;
/**
* 删除标识(0-正常;1-删除)
*/
private String delFlag;
}

53
jsowell-pile/src/main/java/com/jsowell/pile/mapper/ThirdpartyParkingConfigMapper.java Normal file
View File

@@ -0,0 +1,53 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.ThirdpartyParkingConfig;
/**
* TODO
*
* @Date 2023/8/24 16:50
* @author Lemon
*/
public interface ThirdpartyParkingConfigMapper {
/**
* delete by primary key
* @param id primaryKey
* @return deleteCount
*/
int deleteByPrimaryKey(Integer id);
/**
* insert record to table
* @param record the record
* @return insert count
*/
int insert(ThirdpartyParkingConfig record);
/**
* insert record to table selective
* @param record the record
* @return insert count
*/
int insertSelective(ThirdpartyParkingConfig record);
/**
* select by primary key
* @param id primary key
* @return object by primary key
*/
ThirdpartyParkingConfig selectByPrimaryKey(Integer id);
/**
* update record selective
* @param record the updated record
* @return update count
*/
int updateByPrimaryKeySelective(ThirdpartyParkingConfig record);
/**
* update record
* @param record the updated record
* @return update count
*/
int updateByPrimaryKey(ThirdpartyParkingConfig record);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -830,6 +830,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 从redis中取出实时记录保存到表中
realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderCode);
// TODO 如果该站点的停车场优惠券信息配置不为空，则需绑定一张优惠券
}
/**
@@ -3043,7 +3045,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 查询站点信息
PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.valueOf(stationId));
String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : "";
String plateNumber = dto.getPlateNumber() != null ? dto.getPlateNumber() : "";
// 订单基本信息
OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
.orderCode(orderCode)
@@ -3059,6 +3061,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
.payStatus(Constants.ZERO)
.payAmount(dto.getChargeAmount())
.payMode(dto.getPayMode())
.plateNumber(plateNumber)
.orderAmount(BigDecimal.ZERO)
.virtualAmount(BigDecimal.ZERO)
.settleAmount(BigDecimal.ZERO)

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -466,6 +466,9 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
if (StringUtils.isNotBlank(orderCode)) {
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
List<RealTimeMonitorData> chargingRealTimeDataList = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode());
if (CollectionUtils.isEmpty(chargingRealTimeDataList)) {
continue;
}
RealTimeMonitorData realTimeMonitorData = chargingRealTimeDataList.get(0);
BigDecimal outputVoltage = new BigDecimal(realTimeMonitorData.getOutputVoltage());
pileConnectorInfoVO.setVoltage(outputVoltage);

7
jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
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="parkingId" column="parking_id" />
<result property="qrcodePrefix" column="qrcode_prefix" />
<result property="aloneApply" column="alone_apply" />
<result property="accountNumber" column="account_number" />
@@ -58,7 +59,7 @@
</resultMap>
<sql id="selectPileStationInfoVo">
select id,merchant_id, station_name, dept_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number,
select id,merchant_id, station_name, dept_id, parking_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, amap_flag,
@@ -73,6 +74,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="parkingId != null and parkingId != ''"> and parking_id = #{parkingId}</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>
@@ -129,6 +131,7 @@
<if test="merchantId != null">merchant_id,</if>
<if test="stationName != null">station_name,</if>
<if test="deptId != null">dept_id,</if>
<if test="parkingId != null">parking_id,</if>
<if test="qrcodePrefix != null">qrcode_prefix,</if>
<if test="aloneApply != null">alone_apply,</if>
<if test="accountNumber != null">account_number,</if>
@@ -181,6 +184,7 @@
<if test="merchantId != null">#{merchantId},</if>
<if test="stationName != null">#{stationName},</if>
<if test="deptId != null">#{deptId},</if>
<if test="parkingId != null">#{parkingId},</if>
<if test="qrcodePrefix != null">#{qrcodePrefix},</if>
<if test="aloneApply != null">#{aloneApply},</if>
<if test="accountNumber != null">#{accountNumber},</if>
@@ -236,6 +240,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="parkingId != null">parking_id = #{parkingId},</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>

173
jsowell-pile/src/main/resources/mapper/pile/ThirdpartyParkingConfigMapper.xml Normal file
View File

@@ -0,0 +1,173 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsowell.pile.mapper.ThirdpartyParkingConfigMapper">
<resultMap id="BaseResultMap" type="com.jsowell.pile.domain.ThirdpartyParkingConfig">
<!--@mbg.generated-->
<!--@Table thirdparty_parking_config-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="parking_name" jdbcType="VARCHAR" property="parkingName" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="secret_key" jdbcType="VARCHAR" property="secretKey" />
<result column="parking_merchant_id" jdbcType="VARCHAR" property="parkingMerchantId" />
<result column="coupon_id" jdbcType="VARCHAR" property="couponId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="del_flag" jdbcType="VARCHAR" property="delFlag" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, parking_name, app_id, secret_key, parking_merchant_id, coupon_id, create_time,
create_by, update_time, update_by, del_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
from thirdparty_parking_config
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<!--@mbg.generated-->
delete from thirdparty_parking_config
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.jsowell.pile.domain.ThirdpartyParkingConfig">
<!--@mbg.generated-->
insert into thirdparty_parking_config (id, parking_name, app_id,
secret_key, parking_merchant_id, coupon_id,
create_time, create_by, update_time,
update_by, del_flag)
values (#{id,jdbcType=INTEGER}, #{parkingName,jdbcType=VARCHAR}, #{appId,jdbcType=VARCHAR},
#{secretKey,jdbcType=VARCHAR}, #{parkingMerchantId,jdbcType=VARCHAR}, #{couponId,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
#{updateBy,jdbcType=VARCHAR}, #{delFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsowell.pile.domain.ThirdpartyParkingConfig">
<!--@mbg.generated-->
insert into thirdparty_parking_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="parkingName != null">
parking_name,
</if>
<if test="appId != null">
app_id,
</if>
<if test="secretKey != null">
secret_key,
</if>
<if test="parkingMerchantId != null">
parking_merchant_id,
</if>
<if test="couponId != null">
coupon_id,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="createBy != null">
create_by,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="updateBy != null">
update_by,
</if>
<if test="delFlag != null">
del_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="parkingName != null">
#{parkingName,jdbcType=VARCHAR},
</if>
<if test="appId != null">
#{appId,jdbcType=VARCHAR},
</if>
<if test="secretKey != null">
#{secretKey,jdbcType=VARCHAR},
</if>
<if test="parkingMerchantId != null">
#{parkingMerchantId,jdbcType=VARCHAR},
</if>
<if test="couponId != null">
#{couponId,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="createBy != null">
#{createBy,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updateBy != null">
#{updateBy,jdbcType=VARCHAR},
</if>
<if test="delFlag != null">
#{delFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.jsowell.pile.domain.ThirdpartyParkingConfig">
<!--@mbg.generated-->
update thirdparty_parking_config
<set>
<if test="parkingName != null">
parking_name = #{parkingName,jdbcType=VARCHAR},
</if>
<if test="appId != null">
app_id = #{appId,jdbcType=VARCHAR},
</if>
<if test="secretKey != null">
secret_key = #{secretKey,jdbcType=VARCHAR},
</if>
<if test="parkingMerchantId != null">
parking_merchant_id = #{parkingMerchantId,jdbcType=VARCHAR},
</if>
<if test="couponId != null">
coupon_id = #{couponId,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="createBy != null">
create_by = #{createBy,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updateBy != null">
update_by = #{updateBy,jdbcType=VARCHAR},
</if>
<if test="delFlag != null">
del_flag = #{delFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsowell.pile.domain.ThirdpartyParkingConfig">
<!--@mbg.generated-->
update thirdparty_parking_config
set parking_name = #{parkingName,jdbcType=VARCHAR},
app_id = #{appId,jdbcType=VARCHAR},
secret_key = #{secretKey,jdbcType=VARCHAR},
parking_merchant_id = #{parkingMerchantId,jdbcType=VARCHAR},
coupon_id = #{couponId,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
create_by = #{createBy,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=TIMESTAMP},
update_by = #{updateBy,jdbcType=VARCHAR},
del_flag = #{delFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>