委托服务费用

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriageinformation/response/MarriageInformationVo.java

@@ -16,6 +16,9 @@ public class MarriageInformationVo {
     @ApiModelProperty("昵称")
     private String nickName;
 
+    @ApiModelProperty("号码")
+    private String phone;
+
     @ApiModelProperty("头像URL")
     private String profilePhoto;
 

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ccur/ContactCardUsageRecordApplicationService.java

@@ -81,7 +81,7 @@ public class ContactCardUsageRecordApplicationService {
         apply.setApplicantUserId(usageRecord.getUserId());
         apply.setApplicantMiId(applicantMarriageInformation.getId());
         apply.setTargetMiId(usageRecord.getTargetMiId());
-        UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryOwnByMiId(usageRecord.getTargetMiId());
+        UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryByMiId(usageRecord.getTargetMiId());
         if (Objects.isNull(targetUserMarriageInformation)) {
             throw new BizException("申请异常");
         }

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java

@@ -315,7 +315,7 @@ public class OrderApplicationService extends BaseApplicationService {
     private void handleEntrustServiceOrder(EntrustServiceOrder entrustServiceOrder,
                                            UserMarriageInformation initiatorUserMarriageInformation) {
         entrustServiceOrder.setInitiatorMiId(initiatorUserMarriageInformation.getMiId());
-        UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryOwnByMiId(entrustServiceOrder.getTargetMiId());
+        UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryByMiId(entrustServiceOrder.getTargetMiId());
         if (Objects.isNull(targetUserMarriageInformation)) {
             throw new BizException("无法发起牵线");
         }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/AccountQueryService.java

@@ -6,4 +6,6 @@ import com.qniao.dau.domian.aggregate.account.constant.AccountTypeEnum;
 public interface AccountQueryService {
 
     Account queryByUserIdAndType(Long userId, AccountTypeEnum type);
+
+    String queryPhone(Long userId);
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/account/impl/AccountQueryServiceImpl.java

@@ -8,6 +8,7 @@ import com.qniao.dau.domian.aggregate.account.constant.AccountTypeEnum;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Objects;
 
 @Service
 public class AccountQueryServiceImpl implements AccountQueryService {
@@ -22,4 +23,10 @@ public class AccountQueryServiceImpl implements AccountQueryService {
                 .eq(Account::getType, type)
                 .last("limit 1"));
     }
+
+    @Override
+    public String queryPhone(Long userId) {
+        Account account = queryByUserIdAndType(userId, AccountTypeEnum.MOBILE);
+        return Objects.nonNull(account) ? account.getTid() : null;
+    }
 }

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

@@ -54,7 +54,7 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ
         IPage<UserPageEntrustServiceOrderByInitiatorVo> page = entrustServiceOrderDao.pageOrderByInitiator(pageUtil.toPageWithoutOrders(), queryParams);
         if (page.getSize() > 0) {
             page.getRecords().forEach(record -> {
-                record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId()));
+                record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId(), record.getTargetUserId()));
             });
         }
         return page;
@@ -66,8 +66,8 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ
         IPage<UserPageEntrustServiceOrderByMatchmakerVo> page = entrustServiceOrderDao.pageOrderByMatchmaker(pageUtil.toPageWithoutOrders(), queryParams);
         if (page.getSize() > 0) {
             page.getRecords().forEach(record -> {
-                record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId()));
-                record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId()));
+                record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId(), record.getInitiatorUserId()));
+                record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId(), record.getTargetUserId()));
             });
         }
         return page;
@@ -79,8 +79,8 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ
         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()));
+                record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId(), record.getInitiatorUserId()));
+                record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId(), record.getTargetUserId()));
             });
         }
         return page;

dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/MarriageInformationQueryService.java

@@ -7,5 +7,5 @@ public interface MarriageInformationQueryService {
 
     MarriageInformation queryByUserId(Long userId);
 
-    MarriageInformationVo queryVo(Long id);
+    MarriageInformationVo queryVo(Long miId,Long userId);
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriageinformation/impl/MarriageInformationQueryServiceImpl.java

@@ -3,6 +3,7 @@ package com.qniao.dam.query.marriageinformation.impl;
 import com.qniao.dam.api.query.marriageinformation.response.MarriageInformationVo;
 import com.qniao.dam.infrastructure.persistent.dao.domain.MarriageInformationDao;
 import com.qniao.dam.infrastructure.utils.AgeCalculatorUtil;
+import com.qniao.dam.query.account.AccountQueryService;
 import com.qniao.dam.query.marriageinformation.MarriageInformationQueryService;
 import com.qniao.dam.query.usermarriageinformation.UserMarriageInformationQueryService;
 import com.qniao.das.domian.aggregate.marriageinformation.MarriageInformation;
@@ -20,6 +21,8 @@ public class MarriageInformationQueryServiceImpl implements MarriageInformationQ
     private UserMarriageInformationQueryService userMarriageInformationQueryService;
     @Resource
     private MarriageInformationDao marriageInformationDao;
+    @Resource
+    private AccountQueryService accountQueryService;
 
     @Override
     public MarriageInformation queryByUserId(Long userId) {
@@ -28,12 +31,13 @@ public class MarriageInformationQueryServiceImpl implements MarriageInformationQ
     }
 
     @Override
-    public MarriageInformationVo queryVo(Long id) {
+    public MarriageInformationVo queryVo(Long miId, Long userId) {
         MarriageInformationVo vo = null;
-        MarriageInformation marriageInformation = marriageInformationDao.selectById(id);
+        MarriageInformation marriageInformation = marriageInformationDao.selectById(miId);
         if (Objects.nonNull(marriageInformation)) {
             vo = TypeConvertUtils.convert(marriageInformation, MarriageInformationVo.class);
             vo.setAge(AgeCalculatorUtil.calculateAge(vo.getBirthYear(), vo.getBirthDate()));
+            vo.setPhone(accountQueryService.queryPhone(userId));
         }
         return vo;
     }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/UserMarriageInformationQueryService.java

@@ -6,6 +6,6 @@ public interface UserMarriageInformationQueryService {
 
     UserMarriageInformation queryByOwn(Long userId);
 
-    UserMarriageInformation queryOwnByMiId(Long miId);
+    UserMarriageInformation queryByMiId(Long miId);
 
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/usermarriageinformation/impl/UserMarriageInformationQueryServiceImpl.java

@@ -25,10 +25,9 @@ public class UserMarriageInformationQueryServiceImpl implements UserMarriageInfo
     }
 
     @Override
-    public UserMarriageInformation queryOwnByMiId(Long miId) {
+    public UserMarriageInformation queryByMiId(Long miId) {
         return userMarriageInformationDao.selectOne(new LambdaQueryWrapper<UserMarriageInformation>()
                 .eq(UserMarriageInformation::getMiId, miId)
-                .eq(UserMarriageInformation::getType, UserMarriageInformationTypeEnum.OWN)
                 .last("limit 1"));
     }