|
|
@@ -412,7 +412,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- newCompanyMap := map[int]string{0: "/", 1: "是" , 2: "否"}
|
|
|
+ newCompanyMap := map[int]string{0: "/", 1: "是", 2: "否"}
|
|
|
sellerTypeMap := map[int]string{1: "FICC销售", 2: "权益销售"}
|
|
|
for k, v := range list {
|
|
|
dataRow := sheet.AddRow()
|
|
|
@@ -1003,7 +1003,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
defer func() {
|
|
|
if err != nil {
|
|
|
global.LOG.Error(err)
|
|
|
- if err != utils.ErrNoRow{
|
|
|
+ if err != utils.ErrNoRow {
|
|
|
go alarm_msg.SendAlarmMsg("获取业务收入金额统计数据异常，Err："+err.Error(), 3)
|
|
|
}
|
|
|
}
|
|
|
@@ -1057,7 +1057,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
if latestTime.IsZero() {
|
|
|
latestTime = time.Now()
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
latestTime = latestTime.AddDate(0, 0, -latestTime.Day()+1)
|
|
|
|
|
|
var dateSlice []string
|
|
|
@@ -1205,7 +1205,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
sellerIds := strings.Split(req.SellerIds, ",")
|
|
|
amountCond += ` AND (( b.seller_id IN ? AND a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
|
|
|
amountCond += `OR ( d.seller_id IN ? AND a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?)) `
|
|
|
- amountPars = append(amountPars, sellerIds,st, ed, sellerIds,st, ed)
|
|
|
+ amountPars = append(amountPars, sellerIds, st, ed, sellerIds, st, ed)
|
|
|
} else {
|
|
|
amountCond += ` AND ((a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
|
|
|
amountCond += `OR (a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?))`
|
|
|
@@ -1311,7 +1311,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
sellerIds := strings.Split(req.SellerIds, ",")
|
|
|
amountCond += ` AND (( b.seller_id IN ? AND a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
|
|
|
amountCond += `OR ( d.seller_id IN ? AND a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?)) `
|
|
|
- amountPars = append(amountPars, sellerIds,prevSt, prevEd, sellerIds,prevSt, prevEd)
|
|
|
+ amountPars = append(amountPars, sellerIds, prevSt, prevEd, sellerIds, prevSt, prevEd)
|
|
|
} else {
|
|
|
amountCond += ` AND ((a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
|
|
|
amountCond += `OR (a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?))`
|
ziwen