From a26d17cc80b80cc85751b2e288deff4aae05fdb3 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 16:31:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 api/v1/product.go |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/api/v1/product.go b/api/v1/product.go
index 0b51826..9ade9d2 100644
--- a/api/v1/product.go
+++ b/api/v1/product.go
@@ -2,6 +2,7 @@
 
 import (
 	"aps_crm/conf"
+	"aps_crm/model"
 	"aps_crm/model/request"
 	"aps_crm/model/response"
 	"aps_crm/pkg/contextx"
@@ -10,6 +11,7 @@
 	"aps_crm/proto/product"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/shopspring/decimal"
 	"github.com/spf13/cast"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
@@ -64,6 +66,17 @@
 		ProductNumber: params.ProductNumber,
 		ProductName:   params.ProductName,
 	})
+	rawProductList := getProductListResponse.List
+	productList := make([]model.Product, len(rawProductList))
+
+	for k, v := range rawProductList {
+		productList[k].Number = v.Number
+		productList[k].Name = v.Name
+		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)
+	}
+
 	if err != nil {
 		logx.Errorf("GetProductList err: %v", err.Error())
 		ctx.FailWithMsg(ecode.UnknownErr, "鍐呴儴閿欒")
@@ -75,7 +88,7 @@
 		return
 	}
 	ctx.OkWithDetailed(response.ListResponse{
-		Data:  getProductListResponse.List,
+		Data:  productList,
 		Count: getProductListResponse.Total,
 	})
 }

--
Gitblit v1.8.0