From 2def11ba83760b5be1361f10c3756cc0e9cfd165 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 14 八月 2023 09:32:13 +0800
Subject: [PATCH] merge
---
service/salesRefund.go | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/service/salesRefund.go b/service/salesRefund.go
index de91872..1403dac 100644
--- a/service/salesRefund.go
+++ b/service/salesRefund.go
@@ -1,6 +1,7 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/pkg/ecode"
)
@@ -8,11 +9,36 @@
type SalesRefundService struct{}
func (SalesRefundService) AddSalesRefund(salesRefund *model.SalesRefund) int {
- err := model.NewSalesRefundSearch().Create(salesRefund)
+ salesReturnRecord, err := model.NewSalesReturnSearch().SetId(salesRefund.SourceId).Find()
+ if err != nil {
+ return ecode.SalesReturnNotExist
+ }
+
+ if code := CheckProduct(salesReturnRecord.Products, salesRefund.Products); code != ecode.OK {
+ return code
+ }
+
+ err = model.NewSalesRefundSearch().Create(salesRefund)
if err != nil {
return ecode.SalesRefundExist
}
+ return ecode.OK
+}
+
+func CheckProduct(returnProducts, refundProducts []*model.Product) int {
+ returnProductsMap := make(map[uint]*model.Product, len(returnProducts))
+ for _, product := range returnProducts {
+ returnProductsMap[product.Id] = product
+ }
+ for _, product := range refundProducts {
+ if returnProductsMap[product.Id] == nil {
+ return ecode.SalesRefundProductNotExist
+ }
+ if returnProductsMap[product.Id].Price != product.Price || product.Amount.GreaterThan(returnProductsMap[product.Id].Amount) {
+ return ecode.SalesRefundProductPriceOrAmountErr
+ }
+ }
return ecode.OK
}
@@ -36,6 +62,15 @@
return ecode.SalesRefundNotExist
}
+ salesReturnRecord, err := model.NewSalesReturnSearch().SetId(salesRefund.SourceId).Find()
+ if err != nil {
+ return ecode.SalesReturnNotExist
+ }
+
+ if code := CheckProduct(salesReturnRecord.Products, salesRefund.Products); code != ecode.OK {
+ return code
+ }
+
err = model.NewSalesRefundSearch().SetId(salesRefund.Id).Update(salesRefund)
if err != nil {
return ecode.SalesRefundSetErr
@@ -44,9 +79,13 @@
return ecode.OK
}
-func (SalesRefundService) GetSalesRefundList(page, pageSize int, keyword string) ([]*model.SalesRefund, int64, int) {
+func (SalesRefundService) GetSalesRefundList(page, pageSize int, keywordType constvar.SalesRefundKeywordType, keyword string) ([]*model.SalesRefund, int64, int) {
// get contact list
- contacts, total, err := model.NewSalesRefundSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewSalesRefundSearch().
+ SetKeywordType(keywordType).
+ SetKeyword(keyword).
+ SetPreload(true).
+ SetPage(page, pageSize).FindAll()
if err != nil {
return nil, 0, ecode.SalesRefundListErr
}
--
Gitblit v1.8.0