shc 1 rok pred
rodič
commit
f1bd1e503a

+ 1 - 0
doc/db/25wm_qcc_info.sql

@@ -32,6 +32,7 @@ CREATE TABLE `wm_qcc_info`
     `sumptuary`              JSON                               NULL COMMENT '限制高消费',
     `tax_illegal`            JSON                               NULL COMMENT '税收违法',
     `tax_abnormal`           JSON                               NULL COMMENT '税收非正常户',
+    `credit_rating`          JSON                               NULL COMMENT '信用评分',
     `create_by`              VARCHAR(32)                        NOT NULL COMMENT '创建人',
     `create_time`            DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL COMMENT '创建时间',
     PRIMARY KEY `pk_id` (`info_id`) USING BTREE

+ 3 - 0
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmQccInfo.java

@@ -104,6 +104,9 @@ public class WmQccInfo implements Serializable {
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, Object> taxAbnormal;
 
+    @TableField(value = "credit_rating", typeHandler = JacksonTypeHandler.class)
+    private Map<String, Object> creditRatingReportGrade;
+
     private String createBy;
 
     private LocalDateTime createTime;

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmQccInfoController.java

@@ -45,7 +45,7 @@ public class WmQccInfoController {
         final String cacheKey = "qcc:info:refresh:" + resource.getRegCode();
 
 
-        if (Boolean.FALSE.equals(redisTemplate.opsForValue().setIfAbsent(cacheKey, resource.getRegCode(), 3, TimeUnit.MINUTES))){
+        if (Boolean.FALSE.equals(redisTemplate.opsForValue().setIfAbsent(cacheKey, resource.getRegCode(), 3, TimeUnit.MINUTES))) {
             return R.failed("当前企业存在在途刷新动作,请稍后重试");
         }
 

+ 39 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmQccInfoServiceImpl.java

@@ -53,6 +53,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
 
 
         // 刷新企业信息
+        log.info("获取企业【{}】刷新企业信息", regCode);
         JSONObject eciInfo = QccUtils.getECIInfo(regCode);
         boolean ok = QccUtils.ok(eciInfo);
         if (ok) {
@@ -87,10 +88,22 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             bizInfo.put("EntType", resp.getStr("EntType"));
             qccInfo.setBizInfo(bizInfo);
 
-            // qccInfo.setRevokeInfo((Map<String, Object>) resp.get("RevokeInfo"));
+            Object revokeInfo2 = resp.get("RevokeInfo");
+
+            Map<String, Object> revokeInfo;
+            if (revokeInfo2 instanceof JSONNull){
+                revokeInfo = Collections.emptyMap();
+            } else {
+                JSONObject revokeInfo1 = (JSONObject) revokeInfo2;
+                revokeInfo = new HashMap<>(4);
+                revokeInfo.put("CancelReason", revokeInfo1.getStr("CancelReason"));
+                revokeInfo.put("CancelDate", revokeInfo1.getStr("CancelDate"));
+                revokeInfo.put("RevokeDate", revokeInfo1.getStr("RevokeDate"));
+                revokeInfo.put("RevokeReason", revokeInfo1.getStr("RevokeReason"));
+            }
+            qccInfo.setRevokeInfo(revokeInfo);
 
             JSONArray partners = (JSONArray) resp.get("Partners");
-
             List<Map<String, Object>> partner1 = partners.stream().map(p -> {
                 JSONObject partner = (JSONObject) p;
                 Map<String, Object> partnerInfo = new HashMap<>(4);
@@ -131,6 +144,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             qccInfo.setTaxAbnormal(Collections.emptyMap());
 
             // 严重违法查询
+            log.info("获取企业【{}】严重违法查询", regCode);
             JSONObject seriousIllegalList = QccUtils.getSeriousIllegalList(regCode);
             if (QccUtils.ok(seriousIllegalList)) {
                 JSONObject result1 = QccUtils.getResult(seriousIllegalList);
@@ -161,6 +175,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 失信查询
+            log.info("获取企业【{}】失信查询", regCode);
             JSONObject shixinList = QccUtils.getShixinList(regCode);
             if (QccUtils.ok(shixinList)) {
                 JSONObject result1 = QccUtils.getResult(shixinList);
@@ -193,6 +208,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 实际控制人
+            log.info("获取企业【{}】实际控制人", regCode);
             JSONObject actualControlList = QccUtils.getActualControlList(regCode);
             if (QccUtils.ok(actualControlList)) {
                 JSONArray array = QccUtils.getArray(actualControlList);
@@ -201,6 +217,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 清算信息
+            log.info("获取企业【{}】清算信息", regCode);
             JSONObject liquidationDetail = QccUtils.getLiquidationDetail(regCode);
             if (QccUtils.ok(liquidationDetail)) {
                 JSONObject result1 = QccUtils.getResult(liquidationDetail);
@@ -209,6 +226,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 税务等级信息
+            log.info("获取企业【{}】税务等级信息", regCode);
             JSONObject taxCreditList = QccUtils.getTaxCreditList(regCode);
             if (QccUtils.ok(taxCreditList)) {
                 JSONArray array = QccUtils.getArray(taxCreditList);
@@ -218,6 +236,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
 
 
             // 经营异常
+            log.info("获取企业【{}】经营异常", regCode);
             JSONObject exceptionList = QccUtils.getExceptionList(regCode);
             if (QccUtils.ok(exceptionList)) {
                 JSONObject result1 = QccUtils.getResult(exceptionList);
@@ -246,6 +265,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 执行人
+            log.info("获取企业【{}】执行人", regCode);
             JSONObject zhixingList = QccUtils.getZhixingList(regCode);
             if (QccUtils.ok(zhixingList)) {
                 JSONObject result1 = QccUtils.getResult(zhixingList);
@@ -274,6 +294,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 税收违法
+            log.info("获取企业【{}】税收违法", regCode);
             JSONObject taxIllegalList = QccUtils.getTaxIllegalList(regCode);
             if (QccUtils.ok(taxIllegalList)) {
                 JSONObject result1 = QccUtils.getResult(taxIllegalList);
@@ -300,6 +321,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 破产重组
+            log.info("获取企业【{}】破产重组", regCode);
             JSONObject bankruptcyList = QccUtils.getBankruptcyList(regCode);
             if (QccUtils.ok(bankruptcyList)) {
                 JSONObject result1 = QccUtils.getResult(bankruptcyList);
@@ -325,6 +347,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 动产抵押
+            log.info("获取企业【{}】动产抵押", regCode);
             JSONObject chattelMortgageList = QccUtils.getChattelMortgageList(regCode);
             if (QccUtils.ok(chattelMortgageList)) {
                 JSONObject result1 = QccUtils.getResult(chattelMortgageList);
@@ -352,6 +375,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 行政处罚
+            log.info("获取企业【{}】行政处罚", regCode);
             JSONObject adminPenaltyList = QccUtils.getAdminPenaltyList(regCode);
             if (QccUtils.ok(adminPenaltyList)) {
                 JSONObject result1 = QccUtils.getResult(adminPenaltyList);
@@ -360,6 +384,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 限制高消费
+            log.info("获取企业【{}】限制高消费", regCode);
             JSONObject sumptuaryList = QccUtils.getSumptuaryList(regCode);
             if (QccUtils.ok(sumptuaryList)) {
                 JSONObject result1 = QccUtils.getResult(sumptuaryList);
@@ -390,6 +415,7 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
             }
 
             // 行政许可
+            log.info("获取企业【{}】行政许可", regCode);
             JSONObject adminLicenseList = QccUtils.getAdminLicenseList(regCode);
             if (QccUtils.ok(adminLicenseList)) {
                 JSONObject result1 = QccUtils.getResult(adminLicenseList);
@@ -397,6 +423,17 @@ public class WmQccInfoServiceImpl extends ServiceImpl<WmQccInfoMapper, WmQccInfo
                 qccInfo.setAdminLicenseList((List<Map<String, Object>>) data);
             }
 
+
+            // 企业评分
+            log.info("获取企业【{}】评分", regCode);
+            JSONObject creditRatingReportGrade = QccUtils.getCreditRatingReportGrade(regCode);
+            if (QccUtils.ok(creditRatingReportGrade)) {
+                JSONObject result1 = QccUtils.getResult(creditRatingReportGrade);
+                Object data = result1.get("Data");
+                qccInfo.setCreditRatingReportGrade((Map<String, Object>) data);
+            }
+
+
         }
 
 

+ 23 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/util/QccUtils.java

@@ -265,6 +265,27 @@ public class QccUtils {
 
     }
 
+    /**
+     * 企业评分
+     *
+     * @param searchKey 关键字
+     * @return 信息详情
+     */
+    public static JSONObject getCreditRatingReportGrade(String searchKey) {
+
+        final String METHOD_NAME = "/api/yj/CreditRatingReportGrade/GetInfo";
+
+        // 校验参数
+        checkSearchKey(searchKey);
+
+        // 执行
+        String result = execute(METHOD_NAME, searchKey);
+
+        // 解析结果
+        return parseResult(result);
+
+    }
+
     /**
      * 行政处罚
      *
@@ -475,7 +496,8 @@ public class QccUtils {
         // JSONObject jsonObject = getChattelMortgageList("91110000100010062X");
         // JSONObject jsonObject = getAdminPenaltyList("91110000100010062X");
         // JSONObject jsonObject = getSumptuaryList("91110000100010062X");
-        JSONObject jsonObject = getAdminLicenseList("91110000100010062X");
+        // JSONObject jsonObject = getAdminLicenseList("91110000100010062X");
+        JSONObject jsonObject = getCreditRatingReportGrade("91110000100010062X");
 
         System.out.println(jsonObject);