Merge branch 'v1.1-dev' of http://192.168.0.200:3000/wanglang/trade-platform into v1.1-dev

trade-admin/src/main/java/com/trade/admin/trade/exportrebate/controller/ExportTaxRebateController.java

@@ -101,7 +101,8 @@ public class ExportTaxRebateController extends BaseController {
      */
     @PostMapping("/declarationBatch/refundAmount")
     @PreAuthorize("@ss.hasPermi('trade:exportTaxRebate.exportTaxRefund')")
-    public ResponseResult<BigDecimal> getRefundAmountForDeclarationBatch(ExportTaxRefundBatchRequest request) {
+    public ResponseResult<BigDecimal> getRefundAmountForDeclarationBatch(
+            @RequestBody ExportTaxRefundBatchRequest request) {
         return success(exportTaxRebateService.getRefundAmountForDeclarationBatch(request));
     }
 
@@ -113,7 +114,8 @@ public class ExportTaxRebateController extends BaseController {
      */
     @PostMapping("/declarationBatch/exportTaxRefund")
     @PreAuthorize("@ss.hasPermi('trade:exportTaxRebate.exportTaxRefund')")
-    public ResponseResult<Boolean> refundExportTaxForDeclarationBatch(ExportTaxRefundBatchRequest request) {
+    public ResponseResult<Boolean> refundExportTaxForDeclarationBatch(
+            @RequestBody ExportTaxRefundBatchRequest request) {
         return success(exportTaxRebateService.refundExportTaxForDeclarationBatch(request));
     }
 
@@ -125,7 +127,8 @@ public class ExportTaxRebateController extends BaseController {
      */
     @PostMapping("/exportDetails/refundAmount")
     @PreAuthorize("@ss.hasPermi('trade:exportTaxRebate.exportTaxRefund')")
-    public ResponseResult<BigDecimal> getRefundAmountForExportDetails(List<TaxRebateExportAbstractInfo> request) {
+    public ResponseResult<BigDecimal> getRefundAmountForExportDetails(
+            @RequestBody List<TaxRebateExportAbstractInfo> request) {
         return success(exportTaxRebateService.getRefundAmountForExportDetails(request));
     }
 
@@ -137,7 +140,7 @@ public class ExportTaxRebateController extends BaseController {
      */
     @PostMapping("/exportDetails/exportTaxRefund")
     @PreAuthorize("@ss.hasPermi('trade:exportTaxRebate.exportTaxRefund')")
-    public ResponseResult<Boolean> refundExportTaxForExportDetails(ExportTaxRefundDetailsRequest request) {
+    public ResponseResult<Boolean> refundExportTaxForExportDetails(@RequestBody ExportTaxRefundDetailsRequest request) {
         return success(exportTaxRebateService.refundExportTaxForExportDetails(request));
     }
 }

trade-client/src/main/java/com/trade/client/enterprise/customer/service/impl/EnterpriseServiceImpl.java

@@ -685,8 +685,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             log.warn("企业准入失败，企业成立年限不符合要求！");
             throw new ValidatorException(HttpStatus.ERROR, "认证失败");
         }
+        // 注意这里企查查返回的被执行金额单位是万元，需要转换成元
         if (riskInvestigation.getRegistCapi() != null && StringUtils.parseMoney(riskInvestigation.getRegistCapi())
-                .compareTo(Optional.ofNullable(riskInvestigation.getZhixingAmount()).orElse(BigDecimal.ZERO)) < 0) {
+                .compareTo(Optional.ofNullable(riskInvestigation.getZhixingAmount())
+                        .map(e -> e.multiply(BigDecimal.valueOf(10000))).orElse(BigDecimal.ZERO)) < 0) {
             log.warn("企业准入失败，企业被执行金额大于注册资本！");
             throw new ValidatorException(HttpStatus.ERROR, "认证失败");
         }

trade-service/src/main/java/com/trade/service/contract/config/SOPConfigHolder.java

@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 @Component
-@ConditionalOnProperty("sop")
+@ConditionalOnProperty(prefix = "sop", name = "urlPrefix")
 public class SOPConfigHolder {
 
     private static String urlPrefix;

trade-service/src/main/java/com/trade/service/thirdparty/sop/domain/SOPRequestLogPO.java

@@ -3,11 +3,13 @@ package com.trade.service.thirdparty.sop.domain;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * SOP 接口请求日志 实体
  */
+@TableName("sop_request_log")
 public class SOPRequestLogPO implements Serializable {
 
     private static final long serialVersionUID = -4581977919584282836L;

trade-service/src/main/java/com/trade/service/thirdparty/sop/service/impl/SOPServiceImpl.java

@@ -17,7 +17,6 @@ import com.trade.service.thirdparty.sop.service.SOPService;
 import com.trade.service.thirdparty.sop.util.ResponseJson;
 import com.trade.service.thirdparty.sop.util.SOPConstantUtil;
 import com.trade.service.thirdparty.sop.util.SOPRestUtil;
-import com.yomahub.liteflow.util.JsonUtil;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -64,7 +63,7 @@ public class SOPServiceImpl implements SOPService {
         if (!json.isSuccess()) {
             log.error("调用SOP查询企业详细信息接口返回失败,错误信息：" + json.getMsg());
         }
-        return JsonUtil.parseObject(json.getData().toString(), SOPEnterpriseDetail.class);
+        return JSON.parseObject(json.getData().toString(), SOPEnterpriseDetail.class);
     }
 
     @Override
@@ -79,7 +78,7 @@ public class SOPServiceImpl implements SOPService {
         if (null == json) {
             throw new ServiceException("获取企业风险调查信息失败", HttpStatus.ERROR);
         }
-        return JsonUtil.parseObject(json.getData().toString(), SOPRiskInvestigation.class);
+        return JSON.parseObject(json.getData().toString(), SOPRiskInvestigation.class);
     }
 
     @Override

trade-service/src/main/java/com/trade/service/thirdparty/sop/util/SOPConstantUtil.java

@@ -24,11 +24,13 @@ public class SOPConstantUtil {
     public final static String SOP_API_ENTERPRISE_DETAIL = SOP_URL_PREFIX + "/api/enterprise/detailInfo";
     /* 企业风险信息查询 */
     public final static String SOP_API_ENTERPRISE_RISK_INVESTIGATION = SOP_URL_PREFIX
-            + "/qichacha/comprehensiveRiskInvestigation";
+            + "/api/qichacha/comprehensiveRiskInvestigation";
     /* 董监高失信被执行查询 */
-    public final static String SOP_API_MANAGEMENT_CREDIT_EXECUTION = SOP_URL_PREFIX + "/qichacha/dongjiangaoSXCheck";
+    public final static String SOP_API_MANAGEMENT_CREDIT_EXECUTION = SOP_URL_PREFIX
+            + "/api/qichacha/dongjiangaoSXCheck";
     public final static String SOP_API_MANAGEMENT_CONSUMPTION_LIMIT = SOP_URL_PREFIX
-            + "/qichacha/dongjiangaoSumptuaryCheck";
+            + "/api/qichacha/dongjiangaoSumptuaryCheck";
     /* 企业裁判文书查询 */
-    public final static String SOP_API_QUERY_JUDGMENT_DOCUMENTS = SOP_URL_PREFIX + "/qichacha/judgmentDocuments";
+    public final static String SOP_API_QUERY_JUDGMENT_DOCUMENTS = SOP_URL_PREFIX
+            + "/api/qichacha/existFinancialOrPrivateLending";
 }