Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -225,7 +225,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					.eq(TOrderEnclosure::getDeleteFlag, CommonConstants.ZERO_INT)
 			);
 			if (CollectionUtils.isNotEmpty(list)) {
-				List<TOrderEnclosure> listOld = list.stream().filter(e -> CommonConstants.ZERO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
+				List<TOrderEnclosure> fileList = list.stream().filter(e -> CommonConstants.ZERO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> wageList = list.stream().filter(e -> CommonConstants.TWO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> salaryList = list.stream().filter(e -> CommonConstants.THREE_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> socialList = list.stream().filter(e -> CommonConstants.FOUR_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
@@ -237,8 +237,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 				List<TOrderEnclosure> otherList = list.stream().filter(e -> CommonConstants.TEN_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> salaryHandoverList = list.stream().filter(e -> CommonConstants.ELEVEN_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 
-				if (CollectionUtils.isNotEmpty(listOld)) {
-					orderDetailVO.setOrderEnclosure(listOld);
+				if (CollectionUtils.isNotEmpty(fileList)) {
+					orderDetailVO.setOrderEnclosure(fileList);
 				} else {
 					orderDetailVO.setOrderEnclosure(Lists.newArrayList());
 				}
@@ -508,7 +508,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		if (!Common.isEmpty(vo.getOrderContent()) && !ValidityUtil.validate2048(vo.getOrderContent())){
 			return R.failed(OrderConstants.ORDER_CONTENT_MORE_THAN_2048);
 		}
-			TSettleDomain settleDomain = new TSettleDomain();
+		if (CollectionUtils.isEmpty(vo.getHandleUserList())){
+			return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
+		}		TSettleDomain settleDomain = new TSettleDomain();
 
 		List<TSettleDomainSelectVo> settleDomainR;
 		R<TSettleDomainListVo> listVo;