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

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

     @Autowired
     public ITaSalesBatchService taSalesBatchService;
 
+    @Autowired
+    private ITaRaiseService iTaRaiseService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @Autowired
+    private ITaRaiseInviteService iTaRaiseInviteService;
+
     /**
      * 分页查询列表
      *
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
         String personId = getPersonId(request);
-
+        List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = persons.get(0);
         logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{},source:{}",
                 orgId, salesBatchId, startPrice, endPrice, apartmentId, source);
 
         try {
+            // 查询批次下认筹是否开启邀请制
+            QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+            taRaiseQueryWrapper.eq("org_id", orgId);
+            taRaiseQueryWrapper.eq("sales_batch_id", salesBatchId);
+            taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
+
+            if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+                // 若开启邀请制，校验该用户是否在邀请列表中
+                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+                taRaiseInviteQueryWrapper.eq("org_id", orgId);
+                taRaiseInviteQueryWrapper.eq("invite_tel", person.getPhone());
+                taRaiseInviteQueryWrapper.eq("sales_batch_id", salesBatchId);
+                TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+                if (null == taRaiseInvite) {
+                    return ResponseBean.error("仅限被邀请用户查看房源",ResponseBean.ERROR_ILLEGAL_PARAMS);
+                }
+            }
             //获取所有楼房的预选热度和认筹热度
             List<TaHousingResourcesPO> taHousingResourcesPOList = iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, personId, source);
             //此处处理我的预选，我的认筹，和我的锁定

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

             //企业法人、代理人信息
             JSONObject managerJson = dataJson.getJSONObject("manager");
             if (null != managerJson){
+                //0：个人； 1：法人； 2：代理人,
+                if (managerJson.getString("type").equals("1")){
+                    taCompany.setCompanyManagerType("legal");
+                }else if (managerJson.getString("type").equals("2")){
+                    taCompany.setCompanyManagerType("agent");
+                }
                 taCompany.setUserName(managerJson.getString("personName"));
                 taCompany.setTel(managerJson.getString("mobile"));
                 taCompany.setIdCard(managerJson.getString("idCard"));

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

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fadada.sdk.client.FddClientBase;
+import com.fadada.sdk.client.authForfadada.FindCertInfo;
 import com.fadada.sdk.client.request.ExtsignReq;
 import com.fadada.sdk.test.util.ConfigUtil;
 import com.fadada.sdk.util.http.HttpsUtil;
         String result = base.invokeUploadDocs(taContract.getContractId().toString(), taContractBusiness.getContractTemplateName(), null, taContractBusiness.getContractTemplateAddress(), ".pdf");
         JSONObject jsonObject = JSONObject.parseObject(result);
         if (!jsonObject.getString("code").equals("1000")){
+            taContractMapper.deleteById(taContract.getContractId());
             throw new Exception(jsonObject.getString("msg"));
         }
 
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
 
         req.setDoc_title(taContractBusiness.getContractTemplateName());
-        String redirectUrl = URLEncoder.encode("/onlineSelling/pages/raiseMoney/signResult?id=" + taContract.getInvoiceTargetId(), "utf-8");
+        String redirectUrl = "/onlineSelling/pages/raiseMoney/signResult?id=" + taContract.getInvoiceTargetId();
         String return_url=  fadadaProperties.getRedirectUrl() + "?appid=123&redirect="+ redirectUrl;
-        req.setReturn_url(return_url);
+        req.setReturn_url(URLEncoder.encode(return_url, "utf-8"));
         req.setNotify_url(fadadaProperties.getSignNotify());
         String signUrl = base.invokeExtSignDIY(req,"1","0");
 
         //更新乙方数据
-        TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taContract.getInvoiceTargetId());
-        taContract.setCustomerName(taRaiseRecord.getUserName());
-        taContract.setCustomerTel(taRaiseRecord.getTel());
-        taContract.setCustomerIdcard(taRaiseRecord.getIdcard());
+        //获取个人信息
+        log.info("个人正在从法大大获取最新数据，企业编号是 {}", taContractUser.getFadadaCode());
+        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        String verified_serialno = taContractUser.getCertifiedSerialNumber();
+        String result = personCertInfo.invokeFindPersonCert(verified_serialno,
+                "1");
+        log.info("个人最新数据结果 {}",result);
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (jsonObject.getInteger("code") != 1){
+            throw new Exception(jsonObject.getString("msg"));
+        }
+        //更新数据
+        String data = jsonObject.getString("data");
+        if (null !=data){
+            JSONObject dataJson = JSONObject.parseObject(data);
+            //个人信息
+            JSONObject personJson = dataJson.getJSONObject("person");
+            if (null != personJson){
+                taContract.setCustomerName(personJson.getString("personName"));
+                taContract.setCustomerTel(personJson.getString("mobile"));
+                taContract.setCustomerIdcard(personJson.getString("idCard"));
+            }
+        }
         taContract.setCustomerTime(LocalDateTime.now());
         taContractMapper.updateById(taContract);
         return signUrl;

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

         String verifyed_way = "1";
         String page_modify = "1";
         String notify_url = fadadaProperties.getCompanyNotify();
-        String redirectUrl = URLEncoder.encode("/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId(), "utf-8");
+        String redirectUrl = "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
         String return_url=  fadadaProperties.getAuthReturnUrl() + "?appid=123&redirect="+ redirectUrl;
         String customer_ident_type = "0";
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
-                page_modify,notify_url,return_url,null,customer_ident_type,
+                page_modify,notify_url,URLEncoder.encode(return_url, "utf-8"),null,customer_ident_type,
                 taRaiseRecord.getIdcard(),taRaiseRecord.getTel(),null,"1","1");
 
         String data = JSON.parseObject(personResult).getString("data");