dating-agency
/
dating-agency-mall
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

委托服务费用

master
张彭杰 3 weeks ago
parent
0ae333f079
commit
09f5d33e06
6 changed files with 138 additions and 3 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/EntrustServiceOrderUserQueryController.java
  2. 75
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java
  3. 5
      dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java
  4. 4
      dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java
  5. 15
      dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
  6. 35
      dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml

7
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/EntrustServiceOrderUserQueryController.java
View File

@ -5,6 +5,7 @@ import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByMatchma
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderQueryParams;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo;
import com.qniao.dam.query.eso.EntrustServiceOrderQueryService;
import com.qniao.domain.QnPage;
import com.qniao.framework.utils.PageUtil;
@ -42,9 +43,9 @@ public class EntrustServiceOrderUserQueryController {
@GetMapping("page/entrust-service-order")
@ApiOperation("用户获取委托服务单列表")
public QnPage<UserPageEntrustServiceOrderByMatchmakerVo> userPageEntrustServiceOrder(PageUtil pageUtil,
PageEntrustServiceOrderQueryParams queryParams) {
return null;
public QnPage<UserPageEntrustServiceOrderVo> userPageEntrustServiceOrder(PageUtil pageUtil,
PageEntrustServiceOrderQueryParams queryParams) {
return PageUtil.convert(entrustServiceOrderQueryService.pageOrder(pageUtil, queryParams), UserPageEntrustServiceOrderVo.class);
}
}

75
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java
View File

@ -0,0 +1,75 @@
package com.qniao.dam.api.query.eso.user.response;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.qniao.dam.api.query.marriageinformation.response.MarriageInformationVo;
import com.qniao.dam.domian.aggregate.eso.constant.EntrustServicePaymentStatusEnum;
import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceStatusEnum;
import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class UserPageEntrustServiceOrderVo {
@ApiModelProperty("唯一标识")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发起人用户标识")
@JsonSerialize(using = ToStringSerializer.class)
private Long initiatorUserId;
@ApiModelProperty("发起人资料标识")
@JsonSerialize(using = ToStringSerializer.class)
private Long initiatorMiId;
@ApiModelProperty("发起人资料信息")
private MarriageInformationVo initiatorMiInfo;
@ApiModelProperty("目标用户标识")
@JsonSerialize(using = ToStringSerializer.class)
private Long targetUserId;
@ApiModelProperty("目标资料标识")
@JsonSerialize(using = ToStringSerializer.class)
private Long targetMiId;
@ApiModelProperty("目标资料信息")
private MarriageInformationVo targetMiInfo;
@ApiModelProperty("红娘标识")
@JsonSerialize(using = ToStringSerializer.class)
private Long matchmakerId;
@ApiModelProperty("委托服务类型")
private EntrustServiceTypeEnum type;
@ApiModelProperty("奖励金额")
private BigDecimal rewardAmount;
@ApiModelProperty("关联订单ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long associateOrderId;
@ApiModelProperty("关联订单号")
private String associateOrderCode;
@ApiModelProperty("付款金额")
private BigDecimal paidAmount;
@ApiModelProperty("状态")
private EntrustServiceStatusEnum status;
@ApiModelProperty("付款状态")
private EntrustServicePaymentStatusEnum paymentStatus;
@ApiModelProperty("下单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
}

5
dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java
View File

@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByInitiatorQueryParams;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByMatchmakerQueryParams;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderQueryParams;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo;
import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder;
import org.apache.ibatis.annotations.Param;
@ -21,4 +23,7 @@ public interface EntrustServiceOrderDao extends BaseMapper<EntrustServiceOrder>
IPage<UserPageEntrustServiceOrderByMatchmakerVo> pageOrderByMatchmaker(Page<Object> pageWithoutOrders,
@Param("queryParams") PageEntrustServiceOrderByMatchmakerQueryParams queryParams);
IPage<UserPageEntrustServiceOrderVo> pageOrder(Page<Object> pageWithoutOrders,
@Param("queryParams") PageEntrustServiceOrderQueryParams queryParams);
}

4
dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java
View File

@ -3,8 +3,10 @@ package com.qniao.dam.query.eso;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByInitiatorQueryParams;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByMatchmakerQueryParams;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderQueryParams;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo;
import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder;
import com.qniao.domain.QnPage;
import com.qniao.framework.utils.PageUtil;
@ -26,4 +28,6 @@ public interface EntrustServiceOrderQueryService {
*/
IPage<UserPageEntrustServiceOrderByMatchmakerVo> pageOrderByMatchmaker(PageUtil pageUtil, PageEntrustServiceOrderByMatchmakerQueryParams queryParams);
IPage<UserPageEntrustServiceOrderVo> pageOrder(PageUtil pageUtil, PageEntrustServiceOrderQueryParams queryParams);
}

15
dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
View File

@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByInitiatorQueryParams;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByMatchmakerQueryParams;
import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderQueryParams;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo;
import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo;
import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder;
import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceStatusEnum;
import com.qniao.dam.infrastructure.persistent.dao.eso.EntrustServiceOrderDao;
@ -67,4 +69,17 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ
}
return page;
}
@Override
public IPage<UserPageEntrustServiceOrderVo> pageOrder(PageUtil pageUtil,
PageEntrustServiceOrderQueryParams queryParams) {
IPage<UserPageEntrustServiceOrderVo> page = entrustServiceOrderDao.pageOrder(pageUtil.toPageWithoutOrders(), queryParams);
if (page.getSize() > 0) {
page.getRecords().forEach(record -> {
record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId()));
record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId()));
});
}
return page;
}
}

35
dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml
View File

@ -62,4 +62,39 @@
ORDER BY daeso.create_time desc
</select>
<select id="pageOrder"
resultType="com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo">
SELECT
daeso.id,
daeso.initiator_mi_id,
daeso.initiator_user_id,
daeso.target_user_id,
daeso.target_mi_id,
daeso.matchmaker_id,
daeso.reward_amount,
daeso.associate_order_id,
dao.order_code as associateOrderCode,
daeso.paid_amount,
daeso.`status`,
daeso.payment_status,
daeso.create_time
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
where daeso.is_delete=0 and daeso.`status` !=0
<if test="queryParams.status != null">
and daeso.`status` = #{queryParams.status}
</if>
<if test="queryParams.paymentStatus != null">
and daeso.payment_status = #{queryParams.paymentStatus}
</if>
<if test="queryParams.initiatorNickName != null">
and dami.nick_name = #{queryParams.initiatorNickName}
</if>
<if test="queryParam.createTimeFrom != null and queryParam.createTimeTo != null">
and daeso.create_time BETWEEN #{queryParam.createTimeFrom} and #{queryParam.createTimeTo}
</if>
ORDER BY daeso.create_time desc
</select>
</mapper>
Write Preview
Loading…
Cancel
Save