短信文案优化;注册提交发送短信

src/dashoo.cn/backend/api/controllers/oilsupplier/annualListener.go

@@ -214,15 +214,15 @@ func (this *OilAnnualListenerController) GetPrePayer() {
 	supplierSrv.GetEntityById(annualEntity.SupplierId, &supplierEntity)
 
 	// 发短信通知交费
-	bFlag := ""
-	if supplierCertEntity.SupplierTypeCode == "01" {
-		bFlag = "物资类"
-	} else if supplierCertEntity.SupplierTypeCode == "02" {
-		bFlag = "基建类"
-	} else {
-		bFlag = "服务类"
-	}
-	msg := "您的" + bFlag + "年审申请已通过，请及时交费！"
+	//bFlag := ""
+	//if supplierCertEntity.SupplierTypeCode == "01" {
+	//	bFlag = "物资类"
+	//} else if supplierCertEntity.SupplierTypeCode == "02" {
+	//	bFlag = "基建类"
+	//} else {
+	//	bFlag = "服务类"
+	//}
+	msg := "您好，贵公司年审申请已通过审批，请在市场管理信息系统中进行交费信息确认后交费。谢谢。"
 	msgService := msg2.GetMsgService(utils.DBE)
 	msgService.HandleMsg(supplierEntity.Mobile, msg, "5-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 
@@ -454,15 +454,15 @@ func (this *OilAnnualListenerController) ApprovalRefuse() {
 // @router /audit-reject-notice/:id [post]
 func (this *OilAnnualListenerController) AuditRejectNotice(supplierCertEntity suppliercert.OilSupplierCert, supplierEntity supplier.OilSupplier) {
 	toMobile := supplierEntity.Mobile
-	bFlag := ""
-	if supplierCertEntity.SupplierTypeCode == "01" {
-		bFlag = "物资类"
-	} else if supplierCertEntity.SupplierTypeCode == "02" {
-		bFlag = "基建类"
-	} else {
-		bFlag = "服务类"
-	}
-	msg := "您的" + bFlag + "年审申请审核未通过，请及时查看！"
+	//bFlag := ""
+	//if supplierCertEntity.SupplierTypeCode == "01" {
+	//	bFlag = "物资类"
+	//} else if supplierCertEntity.SupplierTypeCode == "02" {
+	//	bFlag = "基建类"
+	//} else {
+	//	bFlag = "服务类"
+	//}
+	msg := "您好，贵公司在市场管理信息系统中提交的年审申请未通过审核，请修改后重新申请提交。谢谢。"
 	msgService := msg2.GetMsgService(utils.DBE)
 	msgService.HandleMsg(toMobile, msg, "5-2", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/infoChangeListener.go

@@ -293,15 +293,15 @@ func (this *OilInfoChangeListenerController) ApprovalRefuse() {
 // @router /audit-reject-notice/:id [post]
 func (this *OilInfoChangeListenerController) AuditRejectNotice(infoChangeEntity infochange.OilInfoChange, supplierEntity supplier.OilSupplier) {
 	toMobile := supplierEntity.Mobile
-	bFlag := ""
-	if infoChangeEntity.SupplierTypeCode == "01" {
-		bFlag = "物资类"
-	} else if infoChangeEntity.SupplierTypeCode == "02" {
-		bFlag = "基建类"
-	} else {
-		bFlag = "服务类"
-	}
-	msg := "您的" + bFlag + "资质信息变更申请审核未通过，请及时查看！"
+	//bFlag := ""
+	//if infoChangeEntity.SupplierTypeCode == "01" {
+	//	bFlag = "物资类"
+	//} else if infoChangeEntity.SupplierTypeCode == "02" {
+	//	bFlag = "基建类"
+	//} else {
+	//	bFlag = "服务类"
+	//}
+	msg := "您好，贵公司在市场管理信息系统中提交的信息变更申请未通过审核，请修改后重新申请提交。谢谢。"
 	msgService := msg2.GetMsgService(utils.DBE)
 	msgService.HandleMsg(toMobile, msg, "5-2", infoChangeEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(infoChangeEntity.CreateUserId), this.User.Username)
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -1573,19 +1573,19 @@ func (this *OilSupplierCertController) SendingSMS() {
 	for _, item := range list {
 		if currenttime.AddDate(0, 3, 0).Format("2006-01-02") == (item.ApplyTime.Format("2006-01-02")) {
 			toMobile := item.Mobile
-			msg := "您的" + item.SupplierTypeName + "准入还有3个月到期"
+			msg := "您好，贵公司市场准入有效期还有3个月到期，请在市场管理信息系统中进行年审申请。谢谢。"
 			msgService := msg2.GetMsgService(utils.DBE)
 			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId), loginName)
 		}
 		if currenttime.AddDate(0, 2, 0).Format("2006-01-02") == (item.ApplyTime.Format("2006-01-02")) {
 			toMobile := item.Mobile
-			msg := "您的" + item.SupplierTypeName + "准入还有2个月到期"
+			msg := "您好，贵公司市场准入有效期还有2个月到期，请在市场管理信息系统中进行年审申请。谢谢。"
 			msgService := msg2.GetMsgService(utils.DBE)
 			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId), loginName)
 		}
 		if currenttime.AddDate(0, 1, 0).Format("2006-01-02") == (item.ApplyTime.Format("2006-01-02")) {
 			toMobile := item.Mobile
-			msg := "您的" + item.SupplierTypeName + "准入还有1个月到期"
+			msg := "您好，贵公司市场准入有效期还有1个月到期，请在市场管理信息系统中进行年审申请。谢谢。"
 			msgService := msg2.GetMsgService(utils.DBE)
 			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId), loginName)
 		}
@@ -1618,7 +1618,7 @@ func (this *OilSupplierCertController) SendingSMSSupplierFile() {
 				fileName = item.NeedAllFile
 			}
 			toMobile := item.Mobile
-			msg := "您的" + fileName + "还有" + strconv.Itoa(month) + "个月到期"
+			msg := "您好，贵公司企业资质还有" + strconv.Itoa(month) + "个月即将到期，请在市场管理信息系统中及时做信息变更。谢谢。"
 			msgService := msg2.GetMsgService(utils.DBE)
 			loginName := "TimingTask"
 			if this.User != nil {

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertAppendListener.go

@@ -302,15 +302,15 @@ func (this *OilSupplierCertAppendListenerController) GetPrePayer() {
 	supplierSrv.GetEntityById(supplierCertAppendEntity.SupplierId, &supplierEntity)
 
 	// 发短信通知交费
-	bFlag := ""
-	if supplierCertAppendEntity.AppendType == "01" {
-		bFlag = "物资类"
-	} else if supplierCertAppendEntity.AppendType == "02" {
-		bFlag = "基建类"
-	} else {
-		bFlag = "服务类"
-	}
-	msg := "您的" + bFlag + "增项申请已通过，请及时交费！"
+	//bFlag := ""
+	//if supplierCertAppendEntity.AppendType == "01" {
+	//	bFlag = "物资类"
+	//} else if supplierCertAppendEntity.AppendType == "02" {
+	//	bFlag = "基建类"
+	//} else {
+	//	bFlag = "服务类"
+	//}
+	msg := "您好，贵公司增项申请已通过审批，请在市场管理信息系统中进行交费信息确认后交费。谢谢。"
 	msgService := msg2.GetMsgService(utils.DBE)
 	msgService.HandleMsg(supplierEntity.Mobile, msg, "5-1", supplierCertAppendEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertAppendEntity.CreateUserId), this.User.Username)
 
@@ -510,15 +510,15 @@ func (this *OilSupplierCertAppendListenerController) ApprovalRefuse() {
 // @router /audit-reject-notice/:id [post]
 func (this *OilSupplierCertAppendListenerController) AuditRejectNotice(supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend, supplierEntity supplier.OilSupplier) {
 	toMobile := supplierEntity.Mobile
-	bFlag := ""
-	if supplierCertAppendEntity.AppendType == "01" {
-		bFlag = "物资类"
-	} else if supplierCertAppendEntity.AppendType == "02" {
-		bFlag = "基建类"
-	} else {
-		bFlag = "服务类"
-	}
-	msg := "您的" + bFlag + "增项申请审核未通过，请及时查看！"
+	//bFlag := ""
+	//if supplierCertAppendEntity.AppendType == "01" {
+	//	bFlag = "物资类"
+	//} else if supplierCertAppendEntity.AppendType == "02" {
+	//	bFlag = "基建类"
+	//} else {
+	//	bFlag = "服务类"
+	//}
+	msg := "您好，贵公司在市场管理信息系统中提交的增项申请未通过审核，请修改后重新申请提交。谢谢。"
 	msgService := msg2.GetMsgService(utils.DBE)
 	msgService.HandleMsg(toMobile, msg, "5-2", supplierCertAppendEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertAppendEntity.CreateUserId), this.User.Username)
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertListener.go

@@ -328,15 +328,15 @@ func (this *OilSupplierCertListenerController) GetPrePayer() {
 	supplierSrv.GetEntityById(supplierCertEntity.SupplierId, &supplierEntity)
 
 	// 发短信通知交费
-	bFlag := ""
-	if supplierCertEntity.SupplierTypeCode == "01" {
-		bFlag = "物资类"
-	} else if supplierCertEntity.SupplierTypeCode == "02" {
-		bFlag = "基建类"
-	} else {
-		bFlag = "服务类"
-	}
-	msg := "您的" + bFlag + "准入申请已通过，请及时交费！"
+	//bFlag := ""
+	//if supplierCertEntity.SupplierTypeCode == "01" {
+	//	bFlag = "物资类"
+	//} else if supplierCertEntity.SupplierTypeCode == "02" {
+	//	bFlag = "基建类"
+	//} else {
+	//	bFlag = "服务类"
+	//}
+	msg := "您好，贵公司市场准入申请已通过集中评审，请在市场管理信息系统中进行交费信息确认后交费。谢谢。"
 	msgService := msg2.GetMsgService(utils.DBE)
 	msgService.HandleMsg(supplierEntity.Mobile, msg, "5-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 
@@ -445,15 +445,15 @@ func (this *OilSupplierCertListenerController) ApprovalRefuse() {
 // @router /audit-reject-notice/:id [post]
 func (this *OilSupplierCertListenerController) AuditRejectNotice(supplierCertEntity suppliercert.OilSupplierCert, supplierEntity supplier.OilSupplier) {
 	toMobile := supplierEntity.Mobile
-	bFlag := ""
-	if supplierCertEntity.SupplierTypeCode == "01" {
-		bFlag = "物资类"
-	} else if supplierCertEntity.SupplierTypeCode == "02" {
-		bFlag = "基建类"
-	} else {
-		bFlag = "服务类"
-	}
-	msg := "您的" + bFlag + "准入申请未通过，请及时查看！"
+	//bFlag := ""
+	//if supplierCertEntity.SupplierTypeCode == "01" {
+	//	bFlag = "物资类"
+	//} else if supplierCertEntity.SupplierTypeCode == "02" {
+	//	bFlag = "基建类"
+	//} else {
+	//	bFlag = "服务类"
+	//}
+	msg := "您好，贵公司市场准入申请未通过集中评审，请在市场管理信息系统中查询。谢谢。"
 	msgService := msg2.GetMsgService(utils.DBE)
 	msgService.HandleMsg(toMobile, msg, "5-2", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 }

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -345,6 +345,13 @@ func (this *OilCorporateInfoController) AddEntity() {
 	}
 	err = session.Commit()
 	if err == nil {
+
+		// 注册成功发短信
+		toMobile := model.UserTelephone
+		msg := "您好，贵公司在市场管理信息系统中自注册信息已发送，待审批通过后，用户名和密码方可生效。谢谢。"
+		msgService := msg2.GetMsgService(utils.DBE)
+		msgService.HandleMsg(toMobile, msg, "1-1", model.UserName, model.SupplierName, "0", model.UserName)
+
 		errinfo.Message = "注册成功！已提交审核！"
 		errinfo.Code = 0
 		errinfo.Item = model.Id