Pārlūkot izejas kodu

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

傅行帆 5 gadus atpakaļ
vecāks
revīzija
fb48dac614

+ 1
- 0
src/main/java/com/huiju/estateagents/config/FadadaProperties.java Parādīt failu

@@ -12,6 +12,7 @@ public class FadadaProperties {
12 12
     private String appId;
13 13
     private String appSecret;
14 14
     private String version;
15
+    private String authServeHost;
15 16
     private String serveHost;
16 17
     private String companyNotify;
17 18
     private String authReturnUrl;

+ 5
- 1
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Parādīt failu

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

+ 2
- 10
src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java Parādīt failu

@@ -497,11 +497,7 @@ public class TaCompanyController extends BaseController {
497 497
     @RequestMapping(value = "/channel/company/autoAuthCompany/{id}", method = RequestMethod.PUT)
498 498
     public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request) throws Exception {
499 499
         ResponseBean responseBean = new ResponseBean();
500
-        QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
501
-        taMiniappQueryWrapper.eq("org_id", getOrgId(request));
502
-        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
503
-
504
-        String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request), taMiniapp.getMiniappId());
500
+        String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request));
505 501
         TaCompany taCompany = new TaCompany();
506 502
         taCompany.setCompanyId(id);
507 503
         taCompany.setAuthorizeAddress(res);
@@ -552,12 +548,8 @@ public class TaCompanyController extends BaseController {
552 548
      */
553 549
     @RequestMapping(value = "/channel/company/getAuthStatus/{id}", method = RequestMethod.GET)
554 550
     public ResponseBean getAuthStatus(@PathVariable Integer id, HttpServletRequest request){
555
-        QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
556
-        taMiniappQueryWrapper.eq("org_id", getOrgId(request));
557
-        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
558
-
559 551
         ResponseBean responseBean = new ResponseBean();
560
-        String res = iTaCompanyService.getAuthStatus(id, taMiniapp.getMiniappId());
552
+        String res = iTaCompanyService.getAuthStatus(id);
561 553
         JSONObject result = JSONObject.parseObject(res);
562 554
 
563 555
         if ((Integer) result.get("code") != 1){

+ 5
- 17
src/main/java/com/huiju/estateagents/eContract/controller/TaCompanySealController.java Parādīt failu

@@ -119,11 +119,8 @@ public class TaCompanySealController extends BaseController {
119 119
     public ResponseBean taCompanySealAdd(@RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
120 120
         ResponseBean responseBean = new ResponseBean();
121 121
         try {
122
-            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
123
-            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
124
-            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
125 122
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
126
-            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg(), taMiniapp.getMiniappId());
123
+            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
127 124
             JSONObject params = JSONObject.parseObject(result);
128 125
             if ((Integer) params.get("code") != 1){
129 126
                 responseBean.addError(params.get("msg").toString());
@@ -151,19 +148,14 @@ public class TaCompanySealController extends BaseController {
151 148
      * 根据id删除对象
152 149
      * @param id  实体ID
153 150
      */
154
-    @ResponseBody
155
-    @RequestMapping(value="/channel/delCompanySeal/{id}", method= RequestMethod.PUT)
156
-    public ResponseBean taCompanySealDelete(@PathVariable Integer id, HttpServletRequest request){
151
+    @RequestMapping(value="/channel/deleteCompanySeal/{id}",method= RequestMethod.PUT)
152
+    public ResponseBean taCompanySealDelete(@PathVariable Integer id){
157 153
         ResponseBean responseBean = new ResponseBean();
158 154
         try {
159
-            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
160
-            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
161
-            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
162
-
163 155
             TaCompanySeal taCompanySeal = iTaCompanySealService.getById(id);
164 156
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
165 157
             iTaCompanyService.getById(taCompanySeal.getCompanyId());
166
-            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId(), taMiniapp.getMiniappId());
158
+            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId());
167 159
             JSONObject params = JSONObject.parseObject(res);
168 160
             Integer code = (Integer) params.get("code");
169 161
             if (code != 1){
@@ -198,13 +190,9 @@ public class TaCompanySealController extends BaseController {
198 190
                                         @RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
199 191
         ResponseBean responseBean = new ResponseBean();
200 192
         try {
201
-            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
202
-            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
203
-            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
204
-
205 193
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
206 194
             TaCompanySeal sealInfo = iTaCompanySealService.getById(id);
207
-            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg(), taMiniapp.getMiniappId());
195
+            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg());
208 196
             JSONObject params = JSONObject.parseObject(res);
209 197
             Integer code = (Integer) params.get("code");
210 198
             if (code != 1){

+ 2
- 2
src/main/java/com/huiju/estateagents/eContract/service/ITaCompanyService.java Parādīt failu

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

+ 10
- 22
src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanySealUtil.java Parādīt failu

@@ -25,13 +25,13 @@ public class TaCompanySealUtil {
25 25
     @Autowired
26 26
     private TaMiniappMapper taMiniappMapper;
27 27
 
28
-    public String addSignaTure(String customerId, String imgUrl, String miniappId) throws Exception {
29
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), getFddServerHost(miniappId,fadadaProperties.getServeHost()));
28
+    public String addSignaTure(String customerId, String imgUrl) throws Exception {
29
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), fadadaProperties.getServeHost());
30 30
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
31 31
         return base.invokeaddSignature(customerId, base64Url);
32 32
     }
33 33
 
34
-    public String replaceSignature(String customerId, String signatureId, String imgUrl, String miniappId){
34
+    public String replaceSignature(String customerId, String signatureId, String imgUrl){
35 35
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
36 36
         ArrayList params = new ArrayList();
37 37
 
@@ -51,10 +51,10 @@ public class TaCompanySealUtil {
51 51
             throw new RuntimeException(var7);
52 52
         }
53 53
 
54
-        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "replace_signature.api", params);
54
+        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "replace_signature.api", params);
55 55
     }
56 56
 
57
-    public String delSignature(String customerId, String signatureId, String miniappId){
57
+    public String delSignature(String customerId, String signatureId){
58 58
         ArrayList params = new ArrayList();
59 59
 
60 60
         try {
@@ -72,14 +72,14 @@ public class TaCompanySealUtil {
72 72
             throw new RuntimeException(var7);
73 73
         }
74 74
 
75
-        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "remove_signature.api", params);
75
+        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "remove_signature.api", params);
76 76
     }
77 77
 
78
-    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId, String miniappId) throws Exception {
78
+    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId) throws Exception {
79 79
         String timeStamp = HttpsUtil.getTimeStamp();
80 80
         String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(transactionId + timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
81 81
         String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
82
-        StringBuilder stringBuilder = new StringBuilder(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "before_authsign.api?");
82
+        StringBuilder stringBuilder = new StringBuilder(fadadaProperties.getServeHost() + "before_authsign.api?");
83 83
         stringBuilder.append("app_id="+fadadaProperties.getAppId()+"&");
84 84
         stringBuilder.append("customer_id="+customerId+"&");
85 85
         stringBuilder.append("timestamp="+timeStamp+"&");
@@ -94,7 +94,7 @@ public class TaCompanySealUtil {
94 94
         return stringBuilder.toString();
95 95
     }
96 96
 
97
-    public String getAuthStatus(String customerId, String miniappId){
97
+    public String getAuthStatus(String customerId){
98 98
         ArrayList params = new ArrayList();
99 99
 
100 100
         try {
@@ -111,19 +111,7 @@ public class TaCompanySealUtil {
111 111
             throw new RuntimeException(var7);
112 112
         }
113 113
 
114
-        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "get_auth_status.api", params);
114
+        return HttpsUtil.doPost(fadadaProperties.getAuthServeHost() + "get_auth_status.api", params);
115 115
     }
116 116
 
117
-    /**
118
-     * 替换法大大服务器地址
119
-     * @return
120
-     */
121
-    private String getFddServerHost(String miniappId,String subUrl) {
122
-        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
123
-        int index = subUrl.indexOf(File.separator);
124
-        int twoIndex = subUrl.indexOf(File.separator,index);
125
-        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
126
-        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
127
-        return newUrl;
128
-    }
129 117
 }

+ 4
- 4
src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyServiceImpl.java Parādīt failu

@@ -204,7 +204,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
204 204
     }
205 205
 
206 206
     @Override
207
-    public String autoAuthCompanySeal(Integer companyId, Integer orgId, String miniAppId) throws Exception {
207
+    public String autoAuthCompanySeal(Integer companyId, Integer orgId) throws Exception {
208 208
         TaCompany taCompany = taCompanyMapper.selectById(companyId);
209 209
         String timeStamp = HttpsUtil.getTimeStamp();
210 210
         String transactionId = "TRAN" + timeStamp;
@@ -219,7 +219,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
219 219
 
220 220
         Integer contractId = taContract.getContractId();
221 221
         String customerId = taCompany.getFadadaCode();
222
-        String res = taCompanySealUtil.autoAuthCompanySeal(transactionId, CommConstant.AUTH_TYPE, String.valueOf(contractId), customerId, String.valueOf(companyId), miniAppId);
222
+        String res = taCompanySealUtil.autoAuthCompanySeal(transactionId, CommConstant.AUTH_TYPE, String.valueOf(contractId), customerId, String.valueOf(companyId));
223 223
         return res;
224 224
     }
225 225
 
@@ -229,9 +229,9 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
229 229
     }
230 230
 
231 231
     @Override
232
-    public String getAuthStatus(Integer companyId, String miniAppId) {
232
+    public String getAuthStatus(Integer companyId) {
233 233
         TaCompany taCompany = taCompanyMapper.selectById(companyId);
234
-        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode(), miniAppId);
234
+        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode());
235 235
     }
236 236
 
237 237
     /**

+ 1
- 0
src/main/resources/application-blue.yml Parādīt failu

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

+ 3
- 2
src/main/resources/application-green.yml Parādīt failu

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

+ 1
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml Parādīt failu

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

+ 56
- 5
src/test/java/com/huiju/estateagents/FdadaTest.java
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu