From 4d7d6f0e363d71ebe7ae506dd8ba02aa92eafb34 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 13 十一月 2023 16:09:26 +0800
Subject: [PATCH] 字段修改
---
model/product.go | 1
api/v1/salesLeads.go | 17 ++++++--
api/v1/product.go | 19 +++++++++
api/v1/salesDetails.go | 9 ++++
model/response/salesDetails.go | 26 +++++++++++++
5 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/api/v1/product.go b/api/v1/product.go
index f1d1f7b..9fb1241 100644
--- a/api/v1/product.go
+++ b/api/v1/product.go
@@ -76,6 +76,7 @@
productList[k].Price = decimal.NewFromFloat(v.SalePrice).Round(2)
productList[k].Amount = decimal.NewFromFloat(1)
productList[k].Total = productList[k].Price.Mul(productList[k].Amount).Round(2)
+ productList[k].Unit = v.Unit
}
if err != nil {
@@ -140,6 +141,10 @@
return
}
number := c.Param("number")
+ if number == "" || number == "undefined" {
+ ctx.Ok()
+ return
+ }
first, err := model.NewSalesDetailsSearch().SetNumber(number).SetPreload(true).First()
if err != nil {
ctx.FailWithMsg(ecode.UnknownErr, "鏄庣粏璇︽儏鏌ユ壘澶辫触")
@@ -160,5 +165,17 @@
ctx.FailWithMsg(ecode.UnknownErr, "鍐呴儴閿欒")
return
}
- ctx.OkWithDetailed(info.List)
+ var list []response.WorkOrderInfo
+ for _, orderInfo := range info.List {
+ var wo response.WorkOrderInfo
+ wo.OrderId = orderInfo.OrderId
+ wo.ProductName = orderInfo.ProductName
+ wo.OrderStatus = orderInfo.OrderStatus
+ wo.WorkOrderId = orderInfo.WorkOrderId
+ wo.WorkOrderStatus = orderInfo.WorkOrderStatus
+ wo.StartTime = orderInfo.StartTime
+ wo.EndTime = orderInfo.EndTime
+ list = append(list, wo)
+ }
+ ctx.OkWithDetailed(list)
}
diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 4511e60..805084a 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -9,6 +9,7 @@
"aps_crm/pkg/contextx"
"aps_crm/pkg/ecode"
"aps_crm/pkg/logx"
+ "aps_crm/pkg/structx"
"aps_crm/proto/product_inventory"
"aps_crm/utils"
"github.com/gin-gonic/gin"
@@ -271,7 +272,13 @@
ctx.FailWithMsg(ecode.UnknownErr, "grpc璋冪敤閿欒")
return
}
- ctx.OkWithDetailed(info.ProductList)
+ var list []response.ProductInfo
+ err = structx.AssignTo(info.ProductList, &list)
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "杞崲閿欒")
+ return
+ }
+ ctx.OkWithDetailed(list)
}
// CreateOperation
diff --git a/api/v1/salesLeads.go b/api/v1/salesLeads.go
index 25e1692..e0d305e 100644
--- a/api/v1/salesLeads.go
+++ b/api/v1/salesLeads.go
@@ -205,10 +205,19 @@
return
}
- errCode := salesLeadsService.PushSalesLeads(params.Id, params.Step, params.Reason)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
- return
+ if params.Step == constvar.SalesStatusFail {
+ errCode := salesLeadsService.DeleteSalesLeads([]int{params.Id})
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
+ } else {
+ errCode := salesLeadsService.PushSalesLeads(params.Id, params.Step, params.Reason)
+ if errCode != ecode.OK {
+ ctx.Fail(errCode)
+ return
+ }
}
+
ctx.Ok()
}
diff --git a/model/product.go b/model/product.go
index 2880731..2ac4adc 100644
--- a/model/product.go
+++ b/model/product.go
@@ -15,6 +15,7 @@
Amount decimal.Decimal `json:"amount" gorm:"column:amount;type:decimal(12,2);comment:浜у搧鏁伴噺"`
Total decimal.Decimal `json:"total" gorm:"column:total;type:decimal(10,2);comment:浜у搧鎬讳环"`
Desc string `json:"desc" gorm:"column:desc;type:varchar(255);comment:浜у搧鎻忚堪"`
+ Unit string `json:"unit" gorm:"column:unit;type:varchar(255);comment:鍗曚綅"`
gorm.Model `json:"-"`
}
diff --git a/model/response/salesDetails.go b/model/response/salesDetails.go
new file mode 100644
index 0000000..80ce00c
--- /dev/null
+++ b/model/response/salesDetails.go
@@ -0,0 +1,26 @@
+package response
+
+type WorkOrderInfo struct {
+ OrderId string `json:"orderId"`
+ ProductName string `json:"productName"`
+ OrderStatus string `json:"orderStatus"`
+ WorkOrderId string `json:"workOrderId"`
+ WorkOrderStatus string `json:"workOrderStatus"`
+ StartTime string `json:"startTime"`
+ EndTime string `json:"endTime"`
+}
+
+type ProductInfo struct {
+ Id string `json:"id"`
+ Name string `json:"name"`
+ OrderAmount string `json:"orderAmount"` //璁㈠崟鏁伴噺
+ Unit string `json:"unit"`
+ Invoice string `json:"invoice"` //鍙戣揣鍗�
+ Carrier string `json:"carrier"` //鎵胯繍鍟�
+ Waybill string `json:"waybill"` //杩愬崟鍙�
+ SalePrice string `json:"salePrice"` //閿�鍞崟浠�
+ Valorem string `json:"valorem"` //浠风◣鍚堣
+ Warehouse string `json:"warehouse"`
+ Amount string `json:"amount"` //鍦ㄥ簱鏁伴噺
+ AvailableNumber string `json:"availableNumber"` //鍙敤搴撳瓨
+}
--
Gitblit v1.8.0