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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.18</version>
+	<version>v3.5.19</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -174,17 +174,25 @@
 			</plugin>
 		</plugins>
 		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>application.yml</include>
-					<include>application-${profiles.active}.yml</include>
-					<include>mapper/**/*.xml</include>
-					<include>log/*.xml</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
+				<resource>
+					<directory>${basedir}/src/main/resources/lib</directory>
+					<targetPath>BOOT-INF/lib/</targetPath>
+					<includes>
+						<include>**/*.jar</include>
+					</includes>
+				</resource>
+                <resource>
+                    <directory>src/main/resources</directory>
+                    <filtering>true</filtering>
+                    <includes>
+                        <include>application.yml</include>
+                        <include>application-${profiles.active}.yml</include>
+                        <include>mapper/**/*.xml</include>
+                        <include>log/*.xml</include>
+                        <include>lib/*.jar</include>
+                    </includes>
+                </resource>
+            </resources>
+        </build>
 
-</project>
+    </project>

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

@@ -801,4 +801,9 @@ public class CommConstant {
     public static final String AUTO_AUTH_STATUS = "3000";
 
     public static final String  AUTH_SUCCESS_DESC = "签章成功";
+
+    /**
+     * 审核通过
+     */
+    public static final Integer STATUS_VERIFY_PASS = 4;
 }

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

@@ -99,7 +99,7 @@ public class TaCompanyController extends BaseController {
             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", 2);
+            queryWrapper.eq("status", 4);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
@@ -299,7 +299,7 @@ public class TaCompanyController extends BaseController {
                                        @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 status) {
+                                       @RequestParam(value = "status", required = false) String status) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -409,7 +409,7 @@ public class TaCompanyController extends BaseController {
             JSONArray jsonArray = JSONObject.parseObject(ids).getJSONArray("ids");
             for (Object id : jsonArray) {
                 TaCompany company = iTaCompanyService.getById((Integer) id);
-                if (CommConstant.STATUS_UNACCALIMED.equals(company.getStatus())){
+                if (!CommConstant.STATUS_VERIFY_PASS.equals(company.getStatus())){
                     company.setStatus(CommConstant.STATUS_DELETE);
                     iTaCompanyService.updateById(company);
                     successNum++;
@@ -522,10 +522,23 @@ public class TaCompanyController extends BaseController {
                                   @RequestParam(value = "msg_digest",required = false) String msg_digest,
                                   HttpServletRequest request) {
         logger.info("企业认证回调函数参数:交易号 {},合同编号 {}，签章结果代码 {}，签章结果描述 ，{}, 下载地址{}, 查看地址 {},请求时间 {}, 摘要 {} ",transaction_id,contract_id,result_code,result_desc,download_url,viewpdf_url,timestamp,msg_digest);
-        TaContract taContract = iTaContractService.getById(contract_id);
-        taContract.setContractDownloadUrl(download_url);
-        taContract.setContractViewUrl(viewpdf_url);
-        iTaContractService.updateById(taContract);
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        if ("3000".equals(result_code)){
+            TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
+            taContract.setContractDownloadUrl(download_url);
+            taContract.setContractViewUrl(viewpdf_url);
+            taContract.setStatus(CommConstant.STATUS_NORMAL);
+            taContract.setReason(parameterMap.get("result_desc")[0]);
+            iTaContractService.updateById(taContract);
+        }else{
+            TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
+            taContract.setContractDownloadUrl(download_url);
+            taContract.setContractViewUrl(viewpdf_url);
+            //签署失败
+            taContract.setStatus(2);
+            taContract.setReason(parameterMap.get("result_desc")[0]);
+            iTaContractService.updateById(taContract);
+        }
     }
 
     /**

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

@@ -297,4 +297,26 @@ public class TaContractController extends BaseController {
     }
 
 
+    /**
+     * 自动签署合同
+     */
+    @RequestMapping(value = "/wx/contract/check", method = RequestMethod.POST)
+    public ResponseBean checkContract(@RequestBody TaRaiseRecord taRaiseRecord, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = getOpenId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            TaContract taContract = iTaContractService.checkContract(taRaiseRecord, person);
+            responseBean.addSuccess(taContract);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -11,6 +11,7 @@ import com.huiju.estateagents.eContract.service.ITaContractUserService;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRaiseRecord;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaRaiseRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,9 @@ public class TaContractUserController extends BaseController {
     @Autowired
     public ITaPersonService taPersonService;
 
+    @Autowired
+    private ITaRaiseRecordService taRaiseRecordService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -166,7 +170,7 @@ public class TaContractUserController extends BaseController {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            TaContractUser taContractUser = iTaContractUserService.newFirstCustomerInfo(person,taRaiseRecord);
+            TaContractUser taContractUser = iTaContractUserService.newFirstCustomerInfo(person,taRaiseRecordService.getById(taRaiseRecord.getRaiseRecordId()));
             responseBean.addSuccess(taContractUser);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -147,6 +147,11 @@ public class TaContract implements Serializable {
      */
     private String personId;
 
+    /**
+     * 原因
+     */
+    private String reason;
+
     /**
      * 状态
      */

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

@@ -64,4 +64,12 @@ public interface ITaContractService extends IService<TaContract> {
      * @return
      */
     String manualContract(TaContract taContract, TaPerson person) throws Exception;
+
+    /**
+     * 检查签署合同状态
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    TaContract checkContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception;
 }

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

@@ -87,7 +87,6 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         taCompany.setCertifiedStatus(CommConstant.CERTIFIED_STATUS_REGISTERED);
         taCompany.setCreateDate(LocalDateTime.now());
         taCompany.setStatus(CommConstant.STATUS_UNACCALIMED);
-        taCompany.setAuthorizeStatus("3001");
         taCompanyMapper.insert(taCompany);
         return taCompany;
     }
@@ -255,9 +254,9 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
      */
     private String getFddServerHost(String miniappId,String subUrl) {
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
-        int index = subUrl.indexOf(File.separator);
-        int twoIndex = subUrl.indexOf(File.separator,index);
-        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
         return newUrl;
     }

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

@@ -10,6 +10,7 @@ import com.fadada.sdk.test.util.ConfigUtil;
 import com.fadada.sdk.util.http.HttpsUtil;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
+import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.entity.TaContract;
@@ -100,12 +101,29 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
     public TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception {
         taRaiseRecord = taRaiseRecordMapper.selectById(taRaiseRecord.getRaiseRecordId());
 
+
+
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
         if (null == taContractBusiness){
             throw new Exception("无合同模板，请和置业顾问联系");
         }
 
+        //检查是否签署过本合同
+        QueryWrapper<TaContract> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_id",taRaiseRecord.getBuildingId());
+        queryWrapper.eq("org_id",taRaiseRecord.getOrgId());
+        queryWrapper.eq("target_type","raise");
+        queryWrapper.eq("target_id",Integer.valueOf(taRaiseRecord.getRaiseId()));
+        queryWrapper.eq("invoice_target_type","raise_record");
+        queryWrapper.eq("invoice_target_id",taRaiseRecord.getRaiseRecordId());
+        queryWrapper.eq("company_id",taContractBusiness.getCompanyId());
+        queryWrapper.eq("person_id",person.getPersonId());
+        TaContract oldContract = taContractMapper.selectOne(queryWrapper);
+        if (null != oldContract){
+            return oldContract;
+        }
+
         //先入合同表
         TaContract taContract = new TaContract();
         taContract.setBuildingId(taRaiseRecord.getBuildingId());
@@ -118,10 +136,11 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         taContract.setCompanyId(taContractBusiness.getCompanyId());
         taContract.setCreateDate(LocalDateTime.now());
         taContract.setStatus(0);
+        taContract.setPersonId(person.getPersonId());
         taContractMapper.insert(taContract);
 
         //上传合同
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         String result = base.invokeUploadDocs(taContract.getContractId().toString(), taContractBusiness.getContractTemplateName(), null, taContractBusiness.getContractTemplateAddress(), ".pdf");
         JSONObject jsonObject = JSONObject.parseObject(result);
         if (!jsonObject.getString("code").equals("1000")){
@@ -148,7 +167,6 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         //反更新合同地址
         taContract.setContractDownloadUrl(autoSignResultJson.getString("download_url"));
         taContract.setContractViewUrl(autoSignResultJson.getString("viewpdf_url"));
-        taContract.setStatus(1);
         taContractMapper.updateById(taContract);
 
         //企业名称
@@ -162,9 +180,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
      */
     private String getFddServerHost(String miniappId,String subUrl) {
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
-        int index = subUrl.indexOf(File.separator);
-        int twoIndex = subUrl.indexOf(File.separator,index);
-        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
         return newUrl;
     }
@@ -180,9 +198,12 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
     public String manualContract(TaContract taContract, TaPerson person) throws Exception {
         //获取客户信息
         QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mini_openid",person.getMiniOpenid());
+        queryWrapper.eq("mini_openid", MD5Utils.md5(person.getMiniOpenid()));
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
 
+        if (taContract.getStatus() == 1){
+            throw new Exception("已经成功签署，无需再次签署");
+        }
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taContract.getTargetId().toString());
         if (null == taContractBusiness){
@@ -193,7 +214,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         String timeStamp = HttpsUtil.getTimeStamp();
         String transaction_id = "TRAN_" + timeStamp;
 
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         ExtsignReq req = new ExtsignReq();
         req.setCustomer_id(taContractUser.getFadadaCode());
         req.setTransaction_id(transaction_id);
@@ -206,4 +227,35 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         String signUrl = base.invokeExtSign(req);
         return signUrl;
     }
+
+    /**
+     * 检查签署合同状态
+     *
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    @Override
+    public TaContract checkContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception {
+        taRaiseRecord = taRaiseRecordMapper.selectById(taRaiseRecord.getRaiseRecordId());
+
+        //根据raiseId获取合同的所有参数
+        TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
+        if (null == taContractBusiness){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
+
+        //检查是否签署过本合同
+        QueryWrapper<TaContract> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_id",taRaiseRecord.getBuildingId());
+        queryWrapper.eq("org_id",taRaiseRecord.getOrgId());
+        queryWrapper.eq("target_type","raise");
+        queryWrapper.eq("target_id",Integer.valueOf(taRaiseRecord.getRaiseId()));
+        queryWrapper.eq("invoice_target_type","raise_record");
+        queryWrapper.eq("invoice_target_id",taRaiseRecord.getRaiseRecordId());
+        queryWrapper.eq("company_id",taContractBusiness.getCompanyId());
+        queryWrapper.eq("person_id",person.getPersonId());
+        TaContract oldContract = taContractMapper.selectOne(queryWrapper);
+        return oldContract;
+    }
 }

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

@@ -7,6 +7,7 @@ import com.fadada.sdk.client.FddClientBase;
 import com.fadada.sdk.client.authForfadada.FindCertInfo;
 import com.fadada.sdk.client.authForfadada.GetPersonVerifyUrl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.entity.TaContractUser;
@@ -57,18 +58,19 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
     public TaContractUser newFirstCustomerInfo(TaPerson person, TaRaiseRecord taRaiseRecord) throws Exception {
         //首先判断是否注册过账号
         QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mini_openid",person.getMiniOpenid());
+        queryWrapper.eq("mini_openid",MD5Utils.md5(person.getMiniOpenid()));
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
         if (null != taContractUser) {
             taContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
+            taContractUser.setCertifiedAddress(getFddServerHost(person.getMiniappId(),taContractUser.getCertifiedAddress()));
             return taContractUser;
         }
         //没有法大大账号的先注册
         log.info("========法大大个人注册=======");
         //在法大大注册个人用户
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         //小程序open——id为注册账号
-        String open_id = person.getMiniOpenid();
+        String open_id = MD5Utils.md5(person.getMiniOpenid());
         //account_type 1是个人注册
         String result =base.invokeregisterAccount(open_id,"1");
         log.info("法大大注册信息{}", result);
@@ -88,17 +90,17 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         newContractUser.setOrgId(CommConstant.STATUS_UNACCALIMED);
 
         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
-        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
+        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         String customer_id = jsonObject.getString("data");
         //0:三要素标准方案； 1:三要素补充方案；
-        String verifyed_way = "0";
+        String verifyed_way = "1";
         String page_modify = "1";
         String notify_url = fadadaProperties.getCompanyNotify();
         String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
         String customer_ident_type = "0";
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
                 page_modify,notify_url,return_url,null,customer_ident_type,
-                null,null,null,"1",null);
+                taRaiseRecord.getIdcard(),taRaiseRecord.getTel(),null,"1","1");
 
         String data = JSON.parseObject(personResult).getString("data");
         if (null !=data){
@@ -120,9 +122,9 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
      */
     private String getFddServerHost(String miniappId,String subUrl) {
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
-        int index = subUrl.indexOf(File.separator);
-        int twoIndex = subUrl.indexOf(File.separator,index);
-        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
         return newUrl;
     }
@@ -137,10 +139,10 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
     public TaContractUser getFirstCustomerInfo(TaPerson person) throws Exception {
         //注册账号信息
         QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mini_openid",person.getMiniOpenid());
+        queryWrapper.eq("mini_openid",MD5Utils.md5(person.getMiniOpenid()));
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
         log.info("个人正在从法大大获取最新数据，企业编号是 {}", taContractUser.getFadadaCode());
-        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
+        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         String verified_serialno = taContractUser.getCertifiedSerialNumber();
         String result = personCertInfo.invokeFindPersonCert(verified_serialno,
                 "1");

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -369,7 +369,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 // 若开启邀请制，校验该用户是否在邀请列表中
                 QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
                 taRaiseInviteQueryWrapper.eq("org_id", orgId);
-                taRaiseInviteQueryWrapper.eq("invite_tel", person.getTel());
+                taRaiseInviteQueryWrapper.eq("invite_tel", person.getPhone());
                 taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
                 TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
                 if (taRaiseInvite != null) {

src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java

@@ -412,10 +412,10 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         }
 
         // 是否展示签署合同入口
-        if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() || CommConstant.PAY_STATUS_PAID == taRaiseRecord.getPayStatus()) {
+        if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() && CommConstant.PAY_STATUS_PAID.equals(taRaiseRecord.getPayStatus())) {
             // 是否有认筹业务合同配置
             QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
-            taContractBusinessQueryWrapper.eq("target_id", raiseRecordId);
+            taContractBusinessQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
             taContractBusinessQueryWrapper.eq("org_id", orgId);
             taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             TaContractBusiness taContractBusiness = iTaContractBusinessService.getOne(taContractBusinessQueryWrapper);
@@ -423,16 +423,21 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
                 // 是否有有关联的认筹合同
                 QueryWrapper<TaContract> taContractQueryWrapper = new QueryWrapper<>();
                 taContractQueryWrapper.eq("org_id", orgId);
-                taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
+                taContractQueryWrapper.eq("target_type", "raise");
                 taContractQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
+                taContractQueryWrapper.eq("invoice_target_type", "raise_record");
+                taContractQueryWrapper.eq("invoice_target_id", taRaiseRecord.getRaiseRecordId());
+                taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
+                taContractQueryWrapper.eq("building_id", taRaiseRecord.getBuildingId());
                 taContractQueryWrapper.eq("person_id", personId);
                 TaContract taContract = iTaContractService.getOne(taContractQueryWrapper);
                 if (taContract != null) {
-                    if (taContract.getCustomerTime() == null) {
-                        taRaiseRecord.setShowContract(1);
-                    } else {
+                    // 合同状态正常
+                    if (CommConstant.STATUS_NORMAL == taContract.getStatus()) {
                         taRaiseRecord.setShowContract(0);
                         map.put("taContract", taContract);
+                    } else {
+                        taRaiseRecord.setShowContract(1);
                     }
                 } else {
                     taRaiseRecord.setShowContract(1);

src/test/java/com/huiju/estateagents/FdadaTest.java

@@ -77,44 +77,44 @@ public class FdadaTest {
     /*=============法大大实名测试=============*/
     @Test
     public void Test1(){
-        regAccount();//1注册账号
-        getAuthCompanyurl();//2获取企业实名认证地址
-        getAuthPersonurl();//3获取个人实名认证地址
-        findPersonCertInfo();//17 查询个人实名认证信息
-        findCompanyCertInfo();//18 查询企业实名认证信息
-        GetFileForUUID();//19 通过uuid下载文件
-        ApplyCert();//4实名证书申请
-        ApplyNumCert();//5编号证书申请
-        addSignature1();//6印章上传
-        addSignature2();//6印章上传
-        customSignature();//7自定义印章
+//        regAccount();//1注册账号
+//        getAuthCompanyurl();//2获取企业实名认证地址
+//        getAuthPersonurl();//3获取个人实名认证地址
+//        findPersonCertInfo();//17 查询个人实名认证信息
+//        findCompanyCertInfo();//18 查询企业实名认证信息
+//        GetFileForUUID();//19 通过uuid下载文件
+//        ApplyCert();//4实名证书申请
+//        ApplyNumCert();//5编号证书申请
+//        addSignature1();//6印章上传
+//        addSignature2();//6印章上传
+//        customSignature();//7自定义印章
 
     }
     @Test
     public void Test2(){
-        uploadContract();//8合同上传
-        uploadTemplate();//9模板上传
-        GenerateContract();//10模板填充
+//        uploadContract();//8合同上传
+//        uploadTemplate();//9模板上传
+//        GenerateContract();//10模板填充
     }
 
     @Test
     public void Test3(){
-        uploadContract();//8合同上传
-        extsign();//12手动签署接口
-        extsignAuto();//11自动签署
-        viewContract();//13合同查看
-        downloadContract();//14合同下载
-        contractFiling();//15合同归档
+//        uploadContract();//8合同上传
+//        extsign();//12手动签署接口
+//        extsignAuto();//11自动签署
+//        viewContract();//13合同查看
+//        downloadContract();//14合同下载
+//        contractFiling();//15合同归档
     }
 
     @Test
     public void Test4(){
-        addSignature2();
+//        addSignature2();
     }
 
     @Test
     public void Test5(){
-        autoAuthSeal();
+//        autoAuthSeal();
     }
 
     public void autoAuthSeal(){