Merge branch 'feature/mall_product' into test

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml

@@ -107,7 +107,7 @@
         a.out_trade_no,
         a.pay_time,
         b.nickname,
-        a.real_name,
+        x.nickname as realName,
         a.uid,
         a.user_phone,
         a.confirm_phone,
@@ -124,6 +124,7 @@
         left join member_user b on a.promoter_id = b.id
         left join system_dept d on d.id = a.dept_id
         left join system_tenant e on e.id = a.tenant_id
+        left join member_user x on a.uid = x.id
         <include refid="baseWhere">
         </include>
         order by a.pay_time desc
@@ -249,9 +250,9 @@
             <if test="data.nickname !=null and data.nickname!=''">
                 and b.nickname like CONCAT('%',#{data.nickname},'%')
             </if>
-            <!--<if test="data.realName !=null and data.realName!=''">
-                and a.real_name like CONCAT('%',#{data.realName},'%')
-            </if>-->
+            <if test="data.realName !=null and data.realName!=''">
+                and x.real_name like CONCAT('%',#{data.realName},'%')
+            </if>
             <if test="data.userPhone !=null and data.userPhone!=''">
                 and a.user_phone like CONCAT('%',#{data.userPhone},'%')
             </if>