diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/api/IInvoiceSettingNewController.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/api/IInvoiceSettingNewController.java
new file mode 100644
index 0000000000000000000000000000000000000000..356fd20bde8eb3c0ebd77e7f8b2a54917e235d17
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/api/IInvoiceSettingNewController.java
@@ -0,0 +1,25 @@
+package com.seasky.seaskyocr.api;
+
+import com.seasky.core.common.Result;
+import com.seasky.seaskyocr.dto.claimAudit.*;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author zhuxiang
+ * @since 2023-4-6
+ */
+@FeignClient(name = "seasky-ocr", url = "${seaskyOcrHttpUrl}")
+@Api(tags = "妯℃澘鐩稿叧鎺ュ彛")
+@RequestMapping("model")
+public interface IInvoiceSettingNewController {
+
+ @PostMapping(path = "pc/v1/listModelName")
+ Result<ModelOut> listModelName();
+
+ @PostMapping(path = "pc/v1/listModelPropertyByModelName")
+ Result<ModelPropertyOut> listModelPropertyByModelName(@RequestBody ModelQry qry);
+}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelOut.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelOut.java
new file mode 100644
index 0000000000000000000000000000000000000000..c87aa46353514c6ed3a7ab9ed842e41123d162ef
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelOut.java
@@ -0,0 +1,23 @@
+package com.seasky.seaskyocr.dto.claimAudit;
+
+import com.seasky.core.ddd.base.objects.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zhuxiang
+ * @since 2023-4-6
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class ModelOut extends BaseDto {
+
+ @ApiModelProperty(value = "妯″瀷缂栧彿")
+ private String modelCode;
+
+ @ApiModelProperty(value = "妯″瀷鍚嶇О")
+ private String modelName;
+}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelPropertyOut.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelPropertyOut.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9fe6f209f7420c94b24d03a6fe356a406df80ec
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelPropertyOut.java
@@ -0,0 +1,26 @@
+package com.seasky.seaskyocr.dto.claimAudit;
+
+import com.seasky.core.ddd.base.objects.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zhuxiang
+ * @since 2023-4-6
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class ModelPropertyOut extends BaseDto {
+
+ @ApiModelProperty(value = "灞炴€х紪鍙�")
+ private String propertyCode;
+
+ @ApiModelProperty(value = "灞炴€у悕绉�")
+ private String propertyName;
+
+ @ApiModelProperty(value = "灞炴€у綊绫�")
+ private String propertyType;
+}
\ No newline at end of file
diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelQry.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelQry.java
new file mode 100644
index 0000000000000000000000000000000000000000..f1878531a3e3e545bbe2a268f59bceb58361bd74
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/claimAudit/ModelQry.java
@@ -0,0 +1,20 @@
+package com.seasky.seaskyocr.dto.claimAudit;
+
+import com.seasky.core.ddd.base.objects.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zhuxiang
+ * @since 2023-4-6
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class ModelQry extends BaseDto {
+
+ @ApiModelProperty(value = "妯″瀷鍚嶇О")
+ private String modelName;
+}
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
index e8eb8dcfabc058eccb5b127771b2c90daf1da723..d8814bee0eec4a92048a0a2f57c2d623989af371 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
@@ -135,7 +135,7 @@ public class ClaimAuditQueryServiceImpl implements ClaimAuditQueryService {
JSONObject resultJsonObj = jsonObject.getJSONObject(ocrConfigPO.getResult());
boolean verifyFlag = resultJsonObj.getString(verifyMapJson.getString("verify")).equals(verifyMapJson.getString("success"));//楠岀湡缁撴灉flag
if (!verifyFlag){
- throw ExceptionUtil.getException(null,"鍚堝悎楠岀湡鎺ュ彛澶辫触锛�"+resultJsonObj.getString(verifyMapJson.getString("message"))+" || 鍘熷悎鍚堥獙鐪熸帴鍙ｈ繑鍥炵殑鏁版嵁锛�"+jsonData+" || 鍚堝悎楠岀湡鍙傛暟: "+ heHeInvoiceQry);
+ throw ExceptionUtil.getException(null,"鍚堝悎楠岀湡涓嶉€氳繃锛�"+resultJsonObj.getString(verifyMapJson.getString("message"))+" || 鍚堝悎楠岀湡鍙傛暟: "+ heHeInvoiceQry);
}
}else {
throw ExceptionUtil.getException(null,"鍚堝悎楠岀湡鎺ュ彛璋冪敤澶辫触锛�"+jsonObject.getString(ocrConfigPO.getMessage())+" || 鍚堝悎楠岀湡鍙傛暟: "+ heHeInvoiceQry);
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/InvoiceSettingNewController.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/InvoiceSettingNewController.java
new file mode 100644
index 0000000000000000000000000000000000000000..ada1d0cb1b4a58e8cbf446b1eaaa9129198976fa
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/InvoiceSettingNewController.java
@@ -0,0 +1,61 @@
+package com.seasky.seaskyocr.interfaces.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.seasky.core.common.ResponseCode;
+import com.seasky.core.common.Result;
+import com.seasky.seaskyocr.api.IInvoiceSettingNewController;
+import com.seasky.seaskyocr.application.query.claimAudit.ClaimAuditQueryService;
+import com.seasky.seaskyocr.dto.claimAudit.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.seasky.core.common.Response.ok;
+
+/**
+ * @author zhuxiang
+ * @since 2023-4-6
+ */
+@RestController
+@RequestMapping("model")
+public class InvoiceSettingNewController implements IInvoiceSettingNewController {
+
+ @Autowired
+ ClaimAuditQueryService qryService;
+
+ @Override
+ public Result<ModelOut> listModelName() {
+ List<BillTypeOut> billTypeOutList = qryService.listBillType();
+ List<ModelOut> modelList = new ArrayList<>();
+ if (!ObjectUtil.isEmpty(billTypeOutList)) {
+ for (BillTypeOut billTypeOut : billTypeOutList) {
+ ModelOut modelOut = new ModelOut();
+ modelOut.setModelCode(billTypeOut.getInvoiceNo());
+ modelOut.setModelName(billTypeOut.getInvoiceName());
+ modelList.add(modelOut);
+ }
+ }
+ return ok(ResponseCode.SUCCESS, modelList);
+ }
+
+ @Override
+ public Result<ModelPropertyOut> listModelPropertyByModelName(ModelQry qry) {
+ BillTypePropertyQry billTypePropertyQry = new BillTypePropertyQry();
+ billTypePropertyQry.setInvoiceName(qry.getModelName());
+ List<BillTypePropertyOut> billTypePropertyOutList = qryService.listBillTypePropertyByBillType(billTypePropertyQry);
+ List<ModelPropertyOut> modelPropertyOutList = new ArrayList<>();
+ if (!ObjectUtil.isEmpty(billTypePropertyOutList)) {
+ for (BillTypePropertyOut billTypePropertyOut : billTypePropertyOutList) {
+ ModelPropertyOut modelPropertyOut = new ModelPropertyOut();
+ modelPropertyOut.setPropertyCode(billTypePropertyOut.getPropertyCode());
+ modelPropertyOut.setPropertyName(billTypePropertyOut.getPropertyName());
+ modelPropertyOut.setPropertyType(billTypePropertyOut.getPropertyType());
+ modelPropertyOutList.add(modelPropertyOut);
+ }
+ }
+ return ok(ResponseCode.SUCCESS, modelPropertyOutList);
+ }
+}