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

Merge branch 'dev_local' into dev

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
#	jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
This commit is contained in:
autumn.g@foxmail.com
2023-11-21 11:31:42 +08:00
parent f3f67ddace de57827206
commit 342b6e4c26
39 changed files with 578 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
View File

@@ -228,6 +228,12 @@
<if test="dto.vinCode != null">
and t4.vin_code like '%${dto.vinCode}%'
</if>
<if test="dto.firstMerchantIds != null and dto.firstMerchantIds.size() != 0">
and t1.merchant_id in
<foreach collection="dto.firstMerchantIds" item="firstMerchantId" open="(" separator="," close=")">
#{firstMerchantId,jdbcType=VARCHAR}
</foreach>
</if>
GROUP BY (t1.member_id)
</select>

5
jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml
View File

@@ -180,7 +180,8 @@
select
<include refid="Base_Column_List" />
from member_wallet_info
where member_id = #{memberId,jdbcType=INTEGER}
and del_flag = '0'
where del_flag = '0'
and member_id = #{memberId,jdbcType=INTEGER}
and merchant_id = #{merchantId,jdbcType=VARCHAR}
</select>
</mapper>

14
jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
View File

@@ -50,13 +50,14 @@
<sql id="selectPileMerchantInfoVo">
select
<include refid="Base_Column_List"/>
from pile_merchant_info t
from pile_merchant_info
</sql>
<select id="selectPileMerchantInfoList" parameterType="com.jsowell.pile.domain.PileMerchantInfo"
resultMap="PileMerchantInfoResult">
<include refid="selectPileMerchantInfoVo"/>
<where>
del_flag = '0'
<if test="merchantName != null and merchantName != ''">
and merchant_name like concat('%', #{merchantName}, '%')
</if>
@@ -322,8 +323,8 @@
select
<include refid="Base_Column_List"/>
from pile_merchant_info
where
dept_id = #{deptId,jdbcType=VARCHAR}
where del_flag = '0'
and dept_id = #{deptId,jdbcType=VARCHAR}
</select>
<select id="queryInfoListByIds" resultMap="PileMerchantInfoResult">
@@ -408,4 +409,11 @@
and t1.manager_phone = #{dto.managerPhone,jdbcType=VARCHAR}
</if>
</select>
<select id="selectListByFirstMerchant" resultMap="PileMerchantInfoResult">
select <include refid="Base_Column_List"/>
from pile_merchant_info
where del_flag = '0'
and (parent_id = #{firstMerchantId,jdbcType=VARCHAR} or id = #{firstMerchantId,jdbcType=VARCHAR})
</select>
</mapper>

25
jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
View File

@@ -58,15 +58,18 @@
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="Base_Column_List">
id,merchant_id, station_name, dept_id, parking_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number,
park_fee_describe, 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,
open_flag, toilet_flag, store_flag, restaurant_flag, lounge_flag, canopy_flag, printer_flag, barrier_flag,
parking_lock_flag, create_by, create_time, update_by, update_time, del_flag
</sql>
<sql id="selectPileStationInfoVo">
select id,merchant_id, station_name, dept_id, parking_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number,
park_fee_describe, 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,
open_flag, toilet_flag, store_flag, restaurant_flag, lounge_flag, canopy_flag, printer_flag, barrier_flag,
parking_lock_flag, create_by, create_time, update_by, update_time, del_flag
from pile_station_info
select <include refid="Base_Column_List"/> from pile_station_info
</sql>
<select id="selectPileStationInfoList" parameterType="com.jsowell.pile.domain.PileStationInfo" resultMap="PileStationInfoResult">
@@ -548,4 +551,12 @@
FROM
pile_station_info
</select>
<select id="queryInfoByDeptId" resultMap="PileStationInfoResult">
select
<include refid="Base_Column_List"/>
from pile_station_info
where del_flag = '0'
and dept_id = #{deptId,jdbcType=VARCHAR}
</select>
</mapper>