修改类目信息

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<JSONObject> getInfoByImg(String url, String type) throws Exception {
+        return CzgResult.success(shopDirectMerchantService.getInfoByImg(url, type));
+    }
+
     /**
      * 查询银行支行列表
      *

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);

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;
+
     /**
      * 支付宝状态
      */

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;
     /**
      * 一级类目
      */

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}

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java

@@ -131,9 +131,11 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl<ShopDirectMerchan
         // 设置其他字段
         vo.setCreateTime(entity.getCreateTime());
         vo.setUpdateTime(entity.getUpdateTime());
+        vo.setWechatApplyId(entity.getWechatApplyId());
         vo.setWechatStatus(entity.getWechatStatus());
         vo.setWechatErrorMsg(entity.getWechatErrorMsg());
         vo.setWechatSignUrl(entity.getWechatSignUrl());
+        vo.setAlipayOrderId(entity.getAlipayOrderId());
         vo.setAlipayStatus(entity.getAlipayStatus());
         vo.setAlipayErrorMsg(entity.getAlipayErrorMsg());
         vo.setAlipaySignUrl(entity.getAlipaySignUrl());