gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：修复merchantName无法获取问题

Browse Source
This commit is contained in:
yangqingyuan
2024-08-21 10:59:41 +08:00
parent d8ee23e104
commit de36af8c1f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gxwebsoft/shop/mapper/xml/OrderPayMapper.xml
View File

@@ -4,7 +4,10 @@
<!-- 关联查询sql --> <!-- 关联查询sql -->
<sql id="selectSql"> <sql id="selectSql">
SELECT a.*,b.real_name,c.equipment_name,c.battery_model,d.merchant_name SELECT a.*,
b.real_name,c.equipment_name,c.battery_model,
c.equipment_code,
d.merchant_name as merchantName,d.merchant_code
FROM shop_order_pay a FROM shop_order_pay a
LEFT JOIN sys_user b ON a.user_id = b.user_id LEFT JOIN sys_user b ON a.user_id = b.user_id
LEFT JOIN apps_equipment c ON a.equipment_id = c.equipment_id LEFT JOIN apps_equipment c ON a.equipment_id = c.equipment_id
@@ -25,7 +28,7 @@
<if test="param.merchantCode != null"> <if test="param.merchantCode != null">
AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
</if> </if>
<if test="param.createTimeStart != null"> <if test="param.createTimeStart != null">
AND a.create_time &gt;= #{param.createTimeStart} AND a.create_time &gt;= #{param.createTimeStart}
</if> </if>
<if test="param.createTimeEnd != null"> <if test="param.createTimeEnd != null">