zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/支付优化测试' into 支付优化测试

Browse Source
This commit is contained in:
qjq
2024-11-18 09:29:30 +08:00
parent 00a44f7ead b7d15dcb0b
commit 244fbade81
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml
View File

@ -51,7 +51,7 @@
left join member_store_order mo on md.order_id = mo.order_id
left join member_user mu on mu.id = mo.user_id
where DATE_FORMAT(md.create_time, '%Y%m%d') between #{startTime} and #{endTime} and mo.carteen_id = #{carteenId}
and md.deleted = false
and md.deleted = false and mo.status != 3
order by mo.user_id,mo.order_id
</select>
@ -66,7 +66,8 @@
where DATE_FORMAT(md.create_time, '%Y%m%d') between #{startTime} and #{endTime} and mo.carteen_id = #{carteenId}
and md.deleted = false
and mo.deleted = false
group by md.goods_name, md.custom_price;
and mo.status != 3
group by md.goods_name, md.custom_price
</select>
</mapper>