Merge branch 'master-rentvehicle' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java

@@ -69,6 +69,9 @@ public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder>
 				dto.setEndTime(new Date().getTime());
 			}
 		}
+		if (dto.getStatus() >= 7) {
+			dto.setRefundStatus(dto.getStatus());
+		}
 		Query query = new Query(dto);
 		PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllOrderList(query.getSuper()));
 		return ObjectRestResponse.succ(pageDataVO);

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -244,6 +244,10 @@
             <if test="realName != null and realName != ''">
                 and username like CONCAT ("%", #{realName}, "%")
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (telephone like CONCAT ("%", #{phone}, "%") or username like CONCAT ("%", #{realName}, "%"))
+            </if>
+
             <if test="userId != null">
                 and userId = #{userId}
             </if>