瀏覽代碼

未开票列表分金额统计,小数修复,统计和列表同步

ziwen 1 年之前
父節點
當前提交
42995b2d82
共有 3 個文件被更改,包括 4 次插入2 次删除
  1. 1 0
      controller/census/invoice_payment.go
  2. 2 1
      controller/crm/company_seller.go
  3. 1 1
      models/fms/invoice_payment_summary.go

+ 1 - 0
controller/census/invoice_payment.go

@@ -2022,6 +2022,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 
 			for _, v := range contractAmountCurrencyTotals {
 				v.Amount = contractSumMap[v.Code] - invoiceSumMap[v.Code]
+				v.Amount, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", v.Amount), 64)
 			}
 
 		}()

+ 2 - 1
controller/crm/company_seller.go

@@ -104,7 +104,8 @@ func (rg *CompanySellerController) TeamList(c *gin.Context) {
 	resp.OkData("获取成功", list, c)
 }
 
-func FIX() (err error) {
+// 修复历史数据表中导入的销售seller_id
+func FIXIncomeHistorySellerId() (err error) {
 	adminCond := ``
 	adminPars := make([]interface{}, 0)
 	adminOB := new(crm.Admin)

+ 1 - 1
models/fms/invoice_payment_summary.go

@@ -358,7 +358,7 @@ func GetInvoiceCensusList(condition string, pars []interface{}) (results []*Invo
 		Where(condition, pars...).Group("contract_register_id")
 
 	nq := global.DEFAULT_MYSQL.Table("(?) AS e", query).
-		Select("*").Where(" e.invoiced_amount_count <>  e.contract_amount ")
+		Select("*").Where(" (e.invoiced_amount_count <> e.contract_amount AND e.contract_amount <> 0) OR (e.contract_amount = 0 AND e.invoiced_amount_count <> e.payment_amount_count) ")
 
 	err = nq.Find(&results).Error
 	if err != nil {