|
|
@@ -1722,8 +1722,8 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
|
|
|
//fmt.Println("ProductIds:", v.ProductIds)
|
|
|
//fmt.Println("ContractRegisterId:", v.ContractRegisterId)
|
|
|
//fmt.Println("ServiceProductId:", v.ServiceProductId)
|
|
|
- fmt.Println("RegisterId:", v.RegisterId)
|
|
|
- fmt.Println("len(NotInvoiceSummaryMap[v.RegisterId]):", len(NotInvoiceSummaryMap[v.ContractRegisterId]))
|
|
|
+ //fmt.Println("RegisterId:", v.RegisterId)
|
|
|
+ //fmt.Println("len(NotInvoiceSummaryMap[v.RegisterId]):", len(NotInvoiceSummaryMap[v.ContractRegisterId]))
|
|
|
if (v.ProductIds == "1,2" || v.ProductIds == "2,1") && len(NotInvoiceSummaryMap[v.ContractRegisterId]) == 1 {
|
|
|
if v.ServiceProductId == 1 {
|
|
|
if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
|
|
|
@@ -2118,6 +2118,7 @@ func (ct *InvoicePaymentController) NotPaymentList(c *gin.Context) {
|
|
|
page.SetCurrent(1)
|
|
|
}
|
|
|
|
|
|
+ cond += ` AND b.payment_amount <> b.invoiced_amount AND b.is_deleted = 0 AND b.contract_status <> 4 `
|
|
|
registerList, total, e := fms.GetNoPaymentCensusPageList(page, cond, pars)
|
|
|
if e != nil {
|
|
|
resp.FailMsg("获取失败", "获取商品到款统计列表总数失败, Err: "+e.Error(), c)
|
ziwen