药品订单-导出
This commit is contained in:
@@ -322,3 +322,38 @@ func (r *Export) OrderInquiry(c *gin.Context) {
|
||||
|
||||
responses.OkWithData(ossAddress, c)
|
||||
}
|
||||
|
||||
// OrderProduct 药品订单
|
||||
func (r *Export) OrderProduct(c *gin.Context) {
|
||||
orderProductRequest := requests.OrderProductRequest{}
|
||||
req := orderProductRequest.OrderProductExportList
|
||||
if err := c.ShouldBind(&req); err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
// 参数验证
|
||||
if err := global.Validate.Struct(req); err != nil {
|
||||
responses.FailWithMessage(utils.Translate(err), c)
|
||||
return
|
||||
}
|
||||
|
||||
// 获取数据
|
||||
orderProductDao := dao.OrderProductDao{}
|
||||
orderProducts, err := orderProductDao.GetOrderProductExportListSearch(req)
|
||||
|
||||
if err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
// 业务处理
|
||||
exportService := service.ExportService{}
|
||||
ossAddress, err := exportService.OrderProduct(orderProducts)
|
||||
if err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
responses.OkWithData(ossAddress, c)
|
||||
}
|
||||
|
||||
@@ -16,28 +16,29 @@ type OrderProduct struct{}
|
||||
|
||||
// GetOrderProductPage 获取药品订单列表-分页
|
||||
func (r *OrderProduct) GetOrderProductPage(c *gin.Context) {
|
||||
req := requests.OrderProductRequest{}
|
||||
if err := c.ShouldBind(&req.GetOrderProductPage); err != nil {
|
||||
orderProductRequest := requests.OrderProductRequest{}
|
||||
req := orderProductRequest.GetOrderProductPage
|
||||
if err := c.ShouldBind(&req); err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
// 参数验证
|
||||
if err := global.Validate.Struct(req.GetOrderProductPage); err != nil {
|
||||
if err := global.Validate.Struct(req); err != nil {
|
||||
responses.FailWithMessage(utils.Translate(err), c)
|
||||
return
|
||||
}
|
||||
|
||||
if req.GetOrderProductPage.Page == 0 {
|
||||
req.GetOrderProductPage.Page = 1
|
||||
if req.Page == 0 {
|
||||
req.Page = 1
|
||||
}
|
||||
|
||||
if req.GetOrderProductPage.PageSize == 0 {
|
||||
req.GetOrderProductPage.PageSize = 20
|
||||
if req.PageSize == 0 {
|
||||
req.PageSize = 20
|
||||
}
|
||||
|
||||
orderProductDao := dao.OrderProductDao{}
|
||||
orderProduct, total, err := orderProductDao.GetOrderProductPageSearch(req.GetOrderProductPage, req.GetOrderProductPage.Page, req.GetOrderProductPage.PageSize)
|
||||
orderProduct, total, err := orderProductDao.GetOrderProductPageSearch(req, req.Page, req.PageSize)
|
||||
|
||||
if err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
@@ -52,8 +53,8 @@ func (r *OrderProduct) GetOrderProductPage(c *gin.Context) {
|
||||
}
|
||||
|
||||
result := make(map[string]interface{})
|
||||
result["page"] = req.GetOrderProductPage.Page
|
||||
result["page_size"] = req.GetOrderProductPage.PageSize
|
||||
result["page"] = req.Page
|
||||
result["page_size"] = req.PageSize
|
||||
result["total"] = total
|
||||
result["data"] = GetOrderProductPageResponses
|
||||
responses.OkWithData(result, c)
|
||||
|
||||
Reference in New Issue
Block a user