From 967898b07990a5aa0ca50a0d251a0f3f06fc62bd Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 18 七月 2025 20:48:52 +0800
Subject: [PATCH] 修改订单controller中bug,读取工商信息,动态获取水母信息

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java |   58 +++++++++++++++++++++++++---------------------------------
 1 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java
index b920461..acb24a9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java
@@ -168,15 +168,22 @@
             throw new ServiceException("公司不存在");
         }
         BusinessVO vo = new BusinessVO();
+        // 先查企业工商信息 更新数据
+        JSONObject jsonObject = getQiChaChaBasicDetailsCompany(company.getCompanyName());
+        company.setOperName(jsonObject.getString("OperName"));
+        company.setBelongOrg(jsonObject.getString("BelongOrg"));
+        company.setRegistrationStatus(jsonObject.getString("Status"));
+              company.setRegisteredCapital(jsonObject.getString("RegisteredCapital"));
+        company.setPaidInFunds(jsonObject.getString("PaidUpCapital"));
+        companyMapper.updateById(company);
         BeanUtils.copyProperties(company, vo);
-        vo.setPlace(company.getCity()+company.getProvince()+company.getArea());
+
+        JSONObject area = (JSONObject) jsonObject.get("Area");
+        vo.setPlace(area.getString("Province")+"-"+area.getString("City")+"-"+area.getString("County"));
+        vo.setCompanyCategoryName(jsonObject.getString("EconKind"));
 
         String name = companyTypeService.getById(company.getCompanyCategory()).getName();
         vo.setCompanyCategoryName(name);
-
-        //todo 再查企业工商信息 覆盖掉之前的
-
-
         return vo;
     }
 
@@ -208,22 +215,7 @@
 
 
     /**
-     * 经营异常核查
-     * @param companyName
-     * @return
-     * VerifyResult  int	数据是否存在(1-存在,0-不存在)
-     * Data  	List<Object>  数据信息
-     * Data:[{
-     *     AddReason  列入经营异常名录原因
-     *     AddDate	列入日期
-     *     RomoveReason  移出经营异常名录原因(保留字段)
-     *     RemoveDate   移出日期(保留字段)
-     *     DecisionOffice  	作出决定机关
-     *     RemoveDecisionOffice  移出决定机关(保留字段)
-     * }]
-     * Status
-     * Message
-     * OrderNumber
+     * 查询工商信息
      */
     public  JSONObject getQiChaChaBasicDetailsCompany(String companyName){
         Object cacheObject = redisCache.getCacheObject("qichacha_" +"basic_"+ companyName);
@@ -326,12 +318,12 @@
     public R change(String id) {
 //        System.err.println(getReport("ZZD20250508017232394218445"));
         ChangeVO changeVO = new ChangeVO();
-       /* Company companyInfo = companyMapper.selectById(id);
+        Company companyInfo = companyMapper.selectById(id);
         if (null == companyInfo || companyInfo.getIsDelete() != 0) {
             throw new ServiceException("公司不存在");
-        }*/
-//        JSONObject jsonObject=getReport(companyInfo.getLink().split("=")[1]);
-        JSONObject jsonObject=getReport("ZZD20250508017232394218445");
+        }
+        JSONObject jsonObject=getReport(companyInfo.getLink().split("=")[1]);
+//        JSONObject jsonObject=getReport("ZZD20250508017232394218445");
         if (!"1001".equals(jsonObject.getString("code"))){
             return R.fail(jsonObject.get("msg"));
         }
@@ -354,12 +346,12 @@
     @Override
     public R tax(String id) {
         TaxVO taxVO = new TaxVO();
-       /* Company companyInfo = companyMapper.selectById(id);
+        Company companyInfo = companyMapper.selectById(id);
         if (null == companyInfo || companyInfo.getIsDelete() != 0) {
             throw new ServiceException("公司不存在");
-        }*/
-//        JSONObject jsonObject=getReport(companyInfo.getLink().split("=")[1]);
-        JSONObject jsonObject=getReport("ZZD20250508017232394218445");
+        }
+        JSONObject jsonObject=getReport(companyInfo.getLink().split("=")[1]);
+//        JSONObject jsonObject=getReport("ZZD20250508017232394218445");
         if (!"1001".equals(jsonObject.getString("code"))){
             return R.fail(jsonObject.get("msg"));
         }
@@ -429,12 +421,12 @@
     @Override
     public R invoice(String id) {
         InvoiceVO vo = new InvoiceVO();
-       /* Company companyInfo = companyMapper.selectById(id);
+        Company companyInfo = companyMapper.selectById(id);
         if (null == companyInfo || companyInfo.getIsDelete() != 0) {
             throw new ServiceException("公司不存在");
-        }*/
-//        JSONObject jsonObject=getReport(companyInfo.getLink().split("=")[1]);
-        JSONObject jsonObject=getReport("ZZD20250508017232394218445");
+        }
+        JSONObject jsonObject=getReport(companyInfo.getLink().split("=")[1]);
+//        JSONObject jsonObject=getReport("ZZD20250508017232394218445");
         if (!"1001".equals(jsonObject.getString("code"))){
             return R.fail(jsonObject.get("msg"));
         }

--
Gitblit v1.7.1