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

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

@@ -12,6 +12,7 @@ public class FadadaProperties {
     private String appId;
     private String appSecret;
     private String version;
+    private String authServeHost;
     private String serveHost;
     private String companyNotify;
     private String authReturnUrl;

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

@@ -263,7 +263,11 @@ public class TaRecommendCustomerController extends BaseController {
         try{
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("realty_consultant",person.getPersonId());
+
+            // 2020-4-1 yansen realty_consultant 可能是 person_id, 可能是 user_id
+//            queryWrapper.eq("realty_consultant",person.getPersonId());
+            queryWrapper.eq("org_id", person.getOrgId());   // 主要是为了走索引
+            queryWrapper.nested(query -> query.eq("realty_consultant",person.getPersonId()).or().eq("realty_consultant", person.getUserId()));
            // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
             queryWrapper.gt("status",CommConstant.STATUS_UNACCALIMED);
             queryWrapper.orderByDesc("create_date");

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

@@ -497,11 +497,7 @@ public class TaCompanyController extends BaseController {
     @RequestMapping(value = "/channel/company/autoAuthCompany/{id}", method = RequestMethod.PUT)
     public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request) throws Exception {
         ResponseBean responseBean = new ResponseBean();
-        QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
-        taMiniappQueryWrapper.eq("org_id", getOrgId(request));
-        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
-
-        String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request), taMiniapp.getMiniappId());
+        String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request));
         TaCompany taCompany = new TaCompany();
         taCompany.setCompanyId(id);
         taCompany.setAuthorizeAddress(res);
@@ -552,12 +548,8 @@ public class TaCompanyController extends BaseController {
      */
     @RequestMapping(value = "/channel/company/getAuthStatus/{id}", method = RequestMethod.GET)
     public ResponseBean getAuthStatus(@PathVariable Integer id, HttpServletRequest request){
-        QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
-        taMiniappQueryWrapper.eq("org_id", getOrgId(request));
-        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
-
         ResponseBean responseBean = new ResponseBean();
-        String res = iTaCompanyService.getAuthStatus(id, taMiniapp.getMiniappId());
+        String res = iTaCompanyService.getAuthStatus(id);
         JSONObject result = JSONObject.parseObject(res);
 
         if ((Integer) result.get("code") != 1){

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

@@ -119,11 +119,8 @@ public class TaCompanySealController extends BaseController {
     public ResponseBean taCompanySealAdd(@RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
-            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
-            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
-            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg(), taMiniapp.getMiniappId());
+            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
             JSONObject params = JSONObject.parseObject(result);
             if ((Integer) params.get("code") != 1){
                 responseBean.addError(params.get("msg").toString());
@@ -151,19 +148,14 @@ public class TaCompanySealController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @ResponseBody
-    @RequestMapping(value="/channel/delCompanySeal/{id}", method= RequestMethod.PUT)
-    public ResponseBean taCompanySealDelete(@PathVariable Integer id, HttpServletRequest request){
+    @RequestMapping(value="/channel/deleteCompanySeal/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCompanySealDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
-            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
-            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
-
             TaCompanySeal taCompanySeal = iTaCompanySealService.getById(id);
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
             iTaCompanyService.getById(taCompanySeal.getCompanyId());
-            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId(), taMiniapp.getMiniappId());
+            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId());
             JSONObject params = JSONObject.parseObject(res);
             Integer code = (Integer) params.get("code");
             if (code != 1){
@@ -198,13 +190,9 @@ public class TaCompanySealController extends BaseController {
                                         @RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
-            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
-            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
-
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
             TaCompanySeal sealInfo = iTaCompanySealService.getById(id);
-            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg(), taMiniapp.getMiniappId());
+            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg());
             JSONObject params = JSONObject.parseObject(res);
             Integer code = (Integer) params.get("code");
             if (code != 1){

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

@@ -34,9 +34,9 @@ public interface ITaCompanyService extends IService<TaCompany> {
      */
     TaCompany updateCompanyInfoByFdd(Integer id) throws Exception;
 
-    String autoAuthCompanySeal(Integer companyId, Integer orgId, String miniAppId) throws Exception;
+    String autoAuthCompanySeal(Integer companyId, Integer orgId) throws Exception;
 
     TaCompany getCompanyAndContractInfo(Integer companyId);
 
-    String getAuthStatus(Integer companyId, String miniAppId);
+    String getAuthStatus(Integer companyId);
 }

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

@@ -25,13 +25,13 @@ public class TaCompanySealUtil {
     @Autowired
     private TaMiniappMapper taMiniappMapper;
 
-    public String addSignaTure(String customerId, String imgUrl, String miniappId) throws Exception {
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), getFddServerHost(miniappId,fadadaProperties.getServeHost()));
+    public String addSignaTure(String customerId, String imgUrl) throws Exception {
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), fadadaProperties.getServeHost());
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
         return base.invokeaddSignature(customerId, base64Url);
     }
 
-    public String replaceSignature(String customerId, String signatureId, String imgUrl, String miniappId){
+    public String replaceSignature(String customerId, String signatureId, String imgUrl){
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
         ArrayList params = new ArrayList();
 
@@ -51,10 +51,10 @@ public class TaCompanySealUtil {
             throw new RuntimeException(var7);
         }
 
-        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "replace_signature.api", params);
+        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "replace_signature.api", params);
     }
 
-    public String delSignature(String customerId, String signatureId, String miniappId){
+    public String delSignature(String customerId, String signatureId){
         ArrayList params = new ArrayList();
 
         try {
@@ -72,14 +72,14 @@ public class TaCompanySealUtil {
             throw new RuntimeException(var7);
         }
 
-        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "remove_signature.api", params);
+        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "remove_signature.api", params);
     }
 
-    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId, String miniappId) throws Exception {
+    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId) throws Exception {
         String timeStamp = HttpsUtil.getTimeStamp();
         String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(transactionId + timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
         String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
-        StringBuilder stringBuilder = new StringBuilder(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "before_authsign.api?");
+        StringBuilder stringBuilder = new StringBuilder(fadadaProperties.getServeHost() + "before_authsign.api?");
         stringBuilder.append("app_id="+fadadaProperties.getAppId()+"&");
         stringBuilder.append("customer_id="+customerId+"&");
         stringBuilder.append("timestamp="+timeStamp+"&");
@@ -94,7 +94,7 @@ public class TaCompanySealUtil {
         return stringBuilder.toString();
     }
 
-    public String getAuthStatus(String customerId, String miniappId){
+    public String getAuthStatus(String customerId){
         ArrayList params = new ArrayList();
 
         try {
@@ -111,19 +111,7 @@ public class TaCompanySealUtil {
             throw new RuntimeException(var7);
         }
 
-        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "get_auth_status.api", params);
+        return HttpsUtil.doPost(fadadaProperties.getAuthServeHost() + "get_auth_status.api", params);
     }
 
-    /**
-     * 替换法大大服务器地址
-     * @return
-     */
-    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);
-        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
-        return newUrl;
-    }
 }

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

@@ -204,7 +204,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
     }
 
     @Override
-    public String autoAuthCompanySeal(Integer companyId, Integer orgId, String miniAppId) throws Exception {
+    public String autoAuthCompanySeal(Integer companyId, Integer orgId) throws Exception {
         TaCompany taCompany = taCompanyMapper.selectById(companyId);
         String timeStamp = HttpsUtil.getTimeStamp();
         String transactionId = "TRAN" + timeStamp;
@@ -219,7 +219,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
 
         Integer contractId = taContract.getContractId();
         String customerId = taCompany.getFadadaCode();
-        String res = taCompanySealUtil.autoAuthCompanySeal(transactionId, CommConstant.AUTH_TYPE, String.valueOf(contractId), customerId, String.valueOf(companyId), miniAppId);
+        String res = taCompanySealUtil.autoAuthCompanySeal(transactionId, CommConstant.AUTH_TYPE, String.valueOf(contractId), customerId, String.valueOf(companyId));
         return res;
     }
 
@@ -229,9 +229,9 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
     }
 
     @Override
-    public String getAuthStatus(Integer companyId, String miniAppId) {
+    public String getAuthStatus(Integer companyId) {
         TaCompany taCompany = taCompanyMapper.selectById(companyId);
-        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode(), miniAppId);
+        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode());
     }
 
     /**

src/main/resources/application-blue.yml

@@ -83,6 +83,7 @@ fadada:
   appId: "403057"
   appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
+  authServeHost: "http://test.api.fabigbig.com:8888/api/"
   serveHost: "https://testapi08.fadada.com/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
   authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="

src/main/resources/application-green.yml

@@ -83,8 +83,9 @@ fadada:
   appId: "403057"
   appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
-  serveHost: "https://testapi.fadada.com:8443/api/"
+  authServeHost: "http://test.api.fabigbig.com:8888/api/"
+  serveHost: "https://testapi08.fadada.com/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authReturnUrl: "http://dev.pawoma.cn/#/eContract/seal/list"
   authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
   signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -812,7 +812,7 @@ FROM
     <select id="getCustomersIRecommended" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         select a.*,b.avatarurl from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id
         where a.recommend_person = #{customerId}
-        and a.status = #{status}
+        and a.status &gt;= #{status}
         and a.org_id = #{orgId}
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND a.building_id in