Merge branch 'crm/crm_16.8' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_apply_v2.go

@@ -208,6 +208,12 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 		}
 		var sealId int
 		if productId == 2 {
+			contractCode, err = seal.GetSealCodeRai() //权益客户合同编号格式替换
+			if err != nil {
+				br.Msg = "生成合同编码失败"
+				br.ErrMsg = "生成合同编码失败,Err:" + err.Error()
+				return
+			}
 			sealCount, err := seal.GetCountByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
 			if err != nil {
 				br.Msg = "生成合同编码失败"
@@ -739,6 +745,12 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 		var sealId int
 
 		if productId == 2 {
+			contractCode, err = seal.GetSealCodeRai() //权益客户合同编号格式替换
+			if err != nil {
+				br.Msg = "生成合同编码失败"
+				br.ErrMsg = "生成合同编码失败,Err:" + err.Error()
+				return
+			}
 			sealCount, err := seal.GetCountByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
 			if err != nil {
 				br.Msg = "生成合同编码失败"