push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java

@@ -12,6 +12,8 @@ import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.api.dto.CommissionExcelDTO;
 import com.yd.csf.api.dto.CommissionExcelDTO;
+import com.yd.csf.api.service.ApiCommissionService;
+import com.yd.csf.feign.request.commission.CommissionExpectedEditStatusRequest;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.component.CommissionAsyncService;
 import com.yd.csf.service.component.CommissionAsyncService;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.dto.*;
@@ -29,10 +31,12 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
@@ -75,6 +79,8 @@ public class ApiCommissionController {
     private PolicyService policyService;
     private PolicyService policyService;
     @Resource
     @Resource
     private TransactionTemplate transactionTemplate;
     private TransactionTemplate transactionTemplate;
+    @Autowired
+    private ApiCommissionService apiCommissionService;
 
 
 
 
     @PostMapping("/upload/excel")
     @PostMapping("/upload/excel")
@@ -502,6 +508,16 @@ public class ApiCommissionController {
     }
     }
 
 
     /**
     /**
+     * 修改入账状态
+     * @param request
+     * @return
+     */
+    @PutMapping("/edit/status")
+    public Result editStatus(@Validated @RequestBody CommissionExpectedEditStatusRequest request) {
+        return apiCommissionService.editStatus(request);
+    }
+
+    /**
      * 入账记录
      * 入账记录
      *
      *
      * @param pageByCommissionexpectedBizIdRequest
      * @param pageByCommissionexpectedBizIdRequest

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiCommissionService.java

+package com.yd.csf.api.service;
+
+import com.yd.common.result.Result;
+import com.yd.csf.feign.request.commission.CommissionExpectedEditStatusRequest;
+
+public interface ApiCommissionService {
+    Result editStatus(CommissionExpectedEditStatusRequest request);
+}

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiCommissionServiceImpl.java

+package com.yd.csf.api.service.impl;
+
+import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
+import com.yd.csf.api.service.ApiCommissionService;
+import com.yd.csf.feign.request.commission.CommissionExpectedEditStatusRequest;
+import com.yd.csf.service.model.CommissionExpected;
+import com.yd.csf.service.service.CommissionExpectedService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class ApiCommissionServiceImpl implements ApiCommissionService {
+
+    @Autowired
+    private CommissionExpectedService commissionExpectedService;
+
+    /**
+     * 修改入账状态
+     * @param request
+     * @return
+     */
+    @Override
+    public Result editStatus(CommissionExpectedEditStatusRequest request) {
+        CommissionExpected commissionExpected = commissionExpectedService.queryOne(request.getCommissionExpectedBizId());
+        if (commissionExpected == null) {
+            throw new BusinessException("预计来佣数据不存在");
+        }
+        commissionExpected.setStatus(request.getStatus());
+        commissionExpected.setStatusDesc(request.getStatusDesc());
+        commissionExpectedService.saveOrUpdate(commissionExpected);
+        return Result.success();
+    }
+}

yd-csf-feign/src/main/java/com/yd/csf/feign/request/commission/CommissionExpectedEditStatusRequest.java

+package com.yd.csf.feign.request.commission;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class CommissionExpectedEditStatusRequest {
+
+    /**
+     * 预计来佣业务ID
+     */
+    @NotBlank(message = "预计来佣业务ID不能为空")
+    private String commissionExpectedBizId;
+
+    /**
+     * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_expected_commission_status
+     */
+    @NotBlank(message = "入账状态不能为空")
+    private String status;
+
+    /**
+     * 设置入账状态-修改理由
+     */
+    private String statusDesc;
+}

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionExpectedService.java

@@ -86,4 +86,6 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
     void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException;
     void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException;
 
 
     Boolean changeStatus(CommissionExpectedChangeStatusRequest commissionExpectedChangeStatusRequest);
     Boolean changeStatus(CommissionExpectedChangeStatusRequest commissionExpectedChangeStatusRequest);
+
+    CommissionExpected queryOne(String commissionExpectedBizId);
 }
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -1486,6 +1487,14 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         return this.updateById(updateObj);
         return this.updateById(updateObj);
     }
     }
 
 
+    @Override
+    public CommissionExpected queryOne(String commissionExpectedBizId) {
+        return this.baseMapper.selectOne(new LambdaQueryWrapper<CommissionExpected>()
+                .eq(CommissionExpected::getCommissionExpectedBizId,commissionExpectedBizId)
+                .last(" limit 1")
+        );
+    }
+
     private Policy convertPolicy(PolicyFollow policyFollow,String effectiveDate,String coolingOffEndDate) {
     private Policy convertPolicy(PolicyFollow policyFollow,String effectiveDate,String coolingOffEndDate) {
         Policy policy = new Policy();
         Policy policy = new Policy();
         BeanUtil.copyProperties(policyFollow, policy);
         BeanUtil.copyProperties(policyFollow, policy);