Commit b9668f66 by zhangxingmin

push

parent 527cdcf1
...@@ -5,6 +5,7 @@ import com.yd.common.result.Result; ...@@ -5,6 +5,7 @@ import com.yd.common.result.Result;
import com.yd.csf.api.service.ApiPolicyReceiptService; import com.yd.csf.api.service.ApiPolicyReceiptService;
import com.yd.csf.feign.client.policyreceipt.ApiPolicyReceiptFeignClient; import com.yd.csf.feign.client.policyreceipt.ApiPolicyReceiptFeignClient;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptEditRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest;
import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse; import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse;
import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptPageResponse; import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptPageResponse;
...@@ -58,6 +59,16 @@ public class ApiPolicyReceiptController implements ApiPolicyReceiptFeignClient { ...@@ -58,6 +59,16 @@ public class ApiPolicyReceiptController implements ApiPolicyReceiptFeignClient {
} }
/** /**
* 编辑-保单回执信息
* @param request
* @return
*/
@Override
public Result edit(ApiPolicyReceiptEditRequest request) {
return apiPolicyReceiptService.edit(request);
}
/**
* 编辑-回执状态 * 编辑-回执状态
* @param policyReceiptBizId 保单回执信息表唯一标识(业务ID) * @param policyReceiptBizId 保单回执信息表唯一标识(业务ID)
* @param receiptStatus 回执状态(CONFIRMED-已确认 UNCONFIRMED-未确认) * @param receiptStatus 回执状态(CONFIRMED-已确认 UNCONFIRMED-未确认)
......
...@@ -3,6 +3,7 @@ package com.yd.csf.api.service; ...@@ -3,6 +3,7 @@ package com.yd.csf.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptEditRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest;
import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse; import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse;
import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptPageResponse; import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptPageResponse;
...@@ -14,5 +15,7 @@ public interface ApiPolicyReceiptService { ...@@ -14,5 +15,7 @@ public interface ApiPolicyReceiptService {
Result add(ApiPolicyReceiptAddRequest request); Result add(ApiPolicyReceiptAddRequest request);
Result edit(ApiPolicyReceiptEditRequest request);
Result editReceiptStatus(String policyReceiptBizId, String receiptStatus); Result editReceiptStatus(String policyReceiptBizId, String receiptStatus);
} }
...@@ -8,6 +8,7 @@ import com.yd.common.result.Result; ...@@ -8,6 +8,7 @@ import com.yd.common.result.Result;
import com.yd.common.utils.RandomStringGenerator; import com.yd.common.utils.RandomStringGenerator;
import com.yd.csf.api.service.ApiPolicyReceiptService; import com.yd.csf.api.service.ApiPolicyReceiptService;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptEditRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest;
import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse; import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse;
import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptPageResponse; import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptPageResponse;
...@@ -95,6 +96,31 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService { ...@@ -95,6 +96,31 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
} }
/** /**
* 编辑-保单回执信息
* @param request
* @return
*/
@Override
public Result edit(ApiPolicyReceiptEditRequest request) {
//校验保单回执信息是否存在
PolicyReceipt policyReceipt = iPolicyReceiptService.queryOne(request.getPolicyReceiptBizId());
if (Objects.isNull(policyReceipt)) {
throw new BusinessException("保单回执信息不存在");
}
//校验保单信息是否存在
Policy policy = policyService.queryOne(request.getPolicyNo());
if (Objects.isNull(policy)) {
throw new BusinessException("保单信息不存在");
}
policyReceipt.setPolicyNo(request.getPolicyNo());
policyReceipt.setReceiptDate(request.getReceiptDate());
policyReceipt.setReceiptStatus(request.getReceiptStatus());
policyReceipt.setPolicyHolderSignature(!CollectionUtils.isEmpty(request.getPolicyHolderSignatureList()) ? String.join(";", request.getPolicyHolderSignatureList()) : "");
iPolicyReceiptService.saveOrUpdate(policyReceipt);
return Result.success();
}
/**
* 编辑-回执状态 * 编辑-回执状态
* @param policyReceiptBizId 保单回执信息表唯一标识(业务ID) * @param policyReceiptBizId 保单回执信息表唯一标识(业务ID)
* @param receiptStatus 回执状态(CONFIRMED-已确认 UNCONFIRMED-未确认) * @param receiptStatus 回执状态(CONFIRMED-已确认 UNCONFIRMED-未确认)
......
...@@ -3,6 +3,7 @@ package com.yd.csf.feign.client.policyreceipt; ...@@ -3,6 +3,7 @@ package com.yd.csf.feign.client.policyreceipt;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.csf.feign.fallback.policyreceipt.ApiPolicyReceiptFeignFallbackFactory; import com.yd.csf.feign.fallback.policyreceipt.ApiPolicyReceiptFeignFallbackFactory;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptEditRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest;
import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse; import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
...@@ -41,6 +42,14 @@ public interface ApiPolicyReceiptFeignClient { ...@@ -41,6 +42,14 @@ public interface ApiPolicyReceiptFeignClient {
Result add(@Validated @RequestBody ApiPolicyReceiptAddRequest request); Result add(@Validated @RequestBody ApiPolicyReceiptAddRequest request);
/** /**
* 编辑-保单回执信息
* @param request
* @return
*/
@PostMapping("/edit")
Result edit(@Validated @RequestBody ApiPolicyReceiptEditRequest request);
/**
* 编辑-回执状态 * 编辑-回执状态
* @param policyReceiptBizId 保单回执信息表唯一标识(业务ID) * @param policyReceiptBizId 保单回执信息表唯一标识(业务ID)
* @param receiptStatus 回执状态(CONFIRMED-已确认 UNCONFIRMED-未确认) * @param receiptStatus 回执状态(CONFIRMED-已确认 UNCONFIRMED-未确认)
......
...@@ -3,6 +3,7 @@ package com.yd.csf.feign.fallback.policyreceipt; ...@@ -3,6 +3,7 @@ package com.yd.csf.feign.fallback.policyreceipt;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.csf.feign.client.policyreceipt.ApiPolicyReceiptFeignClient; import com.yd.csf.feign.client.policyreceipt.ApiPolicyReceiptFeignClient;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptAddRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptEditRequest;
import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest; import com.yd.csf.feign.request.policyreceipt.ApiPolicyReceiptPageRequest;
import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse; import com.yd.csf.feign.response.policyreceipt.ApiPolicyReceiptDetailResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -34,6 +35,11 @@ public class ApiPolicyReceiptFeignFallbackFactory implements FallbackFactory<Api ...@@ -34,6 +35,11 @@ public class ApiPolicyReceiptFeignFallbackFactory implements FallbackFactory<Api
} }
@Override @Override
public Result edit(ApiPolicyReceiptEditRequest request) {
return null;
}
@Override
public Result editReceiptStatus(String policyReceiptBizId, String receiptStatus) { public Result editReceiptStatus(String policyReceiptBizId, String receiptStatus) {
return null; return null;
} }
......
package com.yd.csf.feign.request.policyreceipt; package com.yd.csf.feign.request.policyreceipt;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
@Data @Data
public class ApiPolicyReceiptEditRequest { public class ApiPolicyReceiptEditRequest {
/** /**
* 保单回执表唯一业务ID
*/
@NotBlank(message = "保单回执表唯一业务ID不能为空")
private String policyReceiptBizId;
/**
* 保单号 * 保单号
*/ */
@NotBlank(message = "保单号不能为空") @NotBlank(message = "保单号不能为空")
...@@ -19,5 +27,17 @@ public class ApiPolicyReceiptEditRequest { ...@@ -19,5 +27,17 @@ public class ApiPolicyReceiptEditRequest {
* 回执日期 * 回执日期
*/ */
@NotNull(message = "回执日期不能为空") @NotNull(message = "回执日期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime receiptDate; private LocalDateTime receiptDate;
/**
* 回执状态(CONFIRMED-已确认 UNCONFIRMED-未确认)
*/
@NotBlank(message = "回执状态不能为空")
private String receiptStatus;
/**
* 保单持有人签名(图片URL)
*/
private List<String> policyHolderSignatureList;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment