push

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

@@ -14,6 +14,7 @@ import com.yd.csf.api.dto.QueryCommissionExpectedByPageNewResponse;
 import com.yd.csf.api.dto.QueryCommissionExpectedByPageResponse;
 import com.yd.csf.api.dto.QueryCommissionExpectedByPageResponse;
 import com.yd.csf.api.dto.ReceivableReportResponse;
 import com.yd.csf.api.dto.ReceivableReportResponse;
 import com.yd.csf.api.service.ApiCommissionExpectedService;
 import com.yd.csf.api.service.ApiCommissionExpectedService;
+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.dto.*;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.model.CommissionExpected;
@@ -34,6 +35,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
@@ -253,6 +255,16 @@ public class ApiCommissionExpectedController {
     }
     }
 
 
     /**
     /**
+     * 修改入账状态
+     * @param request
+     * @return
+     */
+    @PutMapping("/edit/status")
+    public Result editStatus(@Validated @RequestBody CommissionExpectedEditStatusRequest request) {
+        return apiCommissionExpectedService.editStatus(request);
+    }
+
+    /**
      * 应收款导出（旧）
      * 应收款导出（旧）
      *
      *
      * @param commissionExpectedQueryRequest
      * @param commissionExpectedQueryRequest

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

 package com.yd.csf.api.service;
 package com.yd.csf.api.service;
 
 
+import com.yd.common.result.Result;
+import com.yd.csf.feign.request.commission.CommissionExpectedEditStatusRequest;
 import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -7,4 +9,6 @@ import java.io.UnsupportedEncodingException;
 
 
 public interface ApiCommissionExpectedService {
 public interface ApiCommissionExpectedService {
     void exportCommissionExpectedNew(CommissionExpectedQueryRequest commissionExpectedQueryRequest, HttpServletResponse response) throws UnsupportedEncodingException;
     void exportCommissionExpectedNew(CommissionExpectedQueryRequest commissionExpectedQueryRequest, HttpServletResponse response) throws UnsupportedEncodingException;
+
+    Result editStatus(CommissionExpectedEditStatusRequest request);
 }
 }

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

@@ -7,7 +7,9 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
 import com.yd.csf.api.service.ApiCommissionExpectedService;
 import com.yd.csf.api.service.ApiCommissionExpectedService;
+import com.yd.csf.feign.request.commission.CommissionExpectedEditStatusRequest;
 import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.service.CommissionExpectedService;
 import com.yd.csf.service.service.CommissionExpectedService;
@@ -84,4 +86,21 @@ public class ApiCommissionExpectedServiceImpl implements ApiCommissionExpectedSe
         }
         }
 
 
     }
     }
+
+    /**
+     * 修改入账状态
+     * @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();
+    }
 }
 }