fix:取消分红预算后订单状态更新错误

@@ -255,11 +255,20 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
 					}); err4 != nil {
 					}); err4 != nil {
 						return nil, err4
 						return nil, err4
 					} else {
 					} else {
+						// orderGoodIds去重
+						newOrderGoodIds := utils.RemoveDuplicationInt64(orderGoodIds)
+
 						if countDividendsOrder > 0 {
 						if countDividendsOrder > 0 {
 							for i, order := range orders {
 							for i, order := range orders {
-								if len(order.Goods) == len(orderGoodIds) { // 1.全部产品取消分红预算
+								goods := make([]*domain.OrderGood, 0)
+								for _, good := range order.Goods {
+									if good.OrderGoodDividendsStatus == 2 {
+										goods = append(goods, good)
+									}
+								}
+								if len(goods) == len(newOrderGoodIds) { // 1.已分红的产品数量等于取消的产品数量，订单分红状态变更为未分红
 									orders[i].DividendStatus = 1
 									orders[i].DividendStatus = 1
-								} else if len(order.Goods) > len(orderGoodIds) { // 3.部分产品被取消分红预算
+								} else if len(goods) > len(newOrderGoodIds) { // 3.已分红的产品数量大于被取消分红的产品数量，订单分红状态变更为部分分红
 									orders[i].DividendStatus = 3
 									orders[i].DividendStatus = 3
 								}
 								}
 								orders[i].DividendStatus = order.DividendStatus
 								orders[i].DividendStatus = order.DividendStatus

@@ -126,6 +126,21 @@ func RemoveDuplication(arr []string) []string {
 	return arr[:j]
 	return arr[:j]
 }
 }
 
 
+func RemoveDuplicationInt64(arr []int64) []int64 {
+	set := make(map[int64]struct{}, len(arr))
+	j := 0
+	for _, v := range arr {
+		_, ok := set[v]
+		if ok {
+			continue
+		}
+		set[v] = struct{}{}
+		arr[j] = v
+		j++
+	}
+	return arr[:j]
+}
+
 // IsContain 判断int32数组是否包含
 // IsContain 判断int32数组是否包含
 func IsContain(items []int32, item int32) bool {
 func IsContain(items []int32, item int32) bool {
 	for _, eachItem := range items {
 	for _, eachItem := range items {