委托服务费用

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

@@ -2,6 +2,7 @@ package com.qniao.dam.api.query.eso.user;
 
 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.query.eso.EntrustServiceOrderQueryService;
@@ -24,19 +25,26 @@ public class EntrustServiceOrderUserQueryController {
 
     @GetMapping("page/entrust-service-order/by/initiator")
     @ApiOperation("发起人获取委托服务单列表")
-    public QnPage<UserPageEntrustServiceOrderByInitiatorVo> userPageOrderByOperator(PageUtil pageUtil,
-                                                                                    PageEntrustServiceOrderByInitiatorQueryParams queryParams,
-                                                                                    @RequestParam("userId") Long userId) {
+    public QnPage<UserPageEntrustServiceOrderByInitiatorVo> userPageEntrustServiceOrderByInitiator(PageUtil pageUtil,
+                                                                                                   PageEntrustServiceOrderByInitiatorQueryParams queryParams,
+                                                                                                   @RequestParam("userId") Long userId) {
         queryParams.setQueryInitiatorUserId(userId);
         return PageUtil.convert(entrustServiceOrderQueryService.pageOrderByInitiator(pageUtil, queryParams), UserPageEntrustServiceOrderByInitiatorVo.class);
     }
 
     @GetMapping("page/entrust-service-order/by/matchmaker")
     @ApiOperation("红娘获取委托服务单列表")
-    public QnPage<UserPageEntrustServiceOrderByMatchmakerVo> userPageOrderByMatchmaker(PageUtil pageUtil,
-                                                                                       @Validated PageEntrustServiceOrderByMatchmakerQueryParams queryParams,
-                                                                                       @RequestParam("userId") Long userId) {
+    public QnPage<UserPageEntrustServiceOrderByMatchmakerVo> userPageEntrustServiceOrderByMatchmaker(PageUtil pageUtil,
+                                                                                                     @Validated PageEntrustServiceOrderByMatchmakerQueryParams queryParams,
+                                                                                                     @RequestParam("userId") Long userId) {
         return PageUtil.convert(entrustServiceOrderQueryService.pageOrderByMatchmaker(pageUtil, queryParams), UserPageEntrustServiceOrderByMatchmakerVo.class);
     }
 
+    @GetMapping("page/entrust-service-order")
+    @ApiOperation("用户获取委托服务单列表")
+    public QnPage<UserPageEntrustServiceOrderByMatchmakerVo> userPageEntrustServiceOrder(PageUtil pageUtil,
+                                                                                         PageEntrustServiceOrderQueryParams queryParams) {
+        return null;
+    }
+
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/request/PageEntrustServiceOrderQueryParams.java

@@ -0,0 +1,26 @@
+package com.qniao.dam.api.query.eso.user.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+@Data
+public class PageEntrustServiceOrderQueryParams {
+
+    @ApiModelProperty("发起人昵称")
+    private String initiatorNickName;
+
+    @ApiModelProperty("状态")
+    private Integer status;
+
+    @ApiModelProperty("创建开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTimeFrom;
+
+    @ApiModelProperty("创建结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTimeTo;
+
+}

dating-agency-mall-server/src/main/java/com/qniao/dam/application/task/AcquireGiftRightTask.java

@@ -79,38 +79,38 @@ public class AcquireGiftRightTask {
     /**
      * 每月给资料赠送修改头像权益  人数多不能这么领取，用户自己领取就行
      */
-    @Scheduled(cron = "0 0 0 1 * *")
-    public void handle() {
-        try {
-            log.error("赠送权益任务开始");
-            //一个月整前的资料赠送权益
-            LocalDate now = LocalDate.now();
-            LocalDateTime monthStartTime = YearMonth.from(now).atDay(1).atTime(0, 0, 0);
-            LocalDateTime monthEndTime = YearMonth.from(now).plusMonths(1).atDay(1).minusDays(1).atTime(23, 59, 59);
-            int count = userMarriageInformationDao.selectCount(new LambdaQueryWrapper<UserMarriageInformation>());
-            if (count > 0) {
-                int num = 100;
-                for (int i = 0; i < count; i += num) {
-                    List<UserMarriageInformation> list = userMarriageInformationDao.selectList(new LambdaQueryWrapper<UserMarriageInformation>()
-                            .last("limit " + i + "," + num));
-                    if (CollUtil.isNotEmpty(list)) {
-                        for (UserMarriageInformation userMarriageInformation : list) {
-                            //判断资料是否领取过免费权益
-                            if (rightAcquireRecordDao.selectCount(new LambdaQueryWrapper<RightAcquireRecord>()
-                                    .eq(RightAcquireRecord::getUserId, userMarriageInformation.getUserId())
-                                    .eq(RightAcquireRecord::getMiId, userMarriageInformation.getMiId())
-                                    .eq(RightAcquireRecord::getAcquireType, RightAcquireEnum.GIFT)
-                                    .ge(RightAcquireRecord::getCreateTime, monthStartTime)
-                                    .le(RightAcquireRecord::getCreateTime, monthEndTime)) == 0) {
-                                rightApplicationService.acquireNewMIRight(userMarriageInformation.getUserId(), userMarriageInformation.getMiId());
-                            }
-                        }
-                    }
-                }
-                log.error("赠送权益任务结束");
-            }
-        } catch (Exception e) {
-            log.error("赠送权益任务异常", e);
-        }
-    }
+//    @Scheduled(cron = "0 0 0 1 * *")
+//    public void handle() {
+//        try {
+//            log.error("赠送权益任务开始");
+//            //一个月整前的资料赠送权益
+//            LocalDate now = LocalDate.now();
+//            LocalDateTime monthStartTime = YearMonth.from(now).atDay(1).atTime(0, 0, 0);
+//            LocalDateTime monthEndTime = YearMonth.from(now).plusMonths(1).atDay(1).minusDays(1).atTime(23, 59, 59);
+//            int count = userMarriageInformationDao.selectCount(new LambdaQueryWrapper<UserMarriageInformation>());
+//            if (count > 0) {
+//                int num = 100;
+//                for (int i = 0; i < count; i += num) {
+//                    List<UserMarriageInformation> list = userMarriageInformationDao.selectList(new LambdaQueryWrapper<UserMarriageInformation>()
+//                            .last("limit " + i + "," + num));
+//                    if (CollUtil.isNotEmpty(list)) {
+//                        for (UserMarriageInformation userMarriageInformation : list) {
+//                            //判断资料是否领取过免费权益
+//                            if (rightAcquireRecordDao.selectCount(new LambdaQueryWrapper<RightAcquireRecord>()
+//                                    .eq(RightAcquireRecord::getUserId, userMarriageInformation.getUserId())
+//                                    .eq(RightAcquireRecord::getMiId, userMarriageInformation.getMiId())
+//                                    .eq(RightAcquireRecord::getAcquireType, RightAcquireEnum.GIFT)
+//                                    .ge(RightAcquireRecord::getCreateTime, monthStartTime)
+//                                    .le(RightAcquireRecord::getCreateTime, monthEndTime)) == 0) {
+//                                rightApplicationService.acquireNewMIRight(userMarriageInformation.getUserId(), userMarriageInformation.getMiId());
+//                            }
+//                        }
+//                    }
+//                }
+//                log.error("赠送权益任务结束");
+//            }
+//        } catch (Exception e) {
+//            log.error("赠送权益任务异常", e);
+//        }
+//    }
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/application/task/MarriageInformationContactApplyTask.java

@@ -0,0 +1,56 @@
+package com.qniao.dam.application.task;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qniao.dam.domain.aggregate.mica.MarriageInformationContactApplyAggregate;
+import com.qniao.dam.domain.aggregate.mica.entity.MarriageInformationContactApply;
+import com.qniao.dam.domain.aggregate.right.valueobj.RightAcquireRecord;
+import com.qniao.dam.domian.aggregate.mica.constant.MarriageInformationContactApplyStatusEnum;
+import com.qniao.dam.domian.aggregate.right.constant.RightAcquireEnum;
+import com.qniao.dam.infrastructure.persistent.dao.mica.MarriageInformationContactApplyDao;
+import com.qniao.das.domian.aggregate.marriageinformation.UserMarriageInformation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Component
+@Slf4j
+public class MarriageInformationContactApplyTask {
+
+    @Resource
+    private MarriageInformationContactApplyDao marriageInformationContactApplyDao;
+    @Resource
+    private MarriageInformationContactApplyAggregate marriageInformationContactApplyAggregate;
+
+    @Scheduled(cron = "0 0 0 1 * *")
+    public void handle() {
+        try {
+            log.error("联系申请任务开始");
+            //一个月整前的资料赠送权益
+            LocalDateTime time = LocalDate.now().minusDays(7).atStartOfDay();
+            while (true) {
+                List<MarriageInformationContactApply> list = marriageInformationContactApplyDao.selectList(new LambdaQueryWrapper<MarriageInformationContactApply>()
+                        .eq(MarriageInformationContactApply::getStatus, MarriageInformationContactApplyStatusEnum.PENDING)
+                        .ge(MarriageInformationContactApply::getCreateTime, time)
+                        .last("limit 100"));
+                if (CollUtil.isNotEmpty(list)) {
+                    for (MarriageInformationContactApply apply : list) {
+                        apply.setStatus(MarriageInformationContactApplyStatusEnum.REJECTED);
+                        marriageInformationContactApplyAggregate.edit(apply);
+                    }
+                } else {
+                    break;
+                }
+            }
+            log.error("联系申请任务结束");
+        } catch (Exception e) {
+            log.error("联系申请任务异常", e);
+        }
+    }
+}
+