diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/ccur/vobj/ContactCardUsageRecord.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/ccur/vobj/ContactCardUsageRecord.java new file mode 100644 index 0000000..2f15db6 --- /dev/null +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/ccur/vobj/ContactCardUsageRecord.java @@ -0,0 +1,40 @@ +package com.qniao.dam.domain.aggregate.ccur.vobj; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.qniao.dam.domian.aggregate.pcur.constant.CardUsageTyepEnum; +import com.qniao.domain.ValueObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDate; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("da_contact_card_usage_record") +public class ContactCardUsageRecord extends ValueObject { + + @ApiModelProperty("用户标识") + private Long userId; + + @ApiModelProperty("目标资料标识") + private Long targetMiId; + + @ApiModelProperty("使用类型") + private CardUsageTyepEnum usageType; + + @ApiModelProperty("使用日期") + private LocalDate usageDate; + + public static ContactCardUsageRecord build(Long userId, + Long targetMiId, + CardUsageTyepEnum usageType) { + ContactCardUsageRecord contactCardUsageRecord = new ContactCardUsageRecord(); + contactCardUsageRecord.setUserId(userId); + contactCardUsageRecord.setTargetMiId(targetMiId); + contactCardUsageRecord.setUsageType(usageType); + contactCardUsageRecord.setUsageDate(LocalDate.now()); + return contactCardUsageRecord; + } + +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/entity/ProfileCardUsageRecord.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/pcur/vobj/ProfileCardUsageRecord.java similarity index 94% rename from dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/entity/ProfileCardUsageRecord.java rename to dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/pcur/vobj/ProfileCardUsageRecord.java index 150127f..cc2f667 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/entity/ProfileCardUsageRecord.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/pcur/vobj/ProfileCardUsageRecord.java @@ -1,4 +1,4 @@ -package com.qniao.dam.domain.aggregate.pcur.entity; +package com.qniao.dam.domain.aggregate.pcur.vobj; import com.baomidou.mybatisplus.annotation.TableName; import com.qniao.dam.domian.aggregate.pcur.constant.CardUsageTyepEnum; @@ -6,7 +6,6 @@ import com.qniao.domain.ValueObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import com.qniao.domain.Entity; import java.time.LocalDate; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ccur/user/ContactCardUsageRecordUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ccur/user/ContactCardUsageRecordUserCommandController.java new file mode 100644 index 0000000..3c0e016 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ccur/user/ContactCardUsageRecordUserCommandController.java @@ -0,0 +1,28 @@ +package com.qniao.dam.api.command.ccur.user; + +import com.qniao.dam.api.command.ccur.user.response.UserUseContactCardVo; +import com.qniao.dam.api.command.pcur.user.request.UserUseProfileCardDto; +import com.qniao.dam.application.service.ccur.ContactCardUsageRecordApplicationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +@Api(tags = "联系卡使用记录") +@RestController +@RequestMapping("user") +public class ContactCardUsageRecordUserCommandController { + + private ContactCardUsageRecordApplicationService contactCardUsageRecordApplicationService; + + @ApiOperation("用户使用联系卡") + @PostMapping("use/contact-card") + public UserUseContactCardVo userUseContactCard(@RequestBody @Valid UserUseProfileCardDto dto, + @RequestParam("userId") Long userId) { + + return null; + } + + +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ccur/user/response/UserUseContactCardVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ccur/user/response/UserUseContactCardVo.java new file mode 100644 index 0000000..4374c2e --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ccur/user/response/UserUseContactCardVo.java @@ -0,0 +1,15 @@ +package com.qniao.dam.api.command.ccur.user.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class UserUseContactCardVo { + + @ApiModelProperty("是否成功") + private Boolean success = false; + + @ApiModelProperty("是否实名认证") + private Boolean realNameAuthenticated = false; + +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/pcur/user/ProfileCardUsageRecordUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/pcur/user/ProfileCardUsageRecordUserCommandController.java index 5913c2a..d046d60 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/pcur/user/ProfileCardUsageRecordUserCommandController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/pcur/user/ProfileCardUsageRecordUserCommandController.java @@ -3,7 +3,7 @@ package com.qniao.dam.api.command.pcur.user; import com.qniao.dam.api.command.pcur.user.request.*; import com.qniao.dam.api.command.pcur.user.response.UserUseProfileCardVo; import com.qniao.dam.application.service.pcur.ProfileCardUsageRecordApplicationService; -import com.qniao.dam.domain.aggregate.pcur.entity.ProfileCardUsageRecord; +import com.qniao.dam.domain.aggregate.pcur.vobj.ProfileCardUsageRecord; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -20,8 +20,8 @@ public class ProfileCardUsageRecordUserCommandController { private ProfileCardUsageRecordApplicationService profileCardUsageRecordApplicationService; @ApiOperation("用户使用资料卡") - @PostMapping("user/profile-card") - public UserUseProfileCardVo userCreateProfileCardUsageRecord(@RequestBody @Valid UserUseProfileCardDto dto, + @PostMapping("use/profile-card") + public UserUseProfileCardVo userUseProfileCard(@RequestBody @Valid UserUseProfileCardDto dto, @RequestParam("userId") Long userId) { ProfileCardUsageRecord usageRecord = dto.trans2Domain(); usageRecord.setUserId(userId); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/pcur/user/request/UserUseProfileCardDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/pcur/user/request/UserUseProfileCardDto.java index f17a2ba..cf6e7c8 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/pcur/user/request/UserUseProfileCardDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/pcur/user/request/UserUseProfileCardDto.java @@ -1,6 +1,6 @@ package com.qniao.dam.api.command.pcur.user.request; -import com.qniao.dam.domain.aggregate.pcur.entity.ProfileCardUsageRecord; +import com.qniao.dam.domain.aggregate.pcur.vobj.ProfileCardUsageRecord; import com.qniao.domain.Trans2DomainAssembler; import io.swagger.annotations.ApiModelProperty; import com.qniao.framework.utils.TypeConvertUtils; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ccur/ContactCardUsageRecordApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ccur/ContactCardUsageRecordApplicationService.java new file mode 100644 index 0000000..a076aa4 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ccur/ContactCardUsageRecordApplicationService.java @@ -0,0 +1,7 @@ +package com.qniao.dam.application.service.ccur; + +import org.springframework.stereotype.Service; + +@Service +public class ContactCardUsageRecordApplicationService { +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/pcur/ProfileCardUsageRecordApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/pcur/ProfileCardUsageRecordApplicationService.java index 6cfc86f..e3c88d9 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/pcur/ProfileCardUsageRecordApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/pcur/ProfileCardUsageRecordApplicationService.java @@ -3,11 +3,9 @@ package com.qniao.dam.application.service.pcur; import cn.hutool.core.util.StrUtil; import com.qniao.dam.api.command.pcur.user.response.UserUseProfileCardVo; import com.qniao.dam.application.service.right.RightApplicationService; -import com.qniao.dam.domain.aggregate.pcur.ProfileCardUsageRecordAggregate; -import com.qniao.dam.domain.aggregate.pcur.entity.ProfileCardUsageRecord; +import com.qniao.dam.domain.aggregate.pcur.vobj.ProfileCardUsageRecord; import com.qniao.dam.domian.aggregate.pcur.constant.CardUsageTyepEnum; import com.qniao.dam.domian.aggregate.right.constant.RightTypeEnum; -import com.qniao.dam.infrastructure.persistent.dao.domain.MarriageInformationDao; import com.qniao.dam.infrastructure.persistent.dao.pcur.ProfileCardUsageRecordDao; import com.qniao.dam.query.marriageinformation.MarriageInformationQueryService; import com.qniao.dam.query.pcur.ProfileCardUsageRecordQueryService; @@ -15,7 +13,6 @@ import com.qniao.das.domian.aggregate.marriageinformation.MarriageInformation; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Objects; @Service public class ProfileCardUsageRecordApplicationService { diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/ProfileCardUsageRecordAggregate.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/ProfileCardUsageRecordAggregate.java index 3c6a9ae..410facc 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/ProfileCardUsageRecordAggregate.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/ProfileCardUsageRecordAggregate.java @@ -1,6 +1,6 @@ package com.qniao.dam.domain.aggregate.pcur; -import com.qniao.dam.domain.aggregate.pcur.entity.ProfileCardUsageRecord; +import com.qniao.dam.domain.aggregate.pcur.vobj.ProfileCardUsageRecord; import com.qniao.dam.domain.aggregate.pcur.repository.ProfileCardUsageRecordRepository; import org.springframework.stereotype.Service; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/repository/ProfileCardUsageRecordRepository.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/repository/ProfileCardUsageRecordRepository.java index 88ca390..4465364 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/repository/ProfileCardUsageRecordRepository.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/pcur/repository/ProfileCardUsageRecordRepository.java @@ -1,6 +1,6 @@ package com.qniao.dam.domain.aggregate.pcur.repository; -import com.qniao.dam.domain.aggregate.pcur.entity.ProfileCardUsageRecord; +import com.qniao.dam.domain.aggregate.pcur.vobj.ProfileCardUsageRecord; import com.qniao.domain.Repository; /** diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/ccur/ContactCardUsageRecordDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/ccur/ContactCardUsageRecordDao.java new file mode 100644 index 0000000..026370f --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/ccur/ContactCardUsageRecordDao.java @@ -0,0 +1,7 @@ +package com.qniao.dam.infrastructure.persistent.dao.ccur; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qniao.dam.domain.aggregate.ccur.vobj.ContactCardUsageRecord; + +public interface ContactCardUsageRecordDao extends BaseMapper { +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/pcur/ProfileCardUsageRecordDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/pcur/ProfileCardUsageRecordDao.java index b70ecb1..b30119e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/pcur/ProfileCardUsageRecordDao.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/pcur/ProfileCardUsageRecordDao.java @@ -1,7 +1,7 @@ package com.qniao.dam.infrastructure.persistent.dao.pcur; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.qniao.dam.domain.aggregate.pcur.entity.ProfileCardUsageRecord; +import com.qniao.dam.domain.aggregate.pcur.vobj.ProfileCardUsageRecord; /** * 资料卡使用记录 diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/repository/impl/ProfileCardUsageRecordRepositoryImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/repository/impl/ProfileCardUsageRecordRepositoryImpl.java index 6ba3cc4..02b60bc 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/repository/impl/ProfileCardUsageRecordRepositoryImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/repository/impl/ProfileCardUsageRecordRepositoryImpl.java @@ -1,6 +1,6 @@ package com.qniao.dam.infrastructure.persistent.repository.impl; -import com.qniao.dam.domain.aggregate.pcur.entity.ProfileCardUsageRecord; +import com.qniao.dam.domain.aggregate.pcur.vobj.ProfileCardUsageRecord; import com.qniao.dam.domain.aggregate.pcur.repository.ProfileCardUsageRecordRepository; import com.qniao.dam.infrastructure.persistent.dao.pcur.ProfileCardUsageRecordDao; import org.springframework.stereotype.Service; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/pcur/impl/ProfileCardUsageRecordQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/pcur/impl/ProfileCardUsageRecordQueryServiceImpl.java index b2d77e4..7b84baa 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/pcur/impl/ProfileCardUsageRecordQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/pcur/impl/ProfileCardUsageRecordQueryServiceImpl.java @@ -1,7 +1,7 @@ package com.qniao.dam.query.pcur.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qniao.dam.domain.aggregate.pcur.entity.ProfileCardUsageRecord; +import com.qniao.dam.domain.aggregate.pcur.vobj.ProfileCardUsageRecord; import com.qniao.dam.domian.aggregate.pcur.constant.CardUsageTyepEnum; import com.qniao.dam.infrastructure.persistent.dao.pcur.ProfileCardUsageRecordDao; import com.qniao.dam.query.pcur.ProfileCardUsageRecordQueryService; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java index 8c475f7..7dd4d36 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java @@ -139,7 +139,7 @@ public class RightQueryServiceImpl implements RightQueryService { MarriageInformation marriageInformation = marriageInformationQueryService.queryByUserId(userId); if (StrUtil.isNotBlank(marriageInformation.getIdentityCard())) { profileCardInfo.setQuantity(20); - contactCardInfo.setQuantity(10); + contactCardInfo.setQuantity(3); } } //查询周期内免费卡使用次数