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

@@ -471,9 +471,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R receiveOrder(OrderAddVO vo) throws IOException{
-		log.error("vo.getCreateTime()="+vo.getCreateTime());
-		log.error("vo.getDeptNo()="+vo.getDeptNo());
-		log.error("vo.getOrderNo()="+vo.getOrderNo());
+
 		if (Common.isEmpty(vo.getOrderNo())){
 			return R.failed(OrderConstants.ORDER_NO_IS_EMPTY);
 		}
@@ -514,7 +512,15 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		if (CollectionUtils.isEmpty(vo.getHandleUserList())){
 			return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
 		}		TSettleDomain settleDomain = new TSettleDomain();
-
+		if(vo.getUrgencyExtent().equals(CommonConstants.ONE_STRING)){
+             vo.setUrgencyExtent("加急(2-3小时)");
+		}
+		if(vo.getUrgencyExtent().equals(CommonConstants.TWO_STRING)){
+			vo.setUrgencyExtent("紧急(3-5小时)");
+		}
+		if(vo.getUrgencyExtent().equals(CommonConstants.THREE_STRING)){
+			vo.setUrgencyExtent("常规(5-8小时)");
+		}
 		List<TSettleDomainSelectVo> settleDomainR;
 		R<TSettleDomainListVo> listVo;
 		listVo = archivesDaprUtil.selectSettleDomainSelectVoByNo(vo.getDeptNo());