1.中煤核保，报价字段修改

src/main/java/com/ydtech/modules/order/controller/ZhongMeiOrderApiController.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.order.controller;
 
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
@@ -21,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 
 
 @Api(tags = "中煤财险 API ")
@@ -47,44 +47,44 @@ public class ZhongMeiOrderApiController {
     @QuoteVerification("报价授权")
     @PostMapping("/quote")
     @ApiOperation("报价")
-    public HttpResult quote(@RequestBody BaseQuoteVo<AccidentalDrivingVo> zmQuoteVo) {
+    public HttpResult<QuoteRespVo> quote(@RequestBody BaseQuoteVo<AccidentalDrivingVo> zmQuoteVo) {
         BaseQuoteInfoVo quoteInfo = this.insOrdersComponents.getQuoteInfo(zmQuoteVo.getOrderNo(), zmQuoteVo.getAgreementId());
         return this.zhongMeiOrderApiService.quote(quoteInfo, zmQuoteVo);
     }
 
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
-    public HttpResult audit(@RequestSingleParam(value = "companyId") String companyId) {
+    public HttpResult<Object> audit(@RequestSingleParam(value = "companyId") String companyId) {
         return this.zhongMeiOrderApiService.audit(companyId);
     }
 
     @PostMapping(value = "/submitImage")
     @ApiOperation(value = "提交影像信息")
-    public HttpResult submitImage(@RequestSingleParam(value = "companyId") String companyId) {
+    public HttpResult<Object> submitImage(@RequestSingleParam(value = "companyId") String companyId) {
         return this.zhongMeiOrderApiService.submitImage(companyId);
     }
 
     @PostMapping("/getPolicyPrint")
     @ApiOperation(value = "电子保单")
-    public HttpResult getPolicyPrint(@RequestBody PolicyPrintVo policyPrintVo) {
+    public HttpResult<List<String>> getPolicyPrint(@RequestBody PolicyPrintVo policyPrintVo) {
         return this.zhongMeiOrderApiService.getPolicyPrint(policyPrintVo);
     }
 
     @PostMapping("/paymentEnquiry")
     @ApiOperation(value = "缴费查询")
-    public HttpResult paymentEnquiry(@RequestSingleParam(value = "companyId") String companyId) {
+    public HttpResult<Object> paymentEnquiry(@RequestSingleParam(value = "companyId") String companyId) {
         return this.zhongMeiOrderApiService.paymentEnquiry(companyId);
     }
 
     @PostMapping("/underwritingCallback")
     @ApiOperation(value = "承保回调")
-    public HttpResult underwritingCallback(@RequestBody CoverageRequest coverageRequest) {
+    public HttpResult<Object> underwritingCallback(@RequestBody CoverageRequest coverageRequest) {
         return this.zhongMeiOrderApiService.underwritingCallback(coverageRequest);
     }
 
     @PostMapping("/auditCallback")
     @ApiOperation(value = "审核回调")
-    public HttpResult auditCallback(@RequestBody ApprovedRequest approvedRequest) {
+    public HttpResult<Object> auditCallback(@RequestBody ApprovedRequest approvedRequest) {
         return this.zhongMeiOrderApiService.auditCallback(approvedRequest);
     }
 

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.order.entity;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,8 +8,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.constants.enums.InsOrderStatus;
+import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
+import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -22,6 +28,7 @@ import java.time.LocalDateTime;
 @TableName(value = "ins_area_company", autoResultMap = true)
 @Data
 @ApiModel(value = "报价渠道")
+@NoArgsConstructor
 public class InsAreaCompany implements Serializable {
     /**
      * 主键
@@ -232,4 +239,21 @@ public class InsAreaCompany implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
+    public InsAreaCompany(QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
+        this.id = IdGenerate.nextId();
+        this.orderno = quoteRespVo.getOrderno();
+        this.agreementId = ptlAgreementAttribution.getId();
+        this.apiType = ptlAgreementAttribution.getApiType();
+        this.companyId = ptlAgreementAttribution.getInsCompanyId();
+        this.inscompany = ptlAgreementAttribution.getInsCompanyName();
+        this.jqpremium = BigDecimal.valueOf(quoteRespVo.getJqPremium());
+        this.sypremium = BigDecimal.valueOf(quoteRespVo.getSyPremium());
+        this.taxamount = BigDecimal.valueOf(quoteRespVo.getTaxAmount());
+        this.sumpremium = BigDecimal.valueOf(quoteRespVo.getSumPermium());
+        this.riskinfo = JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList()));
+        this.kindinfo = JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList()));
+        this.orderstatus = InsOrderStatus.S_0.getCode();
+        this.companyId = quoteRespVo.getCompanyId();
+    }
+
 }

src/main/java/com/ydtech/modules/order/service/ZhongMeiOrderApiService.java

@@ -33,7 +33,7 @@ public interface ZhongMeiOrderApiService extends BaseOrderService<AccidentalDriv
      * @param coverageRequest
      * @return
      */
-    HttpResult underwritingCallback(CoverageRequest coverageRequest);
+    HttpResult<Object> underwritingCallback(CoverageRequest coverageRequest);
 
     /**
      * 审核回调
@@ -41,14 +41,14 @@ public interface ZhongMeiOrderApiService extends BaseOrderService<AccidentalDriv
      * @param approvedRequest
      * @return
      */
-    HttpResult auditCallback(ApprovedRequest approvedRequest);
+    HttpResult<Object> auditCallback(ApprovedRequest approvedRequest);
 
     /**
      * 中煤保单下载
      *
      * @return 响应
      */
-    HttpResult getPolicyPrint(PolicyPrintVo policyPrintVo);
+    HttpResult<List<String>> getPolicyPrint(PolicyPrintVo policyPrintVo);
 
     /**
      * 缴费查询
@@ -56,5 +56,5 @@ public interface ZhongMeiOrderApiService extends BaseOrderService<AccidentalDriv
      * @param companyId 子订单号
      * @return 响应
      */
-    HttpResult paymentEnquiry(String companyId);
+    HttpResult<Object> paymentEnquiry(String companyId);
 }