新需求--测试地址

src/main/java/com/huiju/estateagents/config/FadadaProperties.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+@ConfigurationProperties(prefix = "fadada")
+public class FadadaProperties {
+    private String appId;
+    private String appSecret;
+    private String version;
+    private String serveHost;
+}

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.config.FadadaProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,6 +38,9 @@ public class TaCompanyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCompanyController.class);
 
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
     @Autowired
     public ITaCompanyService iTaCompanyService;
 
@@ -165,4 +169,41 @@ public class TaCompanyController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 条件查询企业列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @param companyCode
+     * @param certifiedStatus
+     * @return
+     */
+    @RequestMapping(value = "/channel/company/list", method = RequestMethod.GET)
+    public ResponseBean getCompanyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "companyName", required = false) String companyName,
+                                       @RequestParam(value = "companyCode", required = false) String companyCode,
+                                       @RequestParam(value = "certifiedStatus", required = false) String certifiedStatus) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            fadadaProperties.getAppId();
+            //使用分页插件
+            IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
+            queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
+            queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/resources/application-blue.yml

@@ -76,4 +76,10 @@ sms:
 # 支付回调
 pay-notify: https://dev.pawoma.cn/api/notify/
 #退款回调
-pay-refund: https://dev.pawoma.cn/api/refund/
+pay-refund: https://dev.pawoma.cn/api/refund/
+
+fadada:
+  appId: ""
+  appSecret: ""
+  version: "2.0"
+  serveHost: "https://testapi.fadada.com:8443/api/"

src/main/resources/application-green.yml

@@ -76,4 +76,10 @@ sms:
 # 支付回调
 pay-notify: https://dev.pawoma.cn/api/notify/
 #退款回调
-pay-refund: https://dev.pawoma.cn/api/refund/
+pay-refund: https://dev.pawoma.cn/api/refund/
+
+fadada:
+  appId: ""
+  appSecret: ""
+  version: "2.0"
+  serveHost: "https://testapi.fadada.com:8443/api/"