|  | @@ -19,7 +19,6 @@ import com.yonge.cooleshow.common.exception.BizException;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.common.page.PageInfo;
 | 
	
		
			
				|  |  |  import com.yonge.toolset.utils.date.DateUtil;
 | 
	
		
			
				|  |  |  import com.yonge.toolset.utils.string.StringUtil;
 | 
	
		
			
				|  |  | -import com.yonge.toolset.utils.string.ValueUtil;
 | 
	
		
			
				|  |  |  import com.yonge.toolset.utils.web.WebUtil;
 | 
	
		
			
				|  |  |  import io.swagger.annotations.Api;
 | 
	
		
			
				|  |  |  import io.swagger.annotations.ApiImplicitParam;
 | 
	
	
		
			
				|  | @@ -67,6 +66,8 @@ public class UserOrderController extends BaseController {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          try {
 | 
	
		
			
				|  |  |              return httpResponseResultFuture.get();
 | 
	
		
			
				|  |  | +        } catch (BizException e) {
 | 
	
		
			
				|  |  | +            return HttpResponseResult.failed(e.getMessage());
 | 
	
		
			
				|  |  |          } catch (Exception e) {
 | 
	
		
			
				|  |  |              e.printStackTrace();
 | 
	
		
			
				|  |  |              return HttpResponseResult.failed("下单失败");
 | 
	
	
		
			
				|  | @@ -80,7 +81,7 @@ public class UserOrderController extends BaseController {
 | 
	
		
			
				|  |  |          if (user == null || null == user.getId()) {
 | 
	
		
			
				|  |  |              return failed(HttpStatus.FORBIDDEN, "请登录");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        if(StringUtil.isEmpty(payReq.getOrderNo())){
 | 
	
		
			
				|  |  | +        if (StringUtil.isEmpty(payReq.getOrderNo())) {
 | 
	
		
			
				|  |  |              return failed("订单号不能为空");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          payReq.setUserId(user.getId());
 | 
	
	
		
			
				|  | @@ -108,7 +109,7 @@ public class UserOrderController extends BaseController {
 | 
	
		
			
				|  |  |          if (user == null || null == user.getId()) {
 | 
	
		
			
				|  |  |              return failed(HttpStatus.FORBIDDEN, "请登录");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        if(StringUtil.isEmpty(payReq.getOrderNo())){
 | 
	
		
			
				|  |  | +        if (StringUtil.isEmpty(payReq.getOrderNo())) {
 | 
	
		
			
				|  |  |              return failed("订单号不能为空");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          payReq.setUserId(user.getId());
 |