From 3ad73263c56da4a264dbe50da923fe72a13fcef0 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 8 Jan 2026 16:21:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E7=9B=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/EntryManagerController.java | 20 +++++++++++++++++++ .../com/czg/mq/EntryManagerMqListener.java | 2 ++ .../czg/order/entity/ShopDirectMerchant.java | 3 +++ .../czg/system/entity/SysCategoryInfo.java | 4 ++++ .../order/dto/AggregateMerchantVO.java | 2 ++ .../impl/ShopDirectMerchantServiceImpl.java | 2 ++ 6 files changed, 33 insertions(+) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java index b5ac96318..25ee2cda0 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java @@ -1,5 +1,6 @@ package com.czg.controller.admin; +import com.alibaba.fastjson2.JSONObject; import com.czg.EntryManager; import com.czg.annotation.Debounce; import com.czg.dto.req.AggregateMerchantDto; @@ -30,6 +31,25 @@ public class EntryManagerController { @Resource private EntryManagerTask entryManagerTask; + /** + * ocr识别填充 + * 阿里 ocr识别图片 + * 本接口支持：PNG、JPG、JPEG、BMP、GIF、TIFF、WebP、PDF。 + * 图片长宽需要大于 15 像素，小于 8192 像素。 + * 长宽比需要小于 50。长宽均大于 500px。 + * 图片二进制文件不能超过 10MB。 + * 图片过大会影响接口响应速度，建议使用小于 1.5M 图片进行识别， + * + * @param url 图片地址 + * @param type IdCard 身份证 + * BankCard 银行卡 + * BusinessLicense 营业执照 + */ + @GetMapping("getInfoByImg") + public CzgResult getInfoByImg(String url, String type) throws Exception { + return CzgResult.success(shopDirectMerchantService.getInfoByImg(url, type)); + } + /** * 查询银行支行列表 * diff --git a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java index 540c3ecdd..223765759 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java @@ -75,9 +75,11 @@ public class EntryManagerMqListener { ShopDirectMerchant merchant = new ShopDirectMerchant(); merchant.setShopId(entry.getShopId()); + merchant.setWechatApplyId(resp.getWechatApplyId()); merchant.setWechatStatus(resp.getWechatStatus()); merchant.setWechatErrorMsg(resp.getWechatErrorMsg()); + merchant.setAlipayOrderId(resp.getAlipayOrderId()); merchant.setAlipayStatus(resp.getAlipayStatus()); merchant.setAlipayErrorMsg(resp.getAlipayErrorMsg()); shopDirectMerchantService.updateById(merchant); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java index 5fbea4472..7be0bfb84 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java @@ -80,6 +80,7 @@ public class ShopDirectMerchant implements Serializable { private String errorMsg; + private String wechatApplyId; /** * 微信状态 */ @@ -94,6 +95,8 @@ public class ShopDirectMerchant implements Serializable { */ private String wechatSignUrl; + private String alipayOrderId; + /** * 支付宝状态 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysCategoryInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysCategoryInfo.java index 1fe2a78c7..5c6346e46 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysCategoryInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysCategoryInfo.java @@ -37,6 +37,10 @@ public class SysCategoryInfo implements Serializable { @Id(keyType = KeyType.Auto) private BigInteger id; + /** + * 一级类目code + */ + private String firstCategoryCode; /** * 一级类目 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java index 28498f898..989788b9f 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java @@ -32,6 +32,8 @@ public class AggregateMerchantVO extends AggregateMerchantDto{ * 微信进件签名地址 */ private String wechatSignUrl; + private String wechatApplyId; + private String alipayOrderId; /** * {@link com.czg.PayCst.EntryStatus} diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java index 9aaaff0a0..beae12299 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java @@ -131,9 +131,11 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl