fix

controller/census/invoice_payment.go

@@ -1176,19 +1176,22 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 					accumulate += amountTotal
 					partAccumulate += amountTotal
 				}
-				if i == j {
+				if i == j || i == numMonth {
 					if req.ListParam == "4" {
 						totalMoneySlice = append(totalMoneySlice, accumulate)
 					} else if req.ListParam == "0" {
 						totalMoneySlice = append(totalMoneySlice, amountTotal)
 					} else if i > 0 || i == numMonth {
 						totalMoneySlice = append(totalMoneySlice, partAccumulate)
+						fmt.Println("partAccumulate:",partAccumulate)
 						partAccumulate  = 0.0
 					}
 				}
 			} else if endDateTime.Before(historyTime) || endDateTime.Equal(historyTime) {
 				//全部走旧查询
 				//fmt.Println("旧查询")
+				fmt.Println("st:",st)
+				fmt.Println("ed:",ed)
 				histrtyCond += ` AND (invoice_time BETWEEN ? AND ? )`
 				historyPars = append(historyPars, st, ed)
 				//fmt.Println("st:",st)
@@ -1221,7 +1224,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 					}
 				}
 
-				fmt.Println("partAccumulate:",partAccumulate)
+				//fmt.Println("partAccumulate:",partAccumulate)
 			}
 			//else {
 			//	//刚好跨过20230301的，各查一部分
@@ -1316,19 +1319,21 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 					historyAccumulate += prevAmountTotal
 					partHistoryAccumulate += prevAmountTotal
 				}
-				if i == j {
+				if i == j || i == numMonth {
 					if req.ListParam == "4" {
 						prevTotalMoneySlice = append(prevTotalMoneySlice, historyAccumulate)
 					} else if req.ListParam == "0" {
-						prevTotalMoneySlice = append(prevTotalMoneySlice, partHistoryAccumulate)
-						partHistoryAccumulate = 0.0
+						prevTotalMoneySlice = append(prevTotalMoneySlice, prevAmountTotal)
 					} else if i > 0 || i == numMonth {
 						prevTotalMoneySlice = append(prevTotalMoneySlice, partHistoryAccumulate)
-						partHistoryAccumulate  = 0.0
+						fmt.Println("partHistoryAccumulate:",partHistoryAccumulate)
+						partHistoryAccumulate = 0.0
 					}
 				}
 			} else if prevEndDateTime.Before(historyTime) || prevEndDateTime.Equal(historyTime) {
 				//全部走旧查询
+				fmt.Println("prevSt:",prevSt)
+				fmt.Println("prevEd:",prevEd)
 				prevHistoryCond += ` AND (invoice_time BETWEEN ? AND ?)`
 				prevHistoryPars = append(prevHistoryPars, prevSt, prevEd)
 				// 开票到款金额合计(换算后)
@@ -1347,17 +1352,18 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 				historyAccumulate += amountTotal
 				partHistoryAccumulate += amountTotal
 
-				if i == j {
+				if i == j || i == numMonth {
 					if req.ListParam == "4" {
 						prevTotalMoneySlice = append(prevTotalMoneySlice, historyAccumulate)
 					} else if req.ListParam == "0" {
-						prevTotalMoneySlice = append(prevTotalMoneySlice, partHistoryAccumulate)
-						partHistoryAccumulate = 0.0
+						prevTotalMoneySlice = append(prevTotalMoneySlice, amountTotal)
 					} else if i > 0 || i == numMonth {
 						prevTotalMoneySlice = append(prevTotalMoneySlice, partHistoryAccumulate)
-						partHistoryAccumulate  = 0.0
+						fmt.Println("partHistoryAccumulate:",partHistoryAccumulate)
+						partHistoryAccumulate = 0.0
 					}
 				}
+				//fmt.Println("partHistoryAccumulate:",partHistoryAccumulate)
 			}
 			//else {
 			//	//刚好跨过20230301的，各查一部分
@@ -1431,7 +1437,6 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 				if i == 0{
 					dateSlice = append(dateSlice, startDateTime.AddDate(0, 11, 0).Format("06/01"))
 					j = j + 11
-
 				} else {
 					dateSlice = append(dateSlice, startDateTime.AddDate(0, 12, 0).Format("06/01"))
 					j = j + 12
@@ -1491,6 +1496,12 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		if prevTotalMoneySlice[i] != 0 && totalMoneySlice[i] != 0 {
 			yoy = (totalMoneySlice[i] - prevTotalMoneySlice[i]) / prevTotalMoneySlice[i]
 			yoyStr = fmt.Sprintf("%.4f", yoy)
+
+			if i == len(prevTotalMoneySlice)-1 && i > 0{
+				fmt.Println("totalMoneySlice[i-1]:",totalMoneySlice[i-1])
+				yoy = (totalMoneySlice[i] - totalMoneySlice[i-1]) / totalMoneySlice[i-1]
+				yoyStr = fmt.Sprintf("%.4f", yoy)
+			}
 		}
 		yoySlice = append(yoySlice, yoyStr)
 	}

controller/crm/company_seller.go

@@ -84,11 +84,6 @@ func (rg *CompanySellerController) AllList(c *gin.Context) {
 		FiccSeller: ficcList,
 		RaiSeller:  raiLits,
 	}
-	e = FIX()
-	if e != nil {
-		resp.FailData("获取销售失败", "Err:"+e.Error(), c)
-		return
-	}
 	resp.OkData("获取成功", respItem, c)
 }