11

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml

@@ -153,9 +153,9 @@
                 #{v}
             </foreach>
         </if>
-        <if test="dto.orderPayTypeCodes != null and dto.orderPayTypeCodes.size() != 0">
-            and a.pay_type in
-            <foreach collection="dto.orderPayTypeCodes" item="v" open="(" close=")" separator=",">
+        <if test="dto.mchTypeCodes != null and dto.mchTypeCodes.size() != 0">
+            and a.merchant_type in
+            <foreach collection="dto.mchTypeCodes" item="v" open="(" close=")" separator=",">
                 #{v}
             </foreach>
         </if>
@@ -185,12 +185,6 @@
                     #{v}
                 </foreach>
             </if>
-            <if test="dto.mchTypeCodes != null and dto.mchTypeCodes.size() != 0">
-                and a.merchant_type in
-                <foreach collection="dto.mchTypeCodes" item="v" open="(" close=")" separator=",">
-                    #{v}
-                </foreach>
-            </if>
         </where>
         order by a.create_time desc, a.user_id desc
     </select>