|  |  |  | @ -5,6 +5,8 @@ import cn.hutool.core.thread.ThreadUtil; | 
			
		
	
		
			
				
					|  |  |  |  | import cn.hutool.core.util.IdUtil; | 
			
		
	
		
			
				
					|  |  |  |  | import cn.hutool.core.util.StrUtil; | 
			
		
	
		
			
				
					|  |  |  |  | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.annotation.Log; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.common.util.ResultVOUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.constant.Constant; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.constant.ConstantStatus; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.constant.ConstantType; | 
			
		
	
	
		
			
				
					|  |  |  | @ -35,6 +37,7 @@ import com.glxp.api.util.IntUtil; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.util.OrderNoTypeBean; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.util.udi.FilterUdiUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.util.udi.UdiCalCountUtil; | 
			
		
	
		
			
				
					|  |  |  |  | import lombok.extern.slf4j.Slf4j; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.beans.BeanUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.scheduling.annotation.Async; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.stereotype.Service; | 
			
		
	
	
		
			
				
					|  |  |  | @ -54,6 +57,7 @@ import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS; | 
			
		
	
		
			
				
					|  |  |  |  |  */ | 
			
		
	
		
			
				
					|  |  |  |  | @Service | 
			
		
	
		
			
				
					|  |  |  |  | @Transactional(rollbackFor = Exception.class) | 
			
		
	
		
			
				
					|  |  |  |  | @Slf4j | 
			
		
	
		
			
				
					|  |  |  |  | public class IoCheckInoutService { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     @Resource | 
			
		
	
	
		
			
				
					|  |  |  | @ -138,13 +142,19 @@ public class IoCheckInoutService { | 
			
		
	
		
			
				
					|  |  |  |  |     public void check(String orderId) { | 
			
		
	
		
			
				
					|  |  |  |  |         IoOrderEntity orderEntity = orderService.findByBillNo(orderId); | 
			
		
	
		
			
				
					|  |  |  |  |         //过滤非未校验或校验异常
 | 
			
		
	
		
			
				
					|  |  |  |  |         log.error("修改订单当前状态 带校验"); | 
			
		
	
		
			
				
					|  |  |  |  |         if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_PROCESS && | 
			
		
	
		
			
				
					|  |  |  |  |                 orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_FAIL) | 
			
		
	
		
			
				
					|  |  |  |  |             return; | 
			
		
	
		
			
				
					|  |  |  |  |         try { | 
			
		
	
		
			
				
					|  |  |  |  |             orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS); | 
			
		
	
		
			
				
					|  |  |  |  |             orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); | 
			
		
	
		
			
				
					|  |  |  |  |         orderService.update(orderEntity); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |             int update = orderService.update(orderEntity); | 
			
		
	
		
			
				
					|  |  |  |  |             log.error("修改订单结果========:::::::" + update); | 
			
		
	
		
			
				
					|  |  |  |  |         } catch (Exception e) { | 
			
		
	
		
			
				
					|  |  |  |  |            e.printStackTrace(); | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |  |         log.error("修改订单"); | 
			
		
	
		
			
				
					|  |  |  |  |         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); | 
			
		
	
		
			
				
					|  |  |  |  |         if (!bussinessTypeEntity.isCheckEnable()) { | 
			
		
	
		
			
				
					|  |  |  |  |             unCheckFirstFinish(orderEntity); | 
			
		
	
	
		
			
				
					|  |  |  | 
 |