|
|
|
@@ -273,6 +273,7 @@ |
|
|
|
<result column="name" jdbcType="VARCHAR" property="bUserName" /> |
|
|
|
<result column="bphone" jdbcType="VARCHAR" property="bUserPhone" /> |
|
|
|
<result column="phone" jdbcType="VARCHAR" property="cUserPhone" /> |
|
|
|
<result column="nick_name" jdbcType="VARCHAR" property="nickName" /> |
|
|
|
<result column="c_user_name" jdbcType="VARCHAR" property="cUserName" /> |
|
|
|
|
|
|
|
</resultMap> |
|
|
|
@@ -280,7 +281,8 @@ |
|
|
|
<sql id="allPayOrderColumns"> |
|
|
|
o.`id`,o.`order_number`,o.`tenant_id`,o.`c_user_id`,o.`product_id`,o.`type`, |
|
|
|
o.`payment_type`,o.`payment`,o.`payment_time`,o.`order_status`,o.`create_date`,o.`update_date`,o.`detail`, |
|
|
|
m.name as merchant_name, bu.name, bu.phone as bphone, cu.phone,cu.c_user_name |
|
|
|
m.name as merchant_name, bu.name, bu.phone as bphone, |
|
|
|
cu.phone, cu.nick_name, cubi.name c_user_name |
|
|
|
</sql> |
|
|
|
|
|
|
|
<select id="findListOfMicroPayOrderByDate" parameterType="map" resultMap="PayVoResultMap"> |
|
|
|
@@ -289,11 +291,8 @@ |
|
|
|
from wx_order o |
|
|
|
inner join wx_merchant_b_user bu on bu.id = o.product_id |
|
|
|
inner join wx_merchant m on m.id = bu.merchant_id |
|
|
|
left join ( |
|
|
|
select cu.id,cu.phone,(select cubi.`name` from wx_c_user_basic_info cubi |
|
|
|
where cubi.phone=cu.phone and cubi.`name` is not null limit 1) c_user_name |
|
|
|
from wx_c_user cu |
|
|
|
) cu on cu.id = o.c_user_id |
|
|
|
LEFT JOIN wx_c_user cu on cu.id = o.c_user_id |
|
|
|
LEFT JOIN wx_c_user_basic_info cubi on cubi.id = o.c_user_id |
|
|
|
where o.order_status = '1' and o.`type` = 1 |
|
|
|
<if test=" null != tenantId "> |
|
|
|
and o.`tenant_id` = #{tenantId} |
|
|
|
|