update

mec-biz/src/main/resources/config/mybatis/MultiDataSourceHomeStatsMapper.xml

@@ -105,13 +105,14 @@
             CASE WHEN upo.payment_channel_ LIKE 'wx%' THEN '微信'
                  WHEN upo.payment_channel_ LIKE 'alipay%' THEN '支付宝' END AS paymentChannel,
             DATE_FORMAT(FROM_UNIXTIME(upo.pay_time_ / 1000), '%Y-%m-%d %H:%i:%s') AS payTime,
-            s.id_ AS userId,
-            s.nickname_ AS nickname,
+            upo.user_id_ AS userId,
+            case when upo.payment_client_ = 'STUDENT' then s.nickname_ when upo.payment_client_ = 'TEACHER' then t.nickname_ end AS nickname,
             CASE WHEN upo.status_ = 'PAID' THEN '付款成功'
                  WHEN upo.status_ = 'REFUNDED' THEN '退款成功'
                  ELSE '未知' END AS statusName
         FROM cooleshow_edu_pro.user_payment_order upo
-        LEFT JOIN cooleshow_edu_pro.student s ON upo.user_id_ = s.id_
+        LEFT JOIN cooleshow_edu_pro.student s ON upo.user_id_ = s.id_ and upo.payment_client_ = 'STUDENT'
+		LEFT JOIN teacher t on t.id_ = upo.user_id_ and upo.payment_client_ = 'TEACHER'
         WHERE upo.status_ IN ('PAID', 'REFUNDED')
         AND upo.payment_cash_amount_ > 0
         AND DATE(FROM_UNIXTIME(upo.pay_time_ / 1000)) BETWEEN #{queryDto.startTime} AND #{queryDto.endTime}