From 012da13206f2e4d6a3871b050c71a3b237878424 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 10 八月 2023 16:39:32 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
api/v1/salesDetails.go | 39 ++++++---------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 113673f..7a7ab52 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -97,42 +97,15 @@
ctx.Ok()
}
-
func checkSalesDetailsParams(salesDetails request.SalesDetails) (errCode int, salesDetailsModel model.SalesDetails) {
- //if salesDetails.ClientId == 0 {
- // return ecode.InvalidParams, salesDetailsModel
- //}
- //
- //if salesDetails.Number == "" {
- // return ecode.InvalidParams, salesDetailsModel
- //}
- //
- //if salesDetails.MemberId == 0 {
- // return ecode.InvalidParams, salesDetailsModel
- //}
- //
- //if salesDetails.SignTime == "" {
- // return ecode.InvalidParams, salesDetailsModel
- //}
-
- t, err := checkTimeFormat(salesDetails.SignTime)
- if err != nil {
- return ecode.InvalidParams, salesDetailsModel
- }
-
- t, err = checkTimeFormat(salesDetails.DeliveryDate)
- if err != nil {
- return ecode.InvalidParams, salesDetailsModel
- }
-
salesDetailsModel.ClientId = salesDetails.ClientId
salesDetailsModel.Number = salesDetails.Number
salesDetailsModel.SaleChanceId = salesDetails.SaleChanceId
salesDetailsModel.SaleType = salesDetails.SaleType
- salesDetailsModel.SignTime = t
+ salesDetailsModel.SignTime = salesDetails.SignTime
salesDetailsModel.MemberId = salesDetails.MemberId
- salesDetailsModel.DeliveryDate = t
- salesDetailsModel.WechatOrderStatus = salesDetails.WechatOrderStatus
+ salesDetailsModel.DeliveryDate = salesDetails.DeliveryDate
+ salesDetailsModel.WechatOrderStatusId = salesDetails.WechatOrderStatusId
salesDetailsModel.Address = salesDetails.Address
salesDetailsModel.Phone = salesDetails.Phone
salesDetailsModel.Remark = salesDetails.Remark
@@ -161,14 +134,14 @@
return
}
- salesDetailss, total, errCode := salesDetailsService.GetSalesDetailsList(params.Page, params.PageSize, params.Keyword)
+ salesDetailss, total, errCode := salesDetailsService.GetSalesDetailsList(params.Page, params.PageSize, params.KeywordType, params.Keyword)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
}
ctx.OkWithDetailed(response.SalesDetailsResponse{
- List: salesDetailss,
+ List: salesDetailss,
Count: int(total),
})
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0