diff --git a/order-food-java/src/main/java/com/gfwl/common/entity/BusOrder.java b/order-food-java/src/main/java/com/gfwl/common/entity/BusOrder.java index 1b999e9..4d1ad87 100644 --- a/order-food-java/src/main/java/com/gfwl/common/entity/BusOrder.java +++ b/order-food-java/src/main/java/com/gfwl/common/entity/BusOrder.java @@ -186,4 +186,7 @@ public class BusOrder extends DataEntity { @TableField(exist = false) @ApiModelProperty("头像") private String userHeader; + + @TableField(exist = false) + private String phoneNumber; } diff --git a/order-food-java/src/main/resource/mapper/common/BusOrderMapper.xml b/order-food-java/src/main/resource/mapper/common/BusOrderMapper.xml index e180dd1..ecfcae0 100644 --- a/order-food-java/src/main/resource/mapper/common/BusOrderMapper.xml +++ b/order-food-java/src/main/resource/mapper/common/BusOrderMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*,b.nick_name as userName,b.heads as userHeader + SELECT a.*,b.nick_name as userName,b.heads as userHeader , b.phones AS phoneNumber FROM bus_order a LEFT JOIN bus_user b on a.user_id=b.id @@ -13,6 +13,9 @@ AND DATE_FORMAT(a.pay_time, '%Y-%m-%d') LIKE CONCAT('%', DATE_FORMAT(#{page.pageData.payTime},'%Y-%m-%d'), '%') + + AND b.phones LIKE CONCAT('%', #{page.pageData.phoneNumber}, '%') + or (a.order_type=2 ) @@ -73,8 +76,8 @@ AND a.names LIKE CONCAT('%', #{page.pageData.names}, '%') - - AND a.phones LIKE CONCAT('%', #{page.pageData.phones}, '%') + + AND b.phones LIKE CONCAT('%', #{page.pageData.phoneNumber}, '%') AND a.is_evaluation = #{page.pageData.isEvaluation} diff --git a/order-food-java/src/main/resource/templates/app/busOrder.html b/order-food-java/src/main/resource/templates/app/busOrder.html index acb3d89..49d2506 100644 --- a/order-food-java/src/main/resource/templates/app/busOrder.html +++ b/order-food-java/src/main/resource/templates/app/busOrder.html @@ -80,6 +80,12 @@ +
+ +
+ +
+