修改订单搜索用户账号错误

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml

@@ -632,7 +632,7 @@
             and co.source=#{source}
         </if>
         <if test="plateNum !=null and plateNum !=''">
-            and co.Plate_num=#{plateNum}
+            and co.Plate_num like concat('%', #{plateNum}, '%')
         </if>
         <if test="internetId !=null">
             and inu.internet_user_id=#{internetId}
@@ -671,24 +671,31 @@
             and op.operator_id =#{operatorId}
         </if>
         <if test="number==1">
-            and co.user_id in (SELECT app_user_id FROM xhpc_app_user where phone like concat('%', #{phone}, '%')) or
+            and co.user_id in (
-            co.user_id in (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%'))
+            SELECT cro.user_id
+            FROM xhpc_charge_order cro WHERE cro.source = 0 AND cro.user_id IN ( SELECT app_user_id FROM xhpc_app_user  where phone like concat('%', #{phone}, '%'))
+            union
+            SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 1 AND cro.user_id IN (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%'))
+            )
         </if>
         <if test="number==2">
             <if test="source !=null and source ==0">
-                and co.user_id in (SELECT app_user_id FROM xhpc_app_user)
+                and co.user_id in (
+                SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 0 AND cro.user_id IN ( SELECT app_user_id FROM xhpc_app_user  where phone like concat('%', #{phone}, '%')))
             </if>
             <if test="source !=null and source ==1">
-                and co.user_id in (SELECT internet_user_id from xhpc_internet_user)
+                and co.user_id in (
+                SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 1 AND cro.user_id IN (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%')))
             </if>
         </if>
         <if test="number==3">
             <if test="source !=null and source ==0">
-                and co.user_id in (SELECT app_user_id FROM xhpc_app_user where phone like concat('%', #{phone}, '%'))
+                and co.user_id in (
+                SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 0 AND cro.user_id IN ( SELECT app_user_id FROM xhpc_app_user  where phone like concat('%', #{phone}, '%')))
             </if>
             <if test="source !=null and source ==1">
-                and co.user_id in (SELECT internet_user_id from xhpc_internet_user where phone like concat('%',
+                and co.user_id in (
-                #{phone}, '%'))
+                SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 1 AND cro.user_id IN (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%')))
             </if>
         </if>
         <if test="status==1">

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml

@@ -425,9 +425,6 @@
         <if test="source !=null">
             and co.source =#{source}
         </if>
-        <if test="status !=null">
-            and co.status =#{status}
-        </if>
         <if test="startTime !=null and startTime !=''">
             and co.start_time &gt;= #{startTime}
         </if>
@@ -447,24 +444,31 @@
             and op.operator_id =#{operatorId}
         </if>
         <if test="number==1">
-            and co.user_id in (SELECT app_user_id FROM xhpc_app_user where phone like concat('%', #{phone}, '%')) or
+            and co.user_id in (
-            co.user_id in (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%'))
+            SELECT cro.user_id
+            FROM xhpc_charge_order cro WHERE cro.source = 0 AND cro.user_id IN ( SELECT app_user_id FROM xhpc_app_user  where phone like concat('%', #{phone}, '%'))
+            union
+            SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 1 AND cro.user_id IN (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%'))
+            )
         </if>
         <if test="number==2">
             <if test="source !=null and source ==0">
-                and co.user_id in (SELECT app_user_id FROM xhpc_app_user)
+                and co.user_id in (
+                    SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 0 AND cro.user_id IN ( SELECT app_user_id FROM xhpc_app_user  where phone like concat('%', #{phone}, '%')))
             </if>
             <if test="source !=null and source ==1">
-                and co.user_id in (SELECT internet_user_id from xhpc_internet_user)
+                and co.user_id in (
+                SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 1 AND cro.user_id IN (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%')))
             </if>
         </if>
         <if test="number==3">
             <if test="source !=null and source ==0">
-                and co.user_id in (SELECT app_user_id FROM xhpc_app_user where phone like concat('%', #{phone}, '%'))
+                and co.user_id in (
+                SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 0 AND cro.user_id IN ( SELECT app_user_id FROM xhpc_app_user  where phone like concat('%', #{phone}, '%')))
             </if>
             <if test="source !=null and source ==1">
-                and co.user_id in (SELECT internet_user_id from xhpc_internet_user where phone like concat('%',
+                and co.user_id in (
-                #{phone}, '%'))
+                SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 1 AND cro.user_id IN (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%')))
             </if>
         </if>
         <if test="type==1">

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml

@@ -122,7 +122,6 @@
         sum(platform_svc_commisssion) platformSvcCommisssion,
         sum(operation_commission) operationCommission,
         sum(operation_svc_commission) operationSvcCommission,
-
         DATE_FORMAT(create_time,'%Y-%m-%d') createTime
         from xhpc_statistics_station
         where del_flag=0 and type=1