委托服务费用

dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/mica/constant/MarriageInformationContactApplyStatusEnum.java

@@ -10,6 +10,8 @@ import lombok.Getter;
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum MarriageInformationContactApplyStatusEnum {
 
+    INIT(0, "初始化"),
+
     PENDING(1, "申请中"),
 
     APPROVED(2, "已同意"),

dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/mica/entity/MarriageInformationContactApply.java

@@ -29,6 +29,9 @@ public class MarriageInformationContactApply extends Entity<MarriageInformationC
     @ApiModelProperty("目标资料id")
     private Long targetMiId;
 
+    @ApiModelProperty("目标IM资料id")
+    private Long targetCimMiId;
+
     @ApiModelProperty("状态")
     private MarriageInformationContactApplyStatusEnum status;
 

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

@@ -15,6 +15,7 @@ import com.qniao.dam.query.mica.MarriageInformationContactApplyQueryService;
 import com.qniao.dam.query.usermarriageinformation.UserMarriageInformationQueryService;
 import com.qniao.das.domian.aggregate.marriageinformation.MarriageInformation;
 import com.qniao.das.domian.aggregate.marriageinformation.UserMarriageInformation;
+import com.qniao.das.domian.aggregate.marriageinformation.constant.UserMarriageInformationTypeEnum;
 import com.qniao.framework.exception.BizException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -84,6 +85,15 @@ public class ContactCardUsageRecordApplicationService {
         UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryByMiId(usageRecord.getTargetMiId());
         if (Objects.isNull(targetUserMarriageInformation)) {
             throw new BizException("申请异常");
+        } else {
+            if (UserMarriageInformationTypeEnum.OWN.equals(targetUserMarriageInformation.getType()) ||
+                    UserMarriageInformationTypeEnum.MATCHMAKER.equals(targetUserMarriageInformation.getType())) {
+                apply.setTargetCimMiId(apply.getTargetMiId());
+            } else if (UserMarriageInformationTypeEnum.TYPE_IN.equals(targetUserMarriageInformation.getType())) {
+                //红娘录入的
+                UserMarriageInformation matchmakerUserMarriageInformation = userMarriageInformationQueryService.queryByMatchMaker(targetUserMarriageInformation.getUserId());
+                apply.setTargetCimMiId(matchmakerUserMarriageInformation.getMiId());
+            }
         }
         apply.setTargetUserId(targetUserMarriageInformation.getUserId());
         marriageInformationContactApplyAggregate.create(apply);

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

@@ -8,4 +8,6 @@ public interface UserMarriageInformationQueryService {
 
     UserMarriageInformation queryByMiId(Long miId);
 
+    UserMarriageInformation queryByMatchMaker(Long userId);
+
 }

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

@@ -8,6 +8,7 @@ import com.qniao.das.domian.aggregate.marriageinformation.constant.UserMarriageI
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Objects;
 
 @Service
 public class UserMarriageInformationQueryServiceImpl implements UserMarriageInformationQueryService {
@@ -31,4 +32,12 @@ public class UserMarriageInformationQueryServiceImpl implements UserMarriageInfo
                 .last("limit 1"));
     }
 
+    @Override
+    public UserMarriageInformation queryByMatchMaker(Long userId) {
+        LambdaQueryWrapper<UserMarriageInformation> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(UserMarriageInformation::getType, UserMarriageInformationTypeEnum.MATCHMAKER);
+        wrapper.eq(UserMarriageInformation::getUserId, userId);
+        wrapper.last("limit 1");
+        return userMarriageInformationDao.selectOne(wrapper);
+    }
 }

dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml

@@ -31,7 +31,7 @@
         from da_marriage_information_contact_apply as damica
                  LEFT JOIN da_marriage_information as dami on damica.target_mi_id=dami.id
                  LEFT JOIN da_account as daa on daa.is_delete=0 and daa.type=2 and daa.user_id=damica.target_user_id
-        WHERE damica.is_delete=0
+        WHERE damica.is_delete=0 and damica.`status` !=0
           and damica.applicant_user_id=#{queryParams.applicantUserId}
         <if test="queryParams.status != null">
             and damica.`status` = #{queryParams.status}
@@ -70,7 +70,7 @@
         from da_marriage_information_contact_apply as damica
                  LEFT JOIN da_marriage_information as dami on damica.applicant_mi_id = dami.id
                  LEFT JOIN da_account as daa on daa.is_delete=0 and daa.user_id=damica.applicant_user_id and daa.type=2
-        WHERE damica.is_delete = 0
+        WHERE damica.is_delete = 0 and damica.`status` !=0
           and damica.target_user_id = #{queryParams.targetUserId}
         <if test="queryParams.status != null">
             and damica.`status` = #{queryParams.status}

dating-agency-mall-server/src/main/resources/mapper/ora/PurchaseProductRecordQueryService.xml

@@ -38,7 +38,6 @@
         <if test="queryParams.applyTimeFrom != null and queryParams.applyTimeTo != null">
             and dora.create_time BETWEEN #{queryParams.applyTimeFrom} and #{queryParams.applyTimeTo}
         </if>
-
         UNION ALL
         select
         dora.id,
@@ -56,7 +55,7 @@
         from da_order_refund_application as dora
         LEFT JOIN da_entrust_service_order as dmbo on dmbo.id=dora.order_id
         LEFT JOIN da_marriage_information as dmi on dmi.id=dmbo.initiator_mi_id
-        LEFT JOIN da_account as daa on daa.is_delete=0 and daa.type=2 and daa.user_id=dmbo.target_user_id
+        LEFT JOIN da_account as daa on daa.is_delete=0 and daa.type=2 and daa.user_id=dmbo.initiator_user_id
         where dora.is_delete=0 and dora.refund_order_type=2
         <if test="queryParams.operationStatus != null">
             and dora.`operation_status` = #{queryParams.operationStatus}