From 1cd1206c18ed14dd9ebf2baf477f46c847a271b0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 三月 2024 16:39:19 +0800
Subject: [PATCH] merge
---
proto/crm_aps/server.go | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/proto/crm_aps/server.go b/proto/crm_aps/server.go
index 562dee5..c88b98e 100644
--- a/proto/crm_aps/server.go
+++ b/proto/crm_aps/server.go
@@ -193,7 +193,7 @@
return &UpdateSalesDetailResponse{}, nil
}
-func (s *Server) RemoveSalesDetail(ctx context.Context, req *RemoveSalesDetailRequest) (*RemoveSalesDetailRequest, error) {
+func (s *Server) RemoveSalesDetail(ctx context.Context, req *RemoveSalesDetailRequest) (*RemoveSalesDetailResponse, error) {
if req.Number == "" {
return nil, errors.New("閿�鍞槑缁嗙紪鍙蜂负绌�")
}
@@ -208,5 +208,33 @@
return nil, errors.New("閿�鍞槑缁嗗垹闄ゅけ璐�")
}
- return &RemoveSalesDetailRequest{}, nil
+ return &RemoveSalesDetailResponse{}, nil
+}
+
+func (s *Server) GetCrmSalesDetailsProductInfo(ctx context.Context, req *GetCrmSalesDetailsProductInfoRequest) (*GetCrmSalesDetailsProductInfoResponse, error) {
+ if req.SalesDetailsNumber == "" {
+ return nil, errors.New("閿�鍞槑缁嗙紪鍙蜂负绌�")
+ }
+ first, err := model.NewSalesDetailsSearch().SetPreload(true).SetNumber(req.SalesDetailsNumber).First()
+ if err != nil {
+ return nil, err
+ }
+ list := make([]*CrmSalesDetailsProductInfo, 0)
+ for _, product := range first.Products {
+ var csp CrmSalesDetailsProductInfo
+ csp.ProductId = product.Number
+ csp.ProductName = product.Name
+ csp.Specs = product.Specs
+ csp.Unit = product.Unit
+ csp.Amount = product.Amount.IntPart()
+ csp.Cost = product.Cost
+ csp.Price = product.Price.IntPart()
+ csp.Total = product.Total.IntPart()
+ csp.Profit = product.Profit
+ csp.Margin = product.Margin
+ list = append(list, &csp)
+ }
+ resp := new(GetCrmSalesDetailsProductInfoResponse)
+ resp.List = list
+ return resp, nil
}
--
Gitblit v1.8.0