czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
gong
2025-12-20 15:02:20 +08:00
parent 7b662ac18a f70c197098
commit a7306af4ee
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
View File

@@ -21,12 +21,7 @@
AND detail.group_order_no = #{param.groupOrderNo} AND detail.group_order_no = #{param.groupOrderNo}
</if> </if>
<if test="param.status != null"> <if test="param.status != null">
<if test="param.status == '退款'"> AND detail.STATUS = #{param.status}
AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
</if>
<if test="param.status != '退款'">
AND detail.STATUS = #{param.status}
</if>
</if> </if>
<if test="param.userId != null"> <if test="param.userId != null">
AND detail.user_id = #{param.userId} AND detail.user_id = #{param.userId}
@@ -60,12 +55,7 @@
AND detail.group_order_no = #{param.groupOrderNo} AND detail.group_order_no = #{param.groupOrderNo}
</if> </if>
<if test="param.status != null"> <if test="param.status != null">
<if test="param.status == '退款'"> AND detail.STATUS = #{param.status}
AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
</if>
<if test="param.status != '退款'">
AND detail.STATUS = #{param.status}
</if>
</if> </if>
<if test="param.userId != null"> <if test="param.userId != null">
AND detail.user_id = #{param.userId} AND detail.user_id = #{param.userId}
@@ -78,9 +68,7 @@
</if> </if>
order by order by
<if test="param.status != null"> <if test="param.status != null">
<if test="param.status == '退款'"> detail.`status` desc,detail.pay_time desc,
detail.`status` desc,detail.pay_time desc,
</if>
</if> </if>
detail.create_time desc detail.create_time desc
</select> </select>