Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/bo/request/ContractRecordRequestBO.java

@@ -29,7 +29,7 @@ public class ContractRecordRequestBO {
     /**
      * 公司编码
      */
-    private String companyNumber;
+    private String companyCode;
 
     /**
      * 组织名
@@ -51,6 +51,11 @@ public class ContractRecordRequestBO {
      */
     private String contractName;
 
+    /**
+     * 渠道代理商
+     */
+    private String channelProxyName;
+
     /**
      * 是否结算
      */

src/main/java/com/huiju/estateagents/common/CommonUtils.java

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.common;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class CommonUtils {
+    /**
+     * 金额校验
+     *
+     * @param str
+     * @return
+     */
+    public static boolean isAmount(String str) {
+        Pattern pattern = Pattern.compile("^(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){0,2})?$"); // 判断小数点后2位的数字的正则表达式
+        Matcher match = pattern.matcher(str);
+        if (match.matches() == false) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaOrgController.java

@@ -157,7 +157,7 @@ public class TaOrgController extends BaseController {
      * @param miniAppName
      * @return
      */
-    @RequestMapping(value = "/channel/contract/listOrg", method = RequestMethod.GET)
+    @RequestMapping(value = "/api/channel/contract/listOrg", method = RequestMethod.GET)
     public ResponseBean listOrgForContract(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                            String orgName, String miniAppName) {

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

@@ -51,21 +51,21 @@ public class TaCompanyController extends BaseController {
      * @param pageNum
      * @param pageSize
      * @param companyName
-     * @param companyNumber
+     * @param companyCode
      * @param certifiedStatus
      * @return
      */
     @RequestMapping(value = "/channel/contract/lisCompany", method = RequestMethod.GET)
     public ResponseBean lisCompany(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                   String companyName, String companyNumber, String certifiedStatus) {
+                                   String companyName, String companyCode, String certifiedStatus) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
-            queryWrapper.like(StringUtils.isNotBlank(companyNumber), "company_number", companyNumber);
+            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");

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

@@ -109,7 +109,7 @@ public class TaCompanyOrgController extends BaseController {
      * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value = "/taCompanyOrg/{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/channel/taCompanyOrg/{id}", method = RequestMethod.DELETE)
     public ResponseBean taCompanyOrgDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -176,7 +176,7 @@ public class TaCompanyOrgController extends BaseController {
      * @param pageNum
      * @param pageSize
      * @param companyName
-     * @param companyNumber
+     * @param companyCode
      * @param certifiedStatus
      * @param orgName
      * @param miniAppName
@@ -186,13 +186,13 @@ public class TaCompanyOrgController extends BaseController {
     public ResponseBean listCompanyAndOrg(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                           String companyName,
-                                          String companyNumber,
+                                          String companyCode,
                                           String certifiedStatus,
                                           String orgName,
                                           String miniAppName) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaCompanyOrgService.listCompanyOrg(pageNum, pageSize, companyName, companyNumber, certifiedStatus, orgName, miniAppName);
+            responseBean = iTaCompanyOrgService.listCompanyOrg(pageNum, pageSize, companyName, companyCode, certifiedStatus, orgName, miniAppName);
             logger.info("TaCompanyOrgController.listCompanyOrg 返回结果：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("TaCompanyOrgController.listCompanyOrg 异常：", e);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
+import com.huiju.estateagents.common.CommonUtils;
 import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.service.ITaContractService;
 import org.slf4j.Logger;
@@ -97,6 +98,12 @@ public class TaContractController extends BaseController {
                 return responseBean;
             }
 
+            // 校验金额是否符合要求
+            if (!CommonUtils.isAmount(taContract.getSettlementPrice() + "")) {
+                responseBean.addError("结算金额不符合要求");
+                return responseBean;
+            }
+
             // 元转分
             Integer price = taContract.getSettlementPrice() * 100;
             taContract.getTaContractList().stream().forEach(record -> {

src/main/java/com/huiju/estateagents/eContract/entity/TaCompanyOrg.java

@@ -55,7 +55,7 @@ public class TaCompanyOrg implements Serializable {
      * 企业编号
      */
     @TableField(exist = false)
-    private String companyNumber;
+    private String companyCode;
 
     /**
      * 实名认证状态 实名认证状态

src/main/java/com/huiju/estateagents/eContract/entity/TaContract.java

@@ -102,12 +102,12 @@ public class TaContract implements Serializable {
     /**
      * 下载合同链接地址
      */
-    private String contractDownloadAddress;
+    private String contractDownloadUrl;
 
     /**
      * 查看合同链接地址
      */
-    private String contractLookAddress;
+    private String contractViewUrl;
 
     /**
      * 是否归档
@@ -152,7 +152,7 @@ public class TaContract implements Serializable {
      * 公司编码
      */
     @TableField(exist = false)
-    private String companyNumber;
+    private String companyCode;
 
     /**
      * 组织名
@@ -166,6 +166,12 @@ public class TaContract implements Serializable {
     @TableField(exist = false)
     private String miniAppName;
 
+    /**
+     * 代理商名称
+     */
+    @TableField(exist = false)
+    private String channelProxyName;
+
     @TableField(exist = false)
     private List<TaContract> taContractList;
 

src/main/java/com/huiju/estateagents/eContract/mapper/TaCompanyOrgMapper.java

@@ -23,7 +23,7 @@ public interface TaCompanyOrgMapper extends BaseMapper<TaCompanyOrg> {
      *
      * @param pg
      * @param companyName
-     * @param companyNumber
+     * @param companyCode
      * @param certifiedStatus
      * @param orgName
      * @param miniAppName
@@ -31,7 +31,7 @@ public interface TaCompanyOrgMapper extends BaseMapper<TaCompanyOrg> {
      */
     IPage<TaCompanyOrg> listCompanyAndOrg(IPage<TaCompanyOrg> pg,
                                           @Param("companyName") String companyName,
-                                          @Param("companyNumber") String companyNumber,
+                                          @Param("companyCode") String companyCode,
                                           @Param("certifiedStatus") String certifiedStatus,
                                           @Param("orgName") String orgName,
                                           @Param("miniAppName") String miniAppName);

src/main/java/com/huiju/estateagents/eContract/mapper/TaContractMapper.java

@@ -18,5 +18,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaContractMapper extends BaseMapper<TaContract> {
 
-    IPage<TaContract> listContractForChannel(IPage<TaContract> pg, @Param("bo") ContractRecordRequestBO bo);
+    IPage<TaContract> listContractForChannel(IPage<TaContract> pg,
+                                             @Param("bo") ContractRecordRequestBO bo);
 }

src/main/java/com/huiju/estateagents/eContract/service/ITaCompanyOrgService.java

@@ -20,12 +20,11 @@ public interface ITaCompanyOrgService extends IService<TaCompanyOrg> {
      * @param pageNum
      * @param pageSize
      * @param companyName     企业名称
-     * @param companyNumber   企业编号
+     * @param companyCode     企业编号
      * @param certifiedStatus 实名认证状态
      * @param orgName         组织名称
      * @param miniAppName     小程序名称
-     * @param orgId
      * @return
      */
-    ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyNumber, String certifiedStatus, String orgName, String miniAppName);
+    ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, String orgName, String miniAppName);
 }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyOrgServiceImpl.java

@@ -24,12 +24,12 @@ public class TaCompanyOrgServiceImpl extends ServiceImpl<TaCompanyOrgMapper, TaC
     @Autowired
     private TaCompanyOrgMapper taCompanyOrgMapper;
 
-    public ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyNumber, String certifiedStatus, String orgName, String miniAppName) {
+    public ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, String orgName, String miniAppName) {
         ResponseBean responseBean = new ResponseBean();
 
         // 组装分页
         IPage<TaCompanyOrg> pg = new Page<>(pageNum, pageSize);
-        pg = taCompanyOrgMapper.listCompanyAndOrg(pg,companyName,companyNumber,certifiedStatus,orgName,miniAppName);
+        pg = taCompanyOrgMapper.listCompanyAndOrg(pg,companyName,companyCode,certifiedStatus,orgName,miniAppName);
         responseBean.addSuccess(pg);
         return responseBean;
     }

src/main/resources/mapper/eContract/TaCompanyOrgMapper.xml

@@ -18,19 +18,19 @@
         WHERE
             t2.`status` = 1
             <if test = "companyName != null and companyName != ''">
-                AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
+                AND t2.company_name like CONCAT('%',#{companyName} , '%')
             </if>
-            <if test = "companyNumber != null and companyNumber != ''">
-                AND t2.company_number like CONCAT('%',#{bo.companyNumber} , '%')
+            <if test = "companyCode != null and companyCode != ''">
+                AND t2.company_code like CONCAT('%',#{companyCode} , '%')
             </if>
             <if test = "certifiedStatus != null and certifiedStatus != ''">
                 AND t2.certified_status = #{certifiedStatus}
             </if>
             <if test = "orgName != null and orgName != ''">
-                AND t3.`name` like CONCAT('%',#{bo.orgName} , '%')
+                AND t3.`name` like CONCAT('%',#{orgName} , '%')
             </if>
             <if test = "miniAppName != null and miniAppName != ''">
-                AND t4.`name` like CONCAT('%',#{bo.miniAppName} , '%')
+                AND t4.`name` like CONCAT('%',#{miniAppName} , '%')
             </if>
         ORDER BY
             t.create_date DESC

src/main/resources/mapper/eContract/TaContractMapper.xml

@@ -8,44 +8,50 @@
             t2.company_name,
             t2.company_number,
             t3.`name` orgName,
-            t4.`name` miniAppName
+            t4.`name` miniAppName,
+            t6.channel_proxy_name
         FROM
             ta_contract t
             LEFT JOIN ta_company t2 ON t.company_id = t2.company_id
             LEFT JOIN ta_org t3 ON t.org_id = t3.org_id
             LEFT JOIN ta_miniapp t4 ON t.org_id = t4.org_id
+            LEFT JOIN ta_channel_app_relation t5 ON t.org_id = t5.org_id
+            LEFT JOIN ta_channel_proxy t6 ON t5.channel_id = t6.channel_id
         <where>
-            <if test=" companyName != null and companyName != ''">
+            <if test=" bo.companyName != null and bo.companyName != ''">
                 AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
             </if>
-            <if test=" settlement != null and settlement != ''">
+            <if test=" bo.settlement != null and bo.settlement != ''">
                 AND t.settlement = #{bo.settlement}
             </if>
-            <if test=" companyNumber != null and companyNumber != ''">
-                AND t2.company_number like CONCAT('%',#{bo.companyNumber} , '%')
+            <if test=" bo.companyCode != null and bo.companyCode != ''">
+                AND t2.company_code like CONCAT('%',#{bo.companyCode} , '%')
             </if>
-            <if test=" orgName != null and orgName != ''">
+            <if test=" bo.orgName != null and bo.orgName != ''">
                 AND t3.`name` like CONCAT('%',#{bo.orgName} , '%')
             </if>
-            <if test=" miniAppName != null and miniAppName != ''">
+            <if test=" bo.miniAppName != null and bo.miniAppName != ''">
                 AND t4.`name` like CONCAT('%',#{bo.miniAppName} , '%')
             </if>
-            <if test=" contractId != null">
+            <if test=" bo.contractId != null">
                 AND t.contract_id like CONCAT('%',#{bo.contractId} , '%')
             </if>
-            <if test=" contractName != null and contractName != ''">
+            <if test=" bo.contractName != null and bo.contractName != ''">
                 AND t.contract_name like CONCAT('%',#{bo.contractName} , '%')
             </if>
-            <if test=" signatoryStartTime != null and signatoryStartTime != ''">
+            <if test=" bo.channelProxyName != null and bo.channelProxyName != ''">
+                AND t6.channel_proxy_name like CONCAT('%',#{bo.channelProxyName} , '%')
+            </if>
+            <if test=" bo.signatoryStartTime != null and bo.signatoryStartTime != ''">
                 AND t.signatory_time &gt;= #{bo.signatoryStartTime}
             </if>
-            <if test=" signatoryEndTime != null and signatoryEndTime != ''">
+            <if test=" bo.signatoryEndTime != null and bo.signatoryEndTime != ''">
                 AND t.signatory_time &lt;= #{bo.signatoryEndTime}
             </if>
-            <if test=" settlementStartTime != null and settlementStartTime != ''">
+            <if test=" bo.settlementStartTime != null and bo.settlementStartTime != ''">
                 AND t.settlement_time &gt;= #{bo.settlementStartTime}
             </if>
-            <if test=" settlementEndTime != null and settlementEndTime != ''">
+            <if test=" bo.settlementEndTime != null and bo.settlementEndTime != ''">
                 AND t.settlement_time &lt;= #{bosettlementEndTime.}
             </if>
         </where>