Sfoglia il codice sorgente

修复 用户车辆列表

魏熙美 6 anni fa
parent
commit
335027ef56

+ 2
- 6
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseServiceImpl.java Vedi File

103
         //2. 更新车牌信息
103
         //2. 更新车牌信息
104
 
104
 
105
         taUserLicenses = taUserLicenses.stream().map(e-> {
105
         taUserLicenses = taUserLicenses.stream().map(e-> {
106
-            TaUserLicense taUserLicense = getTaUserLicense(e.getLicensePlate(), e);
107
-            taUserLicense.setUpdateUser(userElement.getId());
108
-            taUserLicense.setUpdateDate(new Date());
109
-            taUserLicenseMapper.updateByPrimaryKeySelective(taUserLicense);
110
-            taUserLicense.setUnitPrice(String.valueOf(Double.valueOf(taUserLicense.getUnitPrice()) / 100));
111
-            return taUserLicense;
106
+            e.setUnitPrice(String.valueOf(Double.valueOf(e.getUnitPrice()) / 100));
107
+            return e;
112
         }).collect(Collectors.toList());
108
         }).collect(Collectors.toList());
113
 
109
 
114
         responseBean.addSuccess(taUserLicenses);
110
         responseBean.addSuccess(taUserLicenses);

+ 1
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxPayServiceImpl.java Vedi File

349
 
349
 
350
 			// 车缴费
350
 			// 车缴费
351
 		} else if (Constant.PAY_TYPE_CAR.equals(type)) {
351
 		} else if (Constant.PAY_TYPE_CAR.equals(type)) {
352
-			if (null == extensionMonth && extensionMonth > 0) {
352
+			if (null == extensionMonth || extensionMonth <= 0) {
353
 				throw new Exception("延期月份不能为空,并且要大于0!");
353
 				throw new Exception("延期月份不能为空,并且要大于0!");
354
 			}
354
 			}
355
 
355
 

+ 6
- 6
CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FuShiRequestAPI.java Vedi File

78
         log.info("获取停车信息(通过车牌号)请求参数:{}", json);
78
         log.info("获取停车信息(通过车牌号)请求参数:{}", json);
79
         SignBuild signBuild = requestSign(json);
79
         SignBuild signBuild = requestSign(json);
80
         String result = client.doJsonPost(FushiConstant.PARK_GETPARKINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
80
         String result = client.doJsonPost(FushiConstant.PARK_GETPARKINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
81
-        showException(result);
82
         log.info("获取停车信息(通过车牌号)返回数据:{}", result);
81
         log.info("获取停车信息(通过车牌号)返回数据:{}", result);
82
+        showException(result);
83
         return result;
83
         return result;
84
     }
84
     }
85
 
85
 
113
         log.info("第三方月卡上发续费请求参数:{}", json);
113
         log.info("第三方月卡上发续费请求参数:{}", json);
114
         SignBuild signBuild = requestSign(json);
114
         SignBuild signBuild = requestSign(json);
115
         String result = client.doJsonPost(FushiConstant.CALCULATIONCOST_APITHIRDPARTYMONTHCARDPAY, json, signBuild.getSign(), signBuild.getTimestamp());
115
         String result = client.doJsonPost(FushiConstant.CALCULATIONCOST_APITHIRDPARTYMONTHCARDPAY, json, signBuild.getSign(), signBuild.getTimestamp());
116
-        showException(result);
117
         log.info("第三方月卡上发续费返回数据:{}", result);
116
         log.info("第三方月卡上发续费返回数据:{}", result);
117
+        showException(result);
118
         return result;
118
         return result;
119
     }
119
     }
120
 
120
 
164
         log.info("第三方临时卡上发缴费请求参数:{}", json);
164
         log.info("第三方临时卡上发缴费请求参数:{}", json);
165
         SignBuild signBuild = requestSign(json);
165
         SignBuild signBuild = requestSign(json);
166
         String result = client.doJsonPost(FushiConstant.CALCULATIONCOST_APITHIRDPARTYTEMPORARYCARDPAY, json, signBuild.getSign(), signBuild.getTimestamp());
166
         String result = client.doJsonPost(FushiConstant.CALCULATIONCOST_APITHIRDPARTYTEMPORARYCARDPAY, json, signBuild.getSign(), signBuild.getTimestamp());
167
-        showException(result);
168
         log.info("第三方临时卡上发缴费返回数据:{}", result);
167
         log.info("第三方临时卡上发缴费返回数据:{}", result);
168
+        showException(result);
169
         return result;
169
         return result;
170
 
170
 
171
     }
171
     }
183
         log.info("获取线下算费结果 请求参数:{}", json);
183
         log.info("获取线下算费结果 请求参数:{}", json);
184
         SignBuild signBuild = requestSign(json);
184
         SignBuild signBuild = requestSign(json);
185
         String result = client.doJsonPost(FushiConstant.CALCULATIONCOST_APIGETOFFLINEFEE, json, signBuild.getSign(), signBuild.getTimestamp());
185
         String result = client.doJsonPost(FushiConstant.CALCULATIONCOST_APIGETOFFLINEFEE, json, signBuild.getSign(), signBuild.getTimestamp());
186
-        showException(result);
187
         log.info("获取线下算费结果 返回数据:{}", result);
186
         log.info("获取线下算费结果 返回数据:{}", result);
187
+        showException(result);
188
         return result;
188
         return result;
189
     }
189
     }
190
 
190
 
201
         log.info("获取月租车信息(通过车牌号) 请求参数:{}", json);
201
         log.info("获取月租车信息(通过车牌号) 请求参数:{}", json);
202
         SignBuild signBuild = requestSign(json);
202
         SignBuild signBuild = requestSign(json);
203
         String result = client.doJsonPost(FushiConstant.PARK_GETMONTHCARDINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
203
         String result = client.doJsonPost(FushiConstant.PARK_GETMONTHCARDINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
204
-        showException(result);
205
         log.info("获取月租车信息(通过车牌号) 返回数据:{}", result);
204
         log.info("获取月租车信息(通过车牌号) 返回数据:{}", result);
205
+        showException(result);
206
         return result;
206
         return result;
207
     }
207
     }
208
 
208
 
218
         log.info("获取临时车信息(通过车牌号) 请求参数:{}", json);
218
         log.info("获取临时车信息(通过车牌号) 请求参数:{}", json);
219
         SignBuild signBuild = requestSign(json);
219
         SignBuild signBuild = requestSign(json);
220
         String result = client.doJsonPost(FushiConstant.PARK_GETTEMPCARPAYMENTINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
220
         String result = client.doJsonPost(FushiConstant.PARK_GETTEMPCARPAYMENTINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
221
-        showException(result);
222
         log.info("获取临时车信息(通过车牌号) 返回数据:{}", result);
221
         log.info("获取临时车信息(通过车牌号) 返回数据:{}", result);
222
+        showException(result);
223
         return result;
223
         return result;
224
     }
224
     }
225
 
225
 

BIN
CODE/smart-community/community-common/target/community-common-0.0.1.jar Vedi File


+ 0
- 4
CODE/smart-community/community-common/target/maven-archiver/pom.properties Vedi File

1
-#Created by Apache Maven 3.3.9
2
-version=0.0.1
3
-groupId=com.community
4
-artifactId=community-common

+ 0
- 45
CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst Vedi File

1
-com\community\commom\redis\RedisTemplate.class
2
-com\community\commom\redis\RedisConfiguration.class
3
-com\community\commom\utils\OssUtil.class
4
-com\community\commom\redis\SingleRedisTemplate.class
5
-com\community\commom\hk\entity\MonitoryPoint$MonitoryPointList.class
6
-com\community\commom\utils\EnumUtils.class
7
-com\community\commom\hk\HttpClientSSLUtils$2.class
8
-com\community\commom\redis\RedisJsonSerializer.class
9
-com\community\commom\uuid\IdGen.class
10
-com\community\commom\hk\PicUtils.class
11
-com\community\commom\utils\BeanTools.class
12
-com\community\commom\hk\HttpClientSSLUtils.class
13
-com\community\commom\session\UserElement.class
14
-com\community\commom\utils\CommonUtils.class
15
-com\community\commom\hk\test\OpenapiTest.class
16
-com\community\commom\redis\RedisSerializer.class
17
-com\community\commom\fushi\error\FuShiException.class
18
-com\community\commom\hk\entity\MonitoryPoint$MonitoryPointData.class
19
-com\community\commom\utils\StringConverter.class
20
-com\community\commom\fushi\FuShiRequestAPI.class
21
-com\community\commom\fushi\FushiConstant.class
22
-com\community\commom\mode\ResponseBean.class
23
-com\community\commom\fushi\Base64.class
24
-com\community\commom\utils\DESUtils.class
25
-com\community\commom\redis\FastJsonSerializer.class
26
-com\community\commom\utils\DateUtils.class
27
-com\community\commom\utils\HttpClientUtils.class
28
-com\community\commom\constant\Constant.class
29
-com\community\commom\hk\entity\MonitoryPoint.class
30
-com\community\commom\utils\CookieUtil.class
31
-com\community\commom\hk\HKConstant.class
32
-com\community\commom\mode\HkResponseBean.class
33
-com\community\commom\ailiyun\AESDecode.class
34
-com\community\commom\uuid\IdGen$IdGenHolder.class
35
-com\community\commom\utils\PayPriceUtils.class
36
-com\community\commom\fushi\FuShiHttpClient.class
37
-com\community\commom\hk\HttpClientSSLUtils$1.class
38
-com\community\commom\fushi\FuShiRequestAPI$SignBuild.class
39
-com\community\commom\utils\MD5Utils.class
40
-com\community\commom\redis\RedisObjectSerializer.class
41
-com\community\commom\utils\QRCodeGeneratorUtils.class
42
-com\community\commom\redis\SerializationFailedException.class
43
-com\community\commom\hk\Digests.class
44
-com\community\commom\hk\HKOpenApi.class
45
-com\community\commom\utils\AccountValidatorUtil.class

+ 0
- 39
CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst Vedi File

1
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
2
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
3
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java
4
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\Base64.java
5
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\FuShiHttpClient.java
6
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\PayPriceUtils.java
7
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
8
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
9
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
10
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
11
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
12
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
13
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
14
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
15
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\FuShiRequestAPI.java
16
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\entity\MonitoryPoint.java
17
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
18
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\HkResponseBean.java
19
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\PicUtils.java
20
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
21
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
22
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
23
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HKConstant.java
24
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
25
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
26
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\error\FuShiException.java
27
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
28
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HKOpenApi.java
29
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\test\OpenapiTest.java
30
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
31
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
32
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
33
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\uuid\IdGen.java
34
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
35
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\FushiConstant.java
36
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
37
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
38
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
39
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java