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

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

      */
     public static final String MESSAGE_CONTENT_OF_HOUSE = "house";
 
+    /**
+     * 合同签订通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTRACT_SIGNING = "contract-signing";
+
     /**
      * 活动以结束
      */

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

             taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
 
-            if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+            if (null != taRaise && CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
                 // 若开启邀请制，校验该用户是否在邀请列表中
                 QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
                 taRaiseInviteQueryWrapper.eq("org_id", orgId);

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

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fadada.sdk.client.authForfadada.FindCertInfo;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
                                   @RequestParam(value = "authenticationType",required = false) String authenticationType,
                                   @RequestParam(value = "status",required = false) String status,
                                   HttpServletRequest request) {
+        Map<String, String[]> parameterMap = request.getParameterMap();
         logger.info("企业认证回调函数参数:交易号{}，认证类型{}，状态，{}, 人员名称{}",serialNo,authenticationType,status);
         //企业认证
         if ("2".equals(authenticationType)){
             taContractUserQueryWrapper.eq("certified_serial_number",serialNo);
             TaContractUser taContractUser = iTaContractUserService.getOne(taContractUserQueryWrapper);
             taContractUser.setStatus(Integer.valueOf(status));
+//            //如果状态是失败的情况下就发送短信  先注释如果没问题就删除
+//            if (status.equals("1")){
+//                logger.info("发送短信");
+//                //获取个人信息
+//                logger.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");
+//                logger.info("个人最新数据结果 {}",result);
+//                JSONObject jsonObject = JSONObject.parseObject(result);
+//                //更新数据
+//                String data = jsonObject.getString("data");
+//                if (null !=data){
+//                    JSONObject dataJson = JSONObject.parseObject(data);
+//                    //个人信息
+//                    JSONObject personJson = dataJson.getJSONObject("person");
+//                    if (null != personJson){
+//                        taCompanySealUtil.sendFddSms(taContractUser.getCertifiedAddress(),personJson.getString("mobile"));
+//                    }
+//                }
+//
+//            }
             taContractUser.setAuthStatus("autoSign");
             iTaContractUserService.updateById(taContractUser);
         }

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

 
         return HttpsUtil.doPost(fadadaProperties.getAuthServeHost() + "default_signature.api", params);
     }
+
+    public String sendFddSms(String sourceUrl, String mobile){
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String messageContent = "[${platform}]因小程序不支持人脸识别认证，请点击下面的链接开始人脸识别认证，认证通过后请回到小程序重新开始签署合同！${shortUrl}";
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + "10080" + messageContent + "2" + mobile + "2" + sourceUrl));
+            String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+            params.add(new BasicNameValuePair("source_url", sourceUrl));
+            params.add(new BasicNameValuePair("expire_time", "10080"));
+            params.add(new BasicNameValuePair("mobile", mobile));
+            params.add(new BasicNameValuePair("message_type", "2"));
+            params.add(new BasicNameValuePair("message_content", messageContent));
+            params.add(new BasicNameValuePair("sms_template_type", "2"));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(fadadaProperties.getAuthServeHost() + "push_short_url_sms.api", params);
+    }
 }

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

 
         //检查是否签署过本合同
         QueryWrapper<TaContract> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("building_id",taRaiseRecord.getBuildingId());
+         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()));
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
 
         req.setDoc_title(taContractBusiness.getContractTemplateName());
-        String redirectUrl = "/onlineSelling/pages/raiseMoney/signResult?id=" + taContract.getInvoiceTargetId();
+        String redirectUrl = URLEncoder.encode(URLEncoder.encode(
+                "/onlineSelling/pages/raiseMoney/signResult?id=" + taContract.getInvoiceTargetId(), "utf-8"), "utf-8");
         String return_url=  fadadaProperties.getRedirectUrl() + "?appid=123&redirect="+ redirectUrl;
         req.setReturn_url(URLEncoder.encode(return_url, "utf-8"));
         req.setNotify_url(fadadaProperties.getSignNotify());
         }
         taContract.setCustomerTime(LocalDateTime.now());
         taContractMapper.updateById(taContract);
+
         return signUrl;
     }
 

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

         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
         GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
         String customer_id = jsonObject.getString("data");
-        //0:三要素标准方案； 1:三要素补充方案；
-        String verifyed_way = "1";
+        //0:三要素标准方案； 1:三要素补充方案 4 纯三要素方案；
+        String verifyed_way = "4";
         String page_modify = "1";
         String notify_url = fadadaProperties.getCompanyNotify();
-        String redirectUrl = "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
+        String redirectUrl = URLEncoder.encode(URLEncoder.encode("/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId(), "utf-8"), "utf-8");
         String return_url=  fadadaProperties.getAuthReturnUrl() + "?appid=123&redirect="+ redirectUrl;
         String customer_ident_type = "0";
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,