diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java index 587ed36..f201ab9 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java @@ -12,6 +12,9 @@ public class UserPageOrderByOperatorQueryParam { @ApiModelProperty("订单号") private String orderCode; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("订单开始时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime orderTimeFrom; diff --git a/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml index 13b7cef..0c7654e 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml @@ -13,6 +13,7 @@ daa.tid as userPhone, dao.mi_id, IFNULL(dami.`name`,dami.nick_name) as miName, + dao.name, dao.settlement_amount from da_order as dao LEFT JOIN da_order_item as doi on doi.order_id=dao.id and doi.is_delete=0 @@ -22,6 +23,9 @@ AND dao.order_code LIKE CONCAT('%', TRIM(#{queryParam.orderCode}), '%') + + AND dao.name LIKE CONCAT('%', TRIM(#{queryParam.name}), '%') + and dao.create_time BETWEEN #{queryParam.orderTimeFrom} and #{queryParam.orderTimeTo}