合并分支 'dev' 到 'test'

Dev 查看合并请求 !28

合并分支 'dev' 到 'test'
Dev 查看合并请求 !28
陈志颖
pkg/application/dividendsEstimate/service/dividends_estimate.go
pkg/infrastructure/domain_service/pg_confirm_dividends_incentives_estimate_service.go
pkg/infrastructure/pg/transform/dividends_estimate.go
pkg/infrastructure/pg/transform/money_incentives_rule.go
pkg/infrastructure/pg/transform/order_good.go
--- a/pkg/application/dividendsEstimate/service/dividends_estimate.go
查看文件 @bca4eab
+++ b/pkg/application/dividendsEstimate/service/dividends_estimate.go
查看文件 @bca4eab
@@ -237,7 +237,11 @@ func (dividendsEstimateService *DividendsEstimateService) CancelDividendsEstimat
 	// 校验是否能够取消
 	if dividendsEstimate.DividendsType == domain.ORDER_DIVIDENDS || dividendsEstimate.DividendsType == domain.RETURN_WRITE_OFF { // 订单分红、退货冲销
-		if count, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{"orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum}); err2 != nil {
+		if count, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{
+			"orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum,
+			"companyId":               dividendsEstimate.Company.CompanyId,
+			"orgId":                   dividendsEstimate.Org.OrgId,
+		}); err2 != nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err2.Error())
 		} else {
 			if count > 0 {
@@ -249,7 +253,11 @@ func (dividendsEstimateService *DividendsEstimateService) CancelDividendsEstimat
 			}
 		}
 	} else if dividendsEstimate.DividendsType == domain.MONEY_INCENTIVES { // 金额激励分红
-		if count, dividendsEstimatesRelative, err3 := dividendsEstimateRepository.Find(map[string]interface{}{"cooperationContractNumber": dividendsEstimate.CooperationContractNumber}); err3 != nil {
+		if count, dividendsEstimatesRelative, err3 := dividendsEstimateRepository.Find(map[string]interface{}{
+			"cooperationContractNumber": dividendsEstimate.CooperationContractNumber,
+			"companyId":                 dividendsEstimate.Company.CompanyId,
+			"orgId":                     dividendsEstimate.Org.OrgId,
+		}); err3 != nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err3.Error())
 		} else {
 			if count > 0 {
@@ -347,10 +355,14 @@ func (dividendsEstimateService *DividendsEstimateService) BatchCancelDividendsEs
 				// 校验是否能够取消
 				if dividendsEstimate.DividendsType == domain.ORDER_DIVIDENDS || dividendsEstimate.DividendsType == domain.RETURN_WRITE_OFF { // 订单分红、退货冲销
-					if count, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{"orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum}); err2 != nil {
+					if countRelativeDividendsEstimates, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{
+						"orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum,
+						"companyId":               dividendsEstimate.Company.CompanyId,
+						"orgId":                   dividendsEstimate.Org.OrgId,
+					}); err2 != nil {
 						return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err2.Error())
 					} else {
-						if count > 0 {
+						if countRelativeDividendsEstimates > 0 {
 							for _, dividendsEstimateRelative := range dividendsEstimatesRelative {
 								if dividendsEstimateRelative.DividendsAccountStatus == domain.ACCOUNTED {
 									return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已有相关分红预算单已结算，无法取消")
@@ -359,10 +371,14 @@ func (dividendsEstimateService *DividendsEstimateService) BatchCancelDividendsEs
 						}
 					}
 				} else if dividendsEstimate.DividendsType == domain.MONEY_INCENTIVES { // 金额激励分红
-					if count, dividendsEstimatesRelative, err3 := dividendsEstimateRepository.Find(map[string]interface{}{"cooperationContractNumber": dividendsEstimate.CooperationContractNumber}); err3 != nil {
+					if countRelativeDividendsEstimates, dividendsEstimatesRelative, err3 := dividendsEstimateRepository.Find(map[string]interface{}{
+						"cooperationContractNumber": dividendsEstimate.CooperationContractNumber,
+						"companyId":                 dividendsEstimate.Company.CompanyId,
+						"orgId":                     dividendsEstimate.Org.OrgId,
+					}); err3 != nil {
 						return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err3.Error())
 					} else {
-						if count > 0 {
+						if countRelativeDividendsEstimates > 0 {
 							for _, dividendsEstimateRelative := range dividendsEstimatesRelative {
 								if dividendsEstimateRelative.DividendsAccountStatus == domain.ACCOUNTED {
 									return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已有相关分红预算单已结算，无法取消")
--- a/pkg/infrastructure/domain_service/pg_confirm_dividends_incentives_estimate_service.go
查看文件 @bca4eab
+++ b/pkg/infrastructure/domain_service/pg_confirm_dividends_incentives_estimate_service.go
查看文件 @bca4eab
@@ -117,21 +117,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 			continue
 		}
-		// 校验合约关联的项目是否已结束
-		//if cooperationProject.Status == 2 {
-		//	dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
-		//		DividendsUser:              nil,
-		//		DividendsParticipateType:   0,
-		//		DividendsStage:             0,
-		//		DividendsAmount:            0,
-		//		OrderOrReturnedOrderNumber: orderGood.DividendsOrderNumber,
-		//		IsSuccessfully:             false,
-		//		Reason:                     "共创项目" + orderGood.CooperationContractNumber + "已结束",
-		//	})
-		//	continue
-		//	//return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("共创项目%s已结束", cooperationContract.CooperationProjectNumber))
-		//}
-
 		if orderGood.DividendsOrderNumber != "" { // 获取分红订单
 			// 获取分红订单
 			dividendsOrder, err2 := dividendsOrderRepository.FindOne(map[string]interface{}{
@@ -190,6 +175,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 			if dividendsIncentivesRuleMatched != nil {
 				for _, undertaker := range cooperationContract.Undertakers {
 					// 添加承接人分红预算信息详情
+					if dividendsIncentivesRuleMatched.DividendsIncentivesPercentage > 0 {
 						undertakerDividendsAmount, _ := decimal.NewFromFloat(orderGood.OrderGoodAmount).Mul(decimal.NewFromFloat(dividendsIncentivesRuleMatched.DividendsIncentivesPercentage).Div(decimal.NewFromFloat(100))).Float64()
 						dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 							DividendsUser: &domain.User{
@@ -212,8 +198,11 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 							OrderOrReturnedOrderNumber: dividendsOrder.DividendsOrderNumber,
 							IsSuccessfully:             true,
 						})
+					}
+
 					//	添加推荐人分红预算信息详情
 					if undertaker.Referrer != nil {
+						if dividendsIncentivesRuleMatched.ReferrerPercentage > 0 {
 							referrerDividendsAmount, _ := decimal.NewFromFloat(orderGood.OrderGoodAmount).Mul(decimal.NewFromFloat(dividendsIncentivesRuleMatched.ReferrerPercentage).Div(decimal.NewFromFloat(100))).Float64()
 							dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 								DividendsUser: &domain.User{
@@ -236,8 +225,10 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 								IsSuccessfully:             true,
 							})
 						}
+					}
 					//	添加关联业务员分红预算信息详情
 					if undertaker.Salesman != nil {
+						if dividendsIncentivesRuleMatched.SalesmanPercentage > 0 {
 							salesmanDividendsAmount, _ := decimal.NewFromFloat(orderGood.OrderGoodAmount).Mul(decimal.NewFromFloat(dividendsIncentivesRuleMatched.SalesmanPercentage).Div(decimal.NewFromFloat(100))).Float64()
 							dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 								DividendsUser: &domain.User{
@@ -262,6 +253,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 						}
 					}
 				}
+			}
 		} else if orderGood.DividendsReturnedOrderNumber != "" { // 获取退货单
 			dividendsReturnedOrder, err3 := dividendsReturnedOrderRepository.FindOne(map[string]interface{}{
 				"dividendsReturnedOrderNumber": orderGood.DividendsReturnedOrderNumber,
@@ -304,6 +296,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 			//	计算分红
 			for _, undertaker := range cooperationContract.Undertakers {
 				// 添加承接人分红退货预算信息详情
+				if dividendsIncentivesRuleMatched.DividendsIncentivesPercentage > 0 {
 					undertakerDividendsAmount, _ := decimal.NewFromFloat(orderGood.OrderGoodAmount).Mul(decimal.NewFromFloat(dividendsIncentivesRuleMatched.DividendsIncentivesPercentage).Div(decimal.NewFromFloat(100))).Float64()
 					dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 						DividendsUser: &domain.User{
@@ -326,8 +319,11 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 						OrderOrReturnedOrderNumber: dividendsReturnedOrder.DividendsOrderNumber,
 						IsSuccessfully:             true,
 					})
+				}
+
 				//	添加推荐人分红退货预算信息详情
 				if undertaker.Referrer != nil {
+					if dividendsIncentivesRuleMatched.ReferrerPercentage > 0 {
 						referrerDividendsAmount, _ := decimal.NewFromFloat(orderGood.OrderGoodAmount).Mul(decimal.NewFromFloat(dividendsIncentivesRuleMatched.ReferrerPercentage).Div(decimal.NewFromFloat(100))).Float64()
 						dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 							DividendsUser: &domain.User{
@@ -350,8 +346,11 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 							IsSuccessfully:             true,
 						})
 					}
+				}
+
 				//	添加关联业务员分红退货预算信息详情
 				if undertaker.Salesman != nil {
+					if dividendsIncentivesRuleMatched.SalesmanPercentage > 0 {
 						salesmanDividendsAmount, _ := decimal.NewFromFloat(orderGood.OrderGoodAmount).Mul(decimal.NewFromFloat(dividendsIncentivesRuleMatched.SalesmanPercentage).Div(decimal.NewFromFloat(100))).Float64()
 						dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 							DividendsUser: &domain.User{
@@ -374,6 +373,8 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 							IsSuccessfully:             true,
 						})
 					}
+
+				}
 			}
 		}
 	}
--- a/pkg/infrastructure/pg/transform/dividends_estimate.go
查看文件 @bca4eab
+++ b/pkg/infrastructure/pg/transform/dividends_estimate.go
查看文件 @bca4eab
 package transform
 import (
+	"github.com/shopspring/decimal"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg/models"
 )
 func TransformToDividendsEstimateDomainModelFromPgModels(dividendsEstimateModel *models.DividendsEstimate) (*domain.DividendsEstimate, error) {
+	dividendsAmount, _ := decimal.NewFromFloatWithExponent(dividendsEstimateModel.DividendsAmount, -2).Float64()
 	return &domain.DividendsEstimate{
 		DividendsEstimateId:          dividendsEstimateModel.DividendsEstimateId,
 		DividendsAccountStatus:       dividendsEstimateModel.DividendsAccountStatus,
-		DividendsAmount:              dividendsEstimateModel.DividendsAmount,
+		DividendsAmount:              dividendsAmount,
 		DividendsEstimateOrderNumber: dividendsEstimateModel.DividendsEstimateOrderNumber,
 		DividendsEstimateTime:        dividendsEstimateModel.DividendsEstimateTime,
 		DividendsParticipateType:     dividendsEstimateModel.DividendsParticipateType,
--- a/pkg/infrastructure/pg/transform/money_incentives_rule.go
查看文件 @bca4eab
+++ b/pkg/infrastructure/pg/transform/money_incentives_rule.go
查看文件 @bca4eab
 package transform
 import (
+	"github.com/shopspring/decimal"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg/models"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/utils"
@@ -8,10 +9,11 @@ import (
 func TransformToMoneyIncentivesRuleDomainModelFromPgModels(moneyIncentivesRuleModel *models.MoneyIncentivesRule) (*domain.MoneyIncentivesRule, error) {
 	stageString := utils.NumberToCNNumber(int(moneyIncentivesRuleModel.MoneyIncentivesStage))
+	moneyIncentivesAmount, _ := decimal.NewFromFloatWithExponent(moneyIncentivesRuleModel.MoneyIncentivesAmount, -2).Float64()
 	return &domain.MoneyIncentivesRule{
 		MoneyIncentivesRuleId:     moneyIncentivesRuleModel.MoneyIncentivesRuleId,
 		CooperationContractNumber: moneyIncentivesRuleModel.CooperationContractNumber,
-		MoneyIncentivesAmount:     moneyIncentivesRuleModel.MoneyIncentivesAmount,
+		MoneyIncentivesAmount:     moneyIncentivesAmount,
 		MoneyIncentivesStage:      moneyIncentivesRuleModel.MoneyIncentivesStage,
 		MoneyIncentivesStageCN:    stageString,
 		MoneyIncentivesStageEnd:   moneyIncentivesRuleModel.MoneyIncentivesStageEnd,
--- a/pkg/infrastructure/pg/transform/order_good.go
查看文件 @bca4eab
+++ b/pkg/infrastructure/pg/transform/order_good.go
查看文件 @bca4eab
 package transform
 import (
+	"github.com/shopspring/decimal"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg/models"
 )
 func TransformToOrderGoodDomainModelFromPgModels(orderGoodModel *models.OrderGood) (*domain.OrderGood, error) {
+	orderGoodAmount, _ := decimal.NewFromFloatWithExponent(orderGoodModel.OrderGoodAmount, -2).Float64()
 	return &domain.OrderGood{
 		OrderGoodId:                  orderGoodModel.OrderGoodId,
-		OrderGoodAmount:              orderGoodModel.OrderGoodAmount,
+		OrderGoodAmount:              orderGoodAmount,
 		OrderGoodName:                orderGoodModel.OrderGoodName,
 		OrderGoodPrice:               orderGoodModel.OrderGoodPrice,
 		OrderGoodQuantity:            orderGoodModel.OrderGoodQuantity,