2022年12月30日10:24:22

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/RepairServiceImpl.java

@@ -202,7 +202,7 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
 			List<String> boxType = repairItemList.stream().map(RepairItem::getBoxType).distinct().collect(Collectors.toList());
 			for (String boxType_ : boxType) {
 				if (ObjectUtils.isNotNull(boxType) && boxType.size() > 0) {
-					List<RepairItem> boxTypeSize = repairItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
+					List<RepairItem> boxTypeSize = repairItemList.stream().filter(e -> ObjectUtils.isNotNull(e.getBoxType()) && e.getBoxType().equals(boxType_)).collect(Collectors.toList());
 					if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
 						boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
 					}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -216,7 +216,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			List<String> boxType = tradingBoxItemList.stream().map(TradingBoxItem::getBoxType).distinct().collect(Collectors.toList());
 			for (String boxType_ : boxType) {
 				if (ObjectUtils.isNotNull(boxType) && boxType.size() > 0) {
-					List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
+					List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> ObjectUtils.isNotNull(e.getBoxType()) && e.getBoxType().equals(boxType_)).collect(Collectors.toList());
 					if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
 						boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
 					}
@@ -454,7 +454,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			List<String> boxType = tradingBoxItemList.stream().map(TradingBoxItem::getBoxType).distinct().collect(Collectors.toList());
 			for (String boxType_ : boxType) {
 				if (ObjectUtils.isNotNull(boxType) && boxType.size() > 0) {
-					List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
+					List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> ObjectUtils.isNotNull(e.getBoxType()) && e.getBoxType().equals(boxType_)).collect(Collectors.toList());
 					if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
 						boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
 					}
@@ -994,6 +994,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 						}
 						archivesTrajectory.setStatus("租入");
 						tradingBoxItem.setStatus("待使用");
+						tradingBoxItem.setRentEndDate(tradingBoxItem.getLeaseCommencementDate());
 					} else {
 						archives.setBoxAccessStatus("空箱离场");
 						archives.setStatus("使用");

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -208,7 +208,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			List<String> boxType = transportItemList.stream().map(TransportItem::getBoxType).distinct().collect(Collectors.toList());
 			for (String boxType_ : boxType) {
 				if (ObjectUtils.isNotNull(boxType) && boxType.size() > 0) {
-					List<TransportItem> boxTypeSize = transportItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
+					List<TransportItem> boxTypeSize = transportItemList.stream().filter(e -> ObjectUtils.isNotNull(e.getBoxType()) && e.getBoxType().equals(boxType_)).collect(Collectors.toList());
 					if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
 						boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
 					}

blade-service/blade-client/src/main/java/org/springblade/client/wechat/controller/WechatController.java

@@ -61,25 +61,24 @@ public class WechatController {
 		if (StringUtil.isBlank(loginCode)) {
 			throw new SecurityException("登录code获取失败");
 		}
-
-		LambdaQueryWrapper<Parameters> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(Parameters::getIsDeleted,0)
-			.eq(Parameters::getStatus,1)
-			.eq(Parameters::getSubAppid,applets_id);
-		Parameters parameters = parametersService.getOne(lambdaQueryWrapper);
-		if (ObjectUtils.isNull(parameters)){
-			throw new SecurityException("未找到小程序信息");
-		}
-
-		if (ObjectUtils.isNull(parameters.getAppSecret())){
-			throw new SecurityException("未找到小程序秘钥");
-		}
-
 		Map<String, Object> map = new HashMap<>(16);
 		String requestUrl = "";
 		String appIds = "";
 		String appSecrets = "";
 		if (ObjectUtils.isNotNull(applets_id)) {
+			LambdaQueryWrapper<Parameters> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(Parameters::getIsDeleted,0)
+				.eq(Parameters::getStatus,1)
+				.eq(Parameters::getSubAppid,applets_id);
+			Parameters parameters = parametersService.getOne(lambdaQueryWrapper);
+			if (ObjectUtils.isNull(parameters)){
+				throw new SecurityException("未找到小程序信息");
+			}
+
+			if (ObjectUtils.isNull(parameters.getAppSecret())){
+				throw new SecurityException("未找到小程序秘钥");
+			}
+
 			appIds = applets_id;
 			appSecrets = parameters.getAppSecret();
 			requestUrl = GetPageAccessTokenUrl.replace("APPID", appIds).replace("SECRET", appSecrets).replace("CODE", loginCode);