diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java index 19debd8..b6cfe3c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java @@ -46,6 +46,12 @@ public class UserPageEntrustServiceOrderVo { @JsonSerialize(using = ToStringSerializer.class) private Long matchmakerId; + @ApiModelProperty("红娘名称") + private String matchmakerName; + + @ApiModelProperty("红娘号码") + private String matchmakerPhone; + @ApiModelProperty("委托服务类型") private EntrustServiceTypeEnum type; diff --git a/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml b/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml index 9b50caa..06ee1d1 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml @@ -82,6 +82,8 @@ daeso.target_user_id, daeso.target_mi_id, daeso.matchmaker_id, + dam.`name` as matchmakerName, + dam.phone as matchmakerPhone, daeso.type, daeso.reward_amount, daeso.associate_order_id, @@ -101,6 +103,7 @@ from da_entrust_service_order as daeso LEFT JOIN da_order as dao on dao.id=daeso.associate_order_id LEFT JOIN da_marriage_information as dami on dami.id=daeso.initiator_mi_id + LEFT JOIN da_matchmaker as dam on dam.id=daeso.matchmaker_id where daeso.is_delete=0 and daeso.`status` !=0 and daeso.`status` = #{queryParams.status}