From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 08 八月 2023 17:25:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml index 6df7fb4..8a19f50 100644 --- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml +++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml @@ -42,4 +42,17 @@ and `code` = #{code} </if> </select> + + <select id="billingDataRequestVo" resultType="com.dsh.course.model.BillingRequest"> + SELECT DATE_FORMAT(payTime, '%m-%d %H:%i')as `time`, + amount + from t_course_package_payment + where payStatus = 2 and state = 1 and payType = 3 + <if test="null != monthStart and '' != monthStart and null != monthEnd and '' != monthEnd"> + and DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') between #{monthStart} and #{monthEnd} + </if> + <if test="null != appUserId and '' != appUserId "> + and appUserId = #{appUserId} + </if> + </select> </mapper> -- Gitblit v1.7.1