From a540cf74963886f5cb28a67b274b803fb605ec2e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 04 二月 2024 09:42:16 +0800
Subject: [PATCH] 更改来源为crm
---
api/v1/salesDetails.go | 145 +++++++++++++++++++++---------------------------
1 files changed, 63 insertions(+), 82 deletions(-)
diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 6b71e25..bae4856 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -1,7 +1,6 @@
package v1
import (
- "aps_crm/conf"
"aps_crm/constvar"
"aps_crm/model"
"aps_crm/model/grpc_init"
@@ -16,9 +15,8 @@
"aps_crm/utils"
"github.com/gin-gonic/gin"
"github.com/shopspring/decimal"
- "google.golang.org/grpc"
- "google.golang.org/grpc/credentials/insecure"
"strconv"
+ "strings"
)
type SalesDetailsApi struct{}
@@ -170,7 +168,12 @@
salesDetailsModel.DeliverType = salesDetails.DeliverType
salesDetailsModel.QuotationId = salesDetails.QuotationId
salesDetailsModel.Status = salesDetails.Status
- salesDetailsModel.Source = salesDetails.Source
+ if salesDetails.Source == "" {
+ salesDetailsModel.Source = "CRM鑷缓"
+ } else {
+ salesDetailsModel.Source = salesDetails.Source
+ }
+ salesDetailsModel.ProjectId = salesDetails.ProjectId
return ecode.OK, salesDetailsModel
}
@@ -234,25 +237,6 @@
ctx.Ok()
}
-var (
- ProductInventoryServiceConn *grpc.ClientConn
-)
-
-func InitProductInventoryServiceConn() {
- var err error
- ProductInventoryServiceConn, err = grpc.Dial(conf.Conf.GrpcServiceAddr.WMS, grpc.WithTransportCredentials(insecure.NewCredentials()))
- if err != nil {
- logx.Errorf("grpc dial product service error: %v", err.Error())
- return
- }
-}
-
-func CloseProductInventoryServiceConn() {
- if ProductInventoryServiceConn != nil {
- ProductInventoryServiceConn.Close()
- }
-}
-
// GetProductInventoryInfo
//
// @Tags SalesDetails
@@ -268,9 +252,13 @@
return
}
number := c.Param("number")
- client := product_inventory.NewProductInventoryServiceClient(ProductInventoryServiceConn)
+ client := product_inventory.NewProductInventoryServiceClient(grpc_init.ProductInventoryServiceConn)
info, err := client.GetInventoryProductInfo(ctx.GetCtx(), &product_inventory.GetInventoryProductInfoRequest{Number: number})
if err != nil {
+ if strings.Contains(err.Error(), "record not found") {
+ ctx.Ok()
+ return
+ }
logx.Errorf("GetProductInfo err: %v", err.Error())
ctx.FailWithMsg(ecode.UnknownErr, "grpc璋冪敤閿欒")
return
@@ -282,53 +270,6 @@
return
}
ctx.OkWithDetailed(list)
-}
-
-// CreateOperation
-//
-// @Tags SalesDetails
-// @Summary 鍒涘缓浜у搧鍑哄簱淇℃伅
-// @Produce application/json
-// @Param object body request.SalesDetails true "鏌ヨ鍙傛暟"
-// @Success 200 {object} response.ListResponse
-//
-// @Router /api/salesDetails/createOperation [post]
-func (s *SalesDetailsApi) CreateOperation(c *gin.Context) {
- var params request.SalesDetails
- ctx, ok := contextx.NewContext(c, ¶ms)
- if !ok {
- return
- }
- m := make(map[string]interface{})
- m["status"] = params.Status
- err := model.NewSalesDetailsSearch().SetNumber(params.Number).UpdateByMap(m)
- if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "鐘舵�佹洿鏂板け璐�")
- return
- }
-
- client := product_inventory.NewProductInventoryServiceClient(ProductInventoryServiceConn)
- products := make([]*product_inventory.InventoryProduct, 0)
- for _, product := range params.Products {
- var p product_inventory.InventoryProduct
- p.Id = product.Number
- p.Amount = product.Amount.String()
- products = append(products, &p)
- }
- _, err = client.CreateOperation(ctx.GetCtx(), &product_inventory.CreateOperationRequest{
- Number: params.Number,
- Addressee: params.Addressee,
- Address: params.Address,
- Phone: params.Phone,
- DeliverType: int32(params.DeliverType),
- ProductList: products,
- })
- if err != nil {
- logx.Errorf("CreateOperation err: %v", err.Error())
- ctx.FailWithMsg(ecode.UnknownErr, "grpc璋冪敤閿欒")
- return
- }
- ctx.Ok()
}
// GetApsProjectList
@@ -347,47 +288,83 @@
client := crm_aps.NewCrmAndApsGrpcServiceClient(grpc_init.CrmApsGrpcServiceConn)
projectList, err := client.GetApsProjectList(c, &crm_aps.GetApsProjectListRequest{})
if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "grpc璋冪敤閿欒: "+err.Error())
+ logx.Errorf("grpc GetApsProjectList err: %v", err.Error())
+ ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇aps椤圭洰鍒楄〃澶辫触")
return
}
ctx.OkWithDetailed(projectList.List)
}
-// SendSalesDetailsToApsProject
+// SendSalesDetailsToOtherSystem
//
// @Tags SalesDetails
-// @Summary 鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌aps椤圭洰妯″潡
+// @Summary 鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌鍏朵粬绯荤粺
// @Produce application/json
// @Param object body request.SalesDetails true "鏌ヨ鍙傛暟"
// @Success 200 {object} response.ListResponse
//
-// @Router /api/salesDetails/sendSalesDetailsToApsProject [post]
-func (s *SalesDetailsApi) SendSalesDetailsToApsProject(c *gin.Context) {
+// @Router /api/salesDetails/sendSalesDetailsToOtherSystem [post]
+func (s *SalesDetailsApi) SendSalesDetailsToOtherSystem(c *gin.Context) {
var params request.SalesDetails
ctx, ok := contextx.NewContext(c, ¶ms)
if !ok {
return
}
+ clientName := ""
+ if params.ClientId > 0 {
+ first, err := model.NewClientSearch(nil).SetId(params.ClientId).First()
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "瀹㈡埛淇℃伅鏌ヨ澶辫触")
+ return
+ }
+ clientName = first.Name
+ }
m := make(map[string]interface{})
m["status"] = params.Status
+ m["project_id"] = params.ProjectId
err := model.NewSalesDetailsSearch().SetNumber(params.Number).UpdateByMap(m)
if err != nil {
ctx.FailWithMsg(ecode.UnknownErr, "鐘舵�佹洿鏂板け璐�")
return
}
- products := make([]*crm_aps.SalesDetailsProduct, 0)
+ //鎺ㄩ�佸埌wms
+ wmsProducts := make([]*product_inventory.InventoryProduct, 0)
+ for _, product := range params.Products {
+ var p product_inventory.InventoryProduct
+ p.Id = product.Number
+ p.Amount = product.Amount.String()
+ wmsProducts = append(wmsProducts, &p)
+ }
+ clientWms := product_inventory.NewProductInventoryServiceClient(grpc_init.ProductInventoryServiceConn)
+ _, err = clientWms.CreateOperation(ctx.GetCtx(), &product_inventory.CreateOperationRequest{
+ Number: params.Number,
+ Addressee: params.Addressee,
+ Address: params.Address,
+ Phone: params.Phone,
+ DeliverType: int32(params.DeliverType),
+ Source: "CRM",
+ ClientId: int64(params.ClientId),
+ ClientName: clientName,
+ ProductList: wmsProducts,
+ })
+ if err != nil {
+ logx.Errorf("grpc CreateOperation err: %v", err.Error())
+ }
+
+ //鎺ㄩ�佸埌aps
+ ApsProducts := make([]*crm_aps.SalesDetailsProduct, 0)
var total decimal.Decimal
for _, product := range params.Products {
var sp crm_aps.SalesDetailsProduct
sp.ProductId = product.Number
sp.Amount = product.Amount.IntPart()
- products = append(products, &sp)
+ ApsProducts = append(ApsProducts, &sp)
total = total.Add(product.Amount)
}
- client := crm_aps.NewCrmAndApsGrpcServiceClient(grpc_init.CrmApsGrpcServiceConn)
- _, err = client.SendSalesDetailsToApsProject(c, &crm_aps.SendSalesDetailsToApsProjectRequest{
+ clientAps := crm_aps.NewCrmAndApsGrpcServiceClient(grpc_init.CrmApsGrpcServiceConn)
+ _, err = clientAps.SendSalesDetailsToApsProject(c, &crm_aps.SendSalesDetailsToApsProjectRequest{
Number: params.Number,
ClientName: params.Client.Name,
MemberName: params.Member.Username,
@@ -396,10 +373,14 @@
Source: params.Source,
ProductTotal: total.IntPart(),
ProjectId: params.ProjectId,
- Products: products,
+ Products: ApsProducts,
})
if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "grpc璋冪敤閿欒: "+err.Error())
+ //鐘舵�佽繕鍘�
+ m["status"] = constvar.WaitConfirmed
+ _ = model.NewSalesDetailsSearch().SetNumber(params.Number).UpdateByMap(m)
+ logx.Errorf("grpc SendSalesDetailsToApsProject err: %v", err.Error())
+ ctx.FailWithMsg(ecode.UnknownErr, "鎺ㄩ�佸け璐�,璇锋鏌ュ弬鏁版槸鍚︽纭�")
return
}
ctx.Ok()
--
Gitblit v1.8.0