From de6b1898b4ff8579adde95a37ff0b411d17f5536 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 14:26:58 +0800
Subject: [PATCH] update
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java | 202 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 140 insertions(+), 62 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..e5cd5b0 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,34 @@
throw new ServiceException("公司不存在");
}
BusinessVO vo = new BusinessVO();
+ // 先查企业工商信息 更新数据
+ JSONObject jsonObject = getQiChaChaBasicDetailsCompany(company.getCompanyName());
+ Object result = jsonObject.get("Result");
+ jsonObject = JSONObject.parseObject(result.toString());
+ 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.setNewRegisteredCapital(company.getRealRegisteredCapital());
vo.setPlace(company.getCity()+company.getProvince()+company.getArea());
+
+ JSONObject area = jsonObject.getJSONObject("Area");
+ if (null != area) {
+ vo.setPlace(area.getString("Province")+"-"+area.getString("City")+"-"+area.getString("County"));
+ }else {
+ vo.setPlace(company.getCity() + "-" + company.getProvince() + "-" + company.getArea());
+ }
+
+ vo.setCompanyCategoryName(jsonObject.getString("EconKind"));
String name = companyTypeService.getById(company.getCompanyCategory()).getName();
vo.setCompanyCategoryName(name);
-
- //todo 再查企业工商信息 覆盖掉之前的
-
-
+ vo.setOperName(company.getOperName());
+ vo.setBelongOrg(company.getBelongOrg());
+ vo.setRegistrationStatus(company.getRegistrationStatus());
return vo;
}
@@ -208,22 +227,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 +330,16 @@
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");
+ }
+ String link = companyInfo.getLink();
+ if(link==null){
+ return R.ok(changeVO);
+ }
+ JSONObject jsonObject=getReport(extractSnFromUrl(link));
+// JSONObject jsonObject=getReport("ZZD20250508017232394218445");
if (!"1001".equals(jsonObject.getString("code"))){
return R.fail(jsonObject.get("msg"));
}
@@ -350,16 +358,50 @@
return R.ok(changeVO);
}
+ /**
+ * 从URL中提取sn参数
+ * @param url 包含sn参数的URL
+ * @return sn参数值
+ */
+ public static String extractSnFromUrl(String url) {
+ if (url == null || url.isEmpty()) {
+ return null;
+ }
+
+ // 查找sn参数的位置
+ String snParam = "sn=";
+ int startIndex = url.indexOf(snParam);
+
+ if (startIndex == -1) {
+ return null; // 未找到sn参数
+ }
+
+ // 计算sn值的起始位置
+ startIndex += snParam.length();
+
+ // 查找sn值的结束位置（遇到&或字符串结束）
+ int endIndex = url.indexOf("&", startIndex);
+ if (endIndex == -1) {
+ endIndex = url.length();
+ }
+
+ // 提取并返回sn值
+ return url.substring(startIndex, endIndex);
+ }
@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");
+ }
+ String link = companyInfo.getLink();
+ if (link == null) {
+ return R.ok(taxVO);
+ }
+ JSONObject jsonObject=getReport(extractSnFromUrl(link));
+// JSONObject jsonObject=getReport("ZZD20250508017232394218445");
if (!"1001".equals(jsonObject.getString("code"))){
return R.fail(jsonObject.get("msg"));
}
@@ -367,7 +409,7 @@
JSONObject data2 = (JSONObject) data1.get("data");
JSONObject taxInfo = (JSONObject) data2.get("taxInfo");
//税务处罚
- JSONObject enterprise = (JSONObject) data2.get("enterprise");
+ JSONArray enterprise = data2.getJSONArray("enterprise");
taxVO.setEnterprise(enterprise);
//滞纳金情况
JSONArray overdueFineDetailsList = (JSONArray) taxInfo.get("overdueFineDetailsList");
@@ -386,42 +428,72 @@
taxVO.setTaxpayerType(taxpayerType);
//近12月增税销售额
- JSONObject taxPrevMnMthsAllTaxDclrPrjInfoDict = (JSONObject) taxInfo.get("taxPrevMnMthsAllTaxDclrPrjInfoDict");
+ JSONObject taxPrevMnMthsAllTaxDclrPrjInfoDict = taxInfo.getJSONObject("taxPrevMnMthsAllTaxDclrPrjInfoDict");
+ if (null != taxPrevMnMthsAllTaxDclrPrjInfoDict){
+ JSONObject taxPrev12mthsAllTaxDclrPrjInfoDict = taxPrevMnMthsAllTaxDclrPrjInfoDict.getJSONObject("taxPrev12mthsAllTaxDclrPrjInfoDict");
+ if (null != taxPrev12mthsAllTaxDclrPrjInfoDict){
+ // 使用 getBigDecimal 方法，自动处理类型转换
+ BigDecimal vatTaxValue = taxPrev12mthsAllTaxDclrPrjInfoDict.getBigDecimal("vatTaxShouldsaleAmt");
+ taxVO.setVatTaxShouldsaleAmt12(vatTaxValue); // 自动处理 null
+ }
+ //近24月增税销售额
+ JSONObject taxPrev24mthsAllTaxDclrPrjInfoDict = taxPrevMnMthsAllTaxDclrPrjInfoDict.getJSONObject("taxPrev24mthsAllTaxDclrPrjInfoDict");
+ if(null != taxPrev24mthsAllTaxDclrPrjInfoDict){
+ taxVO.setVatTaxShouldsaleAmt24( (BigDecimal) taxPrev24mthsAllTaxDclrPrjInfoDict.get("vatTaxShouldsaleAmt"));
+ }
+ //近12月增税应纳额(元)
+ taxVO.setVatTaxShouldpay(taxPrev12mthsAllTaxDclrPrjInfoDict.getBigDecimal("vatTaxShouldpay"));
+ }
- JSONObject taxPrev12mthsAllTaxDclrPrjInfoDict = (JSONObject) taxPrevMnMthsAllTaxDclrPrjInfoDict.get("taxPrev12mthsAllTaxDclrPrjInfoDict");
- taxVO.setVatTaxShouldsaleAmt12((BigDecimal) taxPrev12mthsAllTaxDclrPrjInfoDict.get("vatTaxShouldsaleAmt"));
- //近24月增税销售额
- JSONObject taxPrev24mthsAllTaxDclrPrjInfoDict = (JSONObject) taxPrevMnMthsAllTaxDclrPrjInfoDict.get("taxPrev24mthsAllTaxDclrPrjInfoDict");
- taxVO.setVatTaxShouldsaleAmt24( (BigDecimal) taxPrev24mthsAllTaxDclrPrjInfoDict.get("vatTaxShouldsaleAmt"));
- JSONObject taxPrevMnMthsTaxInfoDict = (JSONObject) taxInfo.get("taxPrevMnMthsTaxInfoDict");
- //近12月纳税总额(元)
- JSONObject taxPrev12mthsTaxInfo = (JSONObject) taxPrevMnMthsTaxInfoDict.get("taxPrev12mthsTaxInfo");
- taxVO.setTaxAmt12( (BigDecimal) taxPrev12mthsTaxInfo.get("taxAmt"));
+ JSONObject taxPrevMnMthsTaxInfoDict = taxInfo.getJSONObject("taxPrevMnMthsTaxInfoDict");
+ if (null!=taxPrevMnMthsTaxInfoDict){
+ //近12月纳税总额(元)
+ JSONObject taxPrev12mthsTaxInfo = taxPrevMnMthsTaxInfoDict.getJSONObject("taxPrev12mthsTaxInfo");
+ taxVO.setTaxAmt12( (BigDecimal) taxPrev12mthsTaxInfo.get("taxAmt"));
- //近24月纳税总额(元)
- JSONObject taxPrev24mthsTaxInfo = (JSONObject) taxPrevMnMthsTaxInfoDict.get("taxPrev24mthsTaxInfo");
- taxVO.setTaxAmt24( (BigDecimal) taxPrev24mthsTaxInfo.get("taxAmt"));
+ //近24月纳税总额(元)
+ JSONObject taxPrev24mthsTaxInfo = taxPrevMnMthsTaxInfoDict.getJSONObject("taxPrev24mthsTaxInfo");
+ if (null != taxPrev24mthsTaxInfo){
+ taxVO.setTaxAmt24( (BigDecimal) taxPrev24mthsTaxInfo.get("taxAmt"));
- //近12月增税应纳额(元)
- taxVO.setVatTaxShouldpay( (BigDecimal) taxPrev12mthsAllTaxDclrPrjInfoDict.get("vatTaxShouldpay"));
+ }
+
+ }
+
+
//近12个月滞纳金金额(元) 次数
- JSONObject taxPrevMnMthsOverdueFineInfoDict = (JSONObject) taxInfo.get("taxPrevMnMthsOverdueFineInfoDict");
- JSONObject taxPrev12mthsOverdueFineInfo = (JSONObject) taxPrevMnMthsOverdueFineInfoDict.get("taxPrev12mthsOverdueFineInfo");
- taxVO.setOverdueFineInfoAmt12( (BigDecimal) taxPrev12mthsOverdueFineInfo.get("overdueFineInfoAmt"));
- taxVO.setOverdueFineInfoCnt12( (Integer) taxPrev12mthsOverdueFineInfo.get("overdueFineInfoCnt"));
+ JSONObject taxPrevMnMthsOverdueFineInfoDict = taxInfo.getJSONObject("taxPrevMnMthsOverdueFineInfoDict");
+ if (null != taxPrevMnMthsOverdueFineInfoDict){
+ JSONObject taxPrev12mthsOverdueFineInfo = taxPrevMnMthsOverdueFineInfoDict.getJSONObject("taxPrev12mthsOverdueFineInfo");
+ if (null!= taxPrev12mthsOverdueFineInfo){
+ Object o = taxPrev12mthsOverdueFineInfo.get("overdueFineInfoAmt");
+ if(o!=null){
+ taxVO.setOverdueFineInfoAmt12( new BigDecimal(o.toString()) );
+ }
+
+ taxVO.setOverdueFineInfoCnt12( (Integer) taxPrev12mthsOverdueFineInfo.get("overdueFineInfoCnt"));
+ }
+ // 近3个月滞纳金金额(元)
+ JSONObject taxPrev3mthsOverdueFineInfo = taxPrevMnMthsOverdueFineInfoDict.getJSONObject("taxPrev3mthsOverdueFineInfo");
+ if (null != taxPrev3mthsOverdueFineInfo){
+ taxVO.setOverdueFineInfoCnt3( (Integer) taxPrev3mthsOverdueFineInfo.get("overdueFineInfoCnt"));
+ }
+
+ }
- // 近3个月滞纳金金额(元)
- JSONObject taxPrev3mthsOverdueFineInfo = (JSONObject) taxPrevMnMthsOverdueFineInfoDict.get("taxPrev3mthsOverdueFineInfo");
- taxVO.setOverdueFineInfoCnt3( (Integer) taxPrev3mthsOverdueFineInfo.get("overdueFineInfoCnt"));
+
//近12月0申报月数（月数）
- JSONObject taxPrevMnMthsAllTaxDclrInfoDict = (JSONObject) taxInfo.get("taxPrevMnMthsAllTaxDclrInfoDict");
- JSONObject taxPrev12mthsAllTaxDclrInfoDict = (JSONObject) taxPrevMnMthsAllTaxDclrInfoDict.get("taxPrev12mthsAllTaxDclrInfoDict");
- taxVO.setVatTax0dclrMonCnt( (Integer) taxPrev12mthsAllTaxDclrInfoDict.get("vatTax0dclrMonCnt"));
+ JSONObject taxPrevMnMthsAllTaxDclrInfoDict = taxInfo.getJSONObject("taxPrevMnMthsAllTaxDclrInfoDict");
+ if (null != taxPrevMnMthsAllTaxDclrInfoDict){
+ JSONObject taxPrev12mthsAllTaxDclrInfoDict = (JSONObject) taxPrevMnMthsAllTaxDclrInfoDict.get("taxPrev12mthsAllTaxDclrInfoDict");
+ taxVO.setVatTax0dclrMonCnt( (Integer) taxPrev12mthsAllTaxDclrInfoDict.get("vatTax0dclrMonCnt"));
+ }
+
return R.ok(taxVO);
}
@@ -429,12 +501,16 @@
@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");
+ }
+ String link = companyInfo.getLink();
+ if(link==null){
+ return R.ok(vo);
+ }
+ JSONObject jsonObject=getReport(extractSnFromUrl(link));
+// JSONObject jsonObject=getReport("ZZD20250508017232394218445");
if (!"1001".equals(jsonObject.getString("code"))){
return R.fail(jsonObject.get("msg"));
}
@@ -446,9 +522,10 @@
//近一个月开票金额(元)
JSONArray f4yPer1mDownFpInfoList = (JSONArray) invoiceInfo.get("f4yPer1mDownFpInfoList");
- JSONObject f4yPer1mDownFpInfo1 = (JSONObject) f4yPer1mDownFpInfoList.get(1);
- vo.setHjjeZc1( ObjectToBigDecimal(f4yPer1mDownFpInfo1.get("hjjeZc")) );
-
+ if(f4yPer1mDownFpInfoList!=null){
+ JSONObject f4yPer1mDownFpInfo1 = (JSONObject) f4yPer1mDownFpInfoList.get(1);
+ vo.setHjjeZc1( ObjectToBigDecimal(f4yPer1mDownFpInfo1.get("hjjeZc")) );
+ }
JSONObject fpPrevMnMthsDownFpInfoList = (JSONObject) invoiceInfo.get("fpPrevMnMthsDownFpInfoList");
JSONObject fpPrev3mthsDownFpInfoList = (JSONObject) fpPrevMnMthsDownFpInfoList.get("fpPrev3mthsDownFpInfoList");
@@ -772,7 +849,8 @@
@Override
public FinanceFlowsTopVO financeTop(FinanceFlowsDTO dto) {
- return this.baseMapper.financeTop(dto);
+ FinanceFlowsTopVO financeFlowsTopVO = this.baseMapper.financeTop(dto);
+ return financeFlowsTopVO;
}
@Override
--
Gitblit v1.7.1