diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java index ab86990..0bf53d3 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java @@ -33,16 +33,6 @@ public class OrderReqQuery extends BaseQueryParameterReq { */ @ApiModelProperty("微信openId") private Long openId; - /** - * 价格 - */ - @ApiModelProperty("价格") - private BigDecimal price; - /** - * 实际支付价格 - */ - @ApiModelProperty("实际支付价格") - private BigDecimal payPrice; /** * 备注 */ diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml index 13ec798..bef6435 100644 --- a/src/main/resources/mapper/OrderMapper.xml +++ b/src/main/resources/mapper/OrderMapper.xml @@ -244,7 +244,7 @@ left join scenic s on o.scenic_id = s.id - and o.id = #{id} + and o.id LIKE CONCAT('%',#{id},'%') and o.scenic_id = #{scenicId} @@ -253,26 +253,17 @@ and m.nickname like concat('%',#{memberNickname},'%') - and o.member_id like concat('%',#{memberId},'%') + and (o.member_id like concat('%',#{memberId},'%') or m.uid like concat('%',#{memberId},'%')) and m.uid = #{memberUid} - - and o.price = #{price} - - - and pay_price = #{payPrice} - and remark like concat('%',#{remark},'%') and o.broker_id = #{brokerId} - - and o.promo_code like concat('%',#{promoCode},'%') - and refund_reason like concat('%',#{refundReason},'%') @@ -338,12 +329,6 @@ and m.uid = #{memberUid} - - and o.price = #{price} - - - and pay_price = #{payPrice} - and remark like concat('%',#{remark},'%') @@ -450,12 +435,6 @@ and m.uid = #{memberUid} - - and o.price = #{price} - - - and pay_price = #{payPrice} - and remark like concat('%',#{remark},'%')