产品列表

controllers/product/product_controller.go

@@ -154,6 +154,11 @@ func (p *ProductController) ProductList(productType string, permissionIds string
 			PageSize: p.PageInfo.PageSize,
 		}
 		list, err := productService.GetProductListByProductType(productType, permissionIdList, userInfo.Id)
+		if err != nil {
+			p.FailedResult("分页查询产品列表失败", result)
+			err = exception.NewWithException(exception.GetProductListFailed, err.Error())
+			return
+		}
 		if p.PageInfo.LatestId == 0 {
 			p.PageInfo.LatestId = pageRes.LatestId
 			p.PageInfo.Total = pageRes.Total

domian/order/product_order.go

@@ -96,7 +96,7 @@ func convertProductOrderDTO(order orderDao.ProductOrder) (orderDTO ProductOrderD
 		orderDTO.StatusCN = transRefundStatusMap[order.RefundStatus]
 	}
 	if order.Status == orderDao.OrderStatusPending {
-		duration := time.Now().Sub(order.CreatedTime)
+		duration := time.Now().Sub(order.ExpiredTime)
 		timeout := duration - 15*time.Minute
 		if timeout > 0 {
 			logger.Info("订单已超时:%v", order.OrderID)