Merge branch 'bugfix_3403' into debug

controller/contract/register.go

@@ -714,21 +714,12 @@ func (rg *RegisterController) Add(c *gin.Context) {
 		templateIdStr := strings.Join(ids, ",")
 		nDupList := make([]*fms.DupInvoice, 0)
 
-		// 重复的套餐信息的合同id，需要在summary表中将旧id变为新的id，否则统计中会查不到信息
-		dupRegisterIds := make([]int, 0)
-
 		for _, dup := range dupList {
 			if templateIdStr == dup.TemplateIds {
 				nDupList = append(nDupList, dup)
-				dupRegisterIds = append(dupRegisterIds, dup.ContractRegisterId)
 			}
 		}
-		// 修改summary表，把旧合同id变成新的
-		//err = fms.UpdateInvoicePaymentSummaryByRegisterId(ob.ContractRegisterId, dupRegisterIds)
-		//if err != nil {
-		//	err = fmt.Errorf("获取开票到款列表失败, Err: %s", err.Error())
-		//	return
-		//}
+
 
 		//先遍历一遍拿到开票销售信息
 		for _, ppItem := range nDupList {
@@ -3623,21 +3614,12 @@ func (rg *RegisterController) Import(c *gin.Context) {
 				templateIdStr := strings.Join(ids, ",")
 				nDupList := make([]*fms.DupInvoice, 0)
 
-				// 重复的套餐信息的合同id，需要在summary表中将旧id变为新的id，否则统计中会查不到信息
-				dupRegisterIds := make([]int, 0)
-
 				for _, dup := range dupList {
 					if templateIdStr == dup.TemplateIds {
 						nDupList = append(nDupList, dup)
-						dupRegisterIds = append(dupRegisterIds, dup.ContractRegisterId)
 					}
 				}
-				// 修改summary表，把旧合同id变成新的
-				err = fms.UpdateInvoicePaymentSummaryByRegisterId(rowRegister.ContractRegisterId, dupRegisterIds)
-				if err != nil {
-					err = fmt.Errorf("获取开票到款列表失败, Err: %s", err.Error())
-					return
-				}
+
 				//先遍历一遍拿到开票销售信息
 				for _, ppItem := range dupList {
 					j := 0
@@ -3765,6 +3747,8 @@ func (rg *RegisterController) Import(c *gin.Context) {
 				go fmsService.CalculatePaymentServiceAmount(newId)
 				newIds = append(newIds, newId)
 
+				// 开票到款汇总
+				go fmsService.SummaryInvoicePaymentByContractRegisterId(rowRegister.ContractRegisterId)
 			}
 		}
 	}