Commit df3b953e by zhangxingmin

push

parent e10d26a0
...@@ -16,9 +16,14 @@ import com.yd.csf.service.model.PolicyReceipt; ...@@ -16,9 +16,14 @@ import com.yd.csf.service.model.PolicyReceipt;
import com.yd.csf.service.service.IPolicyReceiptService; import com.yd.csf.service.service.IPolicyReceiptService;
import com.yd.csf.service.service.PolicyService; import com.yd.csf.service.service.PolicyService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
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.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Objects; import java.util.Objects;
@Slf4j @Slf4j
...@@ -62,6 +67,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService { ...@@ -62,6 +67,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
ApiPolicyReceiptDetailResponse response = new ApiPolicyReceiptDetailResponse(); ApiPolicyReceiptDetailResponse response = new ApiPolicyReceiptDetailResponse();
BeanUtils.copyProperties(policy,response); BeanUtils.copyProperties(policy,response);
BeanUtils.copyProperties(policyReceipt,response); BeanUtils.copyProperties(policyReceipt,response);
response.setPolicyHolderSignatureList(StringUtils.isNotBlank(policyReceipt.getPolicyHolderSignature()) ? Arrays.asList(policyReceipt.getPolicyHolderSignature().split(";").clone()) : new ArrayList<>());
return Result.success(response); return Result.success(response);
} }
...@@ -81,6 +87,8 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService { ...@@ -81,6 +87,8 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
policyReceipt.setPolicyNo(request.getPolicyNo()); policyReceipt.setPolicyNo(request.getPolicyNo());
policyReceipt.setReceiptDate(request.getReceiptDate()); policyReceipt.setReceiptDate(request.getReceiptDate());
policyReceipt.setPolicyReceiptBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_POLICY_RECEIPT.getCode())); policyReceipt.setPolicyReceiptBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_POLICY_RECEIPT.getCode()));
policyReceipt.setReceiptStatus(request.getReceiptStatus());
policyReceipt.setPolicyHolderSignature(!CollectionUtils.isEmpty(request.getPolicyHolderSignatureList()) ? String.join(";", request.getPolicyHolderSignatureList()) : "");
iPolicyReceiptService.saveOrUpdate(policyReceipt); iPolicyReceiptService.saveOrUpdate(policyReceipt);
return Result.success(); return Result.success();
} }
......
...@@ -5,6 +5,7 @@ import lombok.Data; ...@@ -5,6 +5,7 @@ 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 ApiPolicyReceiptAddRequest { public class ApiPolicyReceiptAddRequest {
...@@ -21,4 +22,14 @@ public class ApiPolicyReceiptAddRequest { ...@@ -21,4 +22,14 @@ public class ApiPolicyReceiptAddRequest {
@NotNull(message = "回执日期不能为空") @NotNull(message = "回执日期不能为空")
private LocalDateTime receiptDate; private LocalDateTime receiptDate;
/**
* 回执状态(CONFIRMED-已确认 UNCONFIRMED-未确认)
*/
@NotBlank(message = "回执状态不能为空")
private String receiptStatus;
/**
* 保单持有人签名(图片URL)
*/
private List<String> policyHolderSignatureList;
} }
...@@ -4,6 +4,7 @@ import lombok.Data; ...@@ -4,6 +4,7 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
@Data @Data
public class ApiPolicyReceiptDetailResponse { public class ApiPolicyReceiptDetailResponse {
...@@ -35,6 +36,11 @@ public class ApiPolicyReceiptDetailResponse { ...@@ -35,6 +36,11 @@ public class ApiPolicyReceiptDetailResponse {
private String policyHolderSignature; private String policyHolderSignature;
/** /**
* 保单持有人签名(图片URL)列表
*/
private List<String> policyHolderSignatureList;
/**
* 通用备注 * 通用备注
*/ */
private String remark; private String remark;
......
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