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

Merge branch 'dev-new' into dev-new-rabbitmq

Browse Source 
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
This commit is contained in:
Guoqs
2024-12-28 15:15:15 +08:00
parent d0be55940b c9bfa8ace8
commit 665efe290b
54 changed files with 4373 additions and 2540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
jsowell-pile/src/main/resources/mapper/pile/AreaCodeInfoMapper.xml Normal file
View File

@@ -0,0 +1,106 @@
<?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.AreaCodeInfoMapper">
<resultMap type="com.jsowell.pile.domain.AreaCodeInfo" id="AreaCodeInfoResult">
<result property="id" column="id" />
<result property="level" column="level" />
<result property="parentCode" column="parent_code" />
<result property="areaCode" column="area_code" />
<result property="zipCode" column="zip_code" />
<result property="cityCode" column="city_code" />
<result property="name" column="name" />
<result property="shortName" column="short_name" />
<result property="mergerName" column="merger_name" />
<result property="pinyin" column="pinyin" />
<result property="lng" column="lng" />
<result property="lat" column="lat" />
</resultMap>
<sql id="selectAreaCodeInfoVo">
select id, level, parent_code, area_code, zip_code, city_code, name, short_name, merger_name, pinyin, lng, lat from area_code_info
</sql>
<select id="selectAreaCodeInfoList" parameterType="com.jsowell.pile.domain.AreaCodeInfo" resultMap="AreaCodeInfoResult">
<include refid="selectAreaCodeInfoVo"/>
<where>
<if test="level != null "> and level = #{level}</if>
<if test="parentCode != null "> and parent_code = #{parentCode}</if>
<if test="areaCode != null "> and area_code = #{areaCode}</if>
<if test="zipCode != null "> and zip_code = #{zipCode}</if>
<if test="cityCode != null and cityCode != ''"> and city_code = #{cityCode}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="shortName != null and shortName != ''"> and short_name like concat('%', #{shortName}, '%')</if>
<if test="mergerName != null and mergerName != ''"> and merger_name like concat('%', #{mergerName}, '%')</if>
<if test="pinyin != null and pinyin != ''"> and pinyin = #{pinyin}</if>
<if test="lng != null "> and lng = #{lng}</if>
<if test="lat != null "> and lat = #{lat}</if>
</where>
</select>
<select id="selectAreaCodeInfoById" parameterType="Integer" resultMap="AreaCodeInfoResult">
<include refid="selectAreaCodeInfoVo"/>
where id = #{id}
</select>
<insert id="insertAreaCodeInfo" parameterType="com.jsowell.pile.domain.AreaCodeInfo" useGeneratedKeys="true" keyProperty="id">
insert into area_code_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="level != null">level,</if>
<if test="parentCode != null">parent_code,</if>
<if test="areaCode != null">area_code,</if>
<if test="zipCode != null">zip_code,</if>
<if test="cityCode != null and cityCode != ''">city_code,</if>
<if test="name != null and name != ''">name,</if>
<if test="shortName != null and shortName != ''">short_name,</if>
<if test="mergerName != null and mergerName != ''">merger_name,</if>
<if test="pinyin != null and pinyin != ''">pinyin,</if>
<if test="lng != null">lng,</if>
<if test="lat != null">lat,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="level != null">#{level},</if>
<if test="parentCode != null">#{parentCode},</if>
<if test="areaCode != null">#{areaCode},</if>
<if test="zipCode != null">#{zipCode},</if>
<if test="cityCode != null and cityCode != ''">#{cityCode},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="shortName != null and shortName != ''">#{shortName},</if>
<if test="mergerName != null and mergerName != ''">#{mergerName},</if>
<if test="pinyin != null and pinyin != ''">#{pinyin},</if>
<if test="lng != null">#{lng},</if>
<if test="lat != null">#{lat},</if>
</trim>
</insert>
<update id="updateAreaCodeInfo" parameterType="com.jsowell.pile.domain.AreaCodeInfo">
update area_code_info
<trim prefix="SET" suffixOverrides=",">
<if test="level != null">level = #{level},</if>
<if test="parentCode != null">parent_code = #{parentCode},</if>
<if test="areaCode != null">area_code = #{areaCode},</if>
<if test="zipCode != null">zip_code = #{zipCode},</if>
<if test="cityCode != null and cityCode != ''">city_code = #{cityCode},</if>
<if test="name != null and name != ''">name = #{name},</if>
<if test="shortName != null and shortName != ''">short_name = #{shortName},</if>
<if test="mergerName != null and mergerName != ''">merger_name = #{mergerName},</if>
<if test="pinyin != null and pinyin != ''">pinyin = #{pinyin},</if>
<if test="lng != null">lng = #{lng},</if>
<if test="lat != null">lat = #{lat},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteAreaCodeInfoById" parameterType="Integer">
delete from area_code_info where id = #{id}
</delete>
<delete id="deleteAreaCodeInfoByIds" parameterType="String">
delete from area_code_info where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

4307
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

File diff suppressed because it is too large Load Diff

3
jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml
View File

@@ -446,6 +446,7 @@
t2.out_trans_id as outTransId
from order_pay_record t1
left join adapay_callback_record t2 on t2.payment_id = t1.payment_id
where t1.order_code = #{orderCode,jdbcType=VARCHAR}
where t1.del_flag = '0'
and t1.order_code = #{orderCode,jdbcType=VARCHAR}
</select>
</mapper>

1
jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
View File

@@ -1015,6 +1015,7 @@
<if test="dto.occupyCode != null and dto.occupyCode != ''"> and t1.occupy_code = #{dto.occupyCode}</if>
<if test="dto.memberId != null and dto.memberId != ''"> and t1.member_id = #{dto.memberId}</if>
<if test="dto.stationId != null and dto.stationId != ''"> and t1.station_id = #{dto.stationId}</if>
<if test="dto.stationName != null and dto.stationName != ''"> and t2.station_name = #{dto.stationName}</if>
<if test="dto.plateNumber != null and dto.plateNumber != ''"> and t1.plate_number = #{dto.plateNumber}</if>
<if test="dto.status != null and dto.status != ''"> and t1.status = #{dto.status}</if>
<if test="dto.payStatus != null and dto.payStatus != ''"> and t1.pay_status = #{dto.payStatus}</if>

18
jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml
View File

@@ -456,4 +456,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t1.del_flag = '0'
and t1.sn = #{pileSn,jdbcType=VARCHAR}
</select>
<select id="getPileDetailInfoList" resultType="com.jsowell.pile.thirdparty.PileDetailInfoVO">
SELECT
t1.sn AS pileSn,
t1.model_id AS modelId,
t2.model_name AS modelName,
t2.rated_power AS ratedPower,
t2.rated_voltage as ratedVoltage,
t2.rated_current as ratedCurrent,
t2.connector_num as connectorNum,
t2.speed_type AS speedType,
t1.create_time AS createTime
FROM
pile_basic_info t1
JOIN pile_model_info t2 ON t1.model_id = t2.id
WHERE
t1.station_id = #{stationId,jdbcType=VARCHAR}
</select>
</mapper>