feat:xiugai

src/jfw/modules/subscribepay/src/entity/bidCreditReport/bidCreditReport.go

@@ -411,21 +411,6 @@ func (b *bidCreditReport) NewOrderWarn() {
 	ctx := gctx.New()
 	warnStart := g.Config().MustGet(ctx, "bidCreditReport.warnStart").String()
 	warnEnd := g.Config().MustGet(ctx, "bidCreditReport.warnEnd").String()
-	var sendMail = func(m *gmap.StrAnyMap) {
-		entName := m.GetVar("ent_name").String()
-		orderCode := m.GetVar("order_code").String()
-		content := fmt.Sprintf(g.Config().MustGet(ctx, "bidCreditReport.warnMailContent").String(), config.Config.WebDomain, m.GetVar("id").Int64(), orderCode, entName, m.GetVar("buyer").String())
-		for _, v := range g.Config().MustGet(ctx, "bidCreditReport.warnUserMail").Strings() {
-			go func(vv string) {
-				log.Println(orderCode, vv, "开始给运维发送有新的投标企业信用报告订单邮件。。。")
-				if util.SendRetryMail(g.Config().MustGet(ctx, "bidCreditReport.sendMailRetry").Int(), vv, g.Config().MustGet(ctx, "bidCreditReport.warnMailSubject").String(), content, "", nil, config.GmailAuth) {
-					log.Println(orderCode, vv, "给运维发送有新的投标企业信用报告订单邮件成功。。。")
-				} else {
-					log.Println(orderCode, vv, "给运维发送有新的投标企业信用报告订单邮件邮件失败。。。")
-				}
-			}(v)
-		}
-	}
 	all := map[int64]*gmap.StrAnyMap{}
 	index := 0
 	p.VarTimeTask.RunInTimeSection("有新的投标企业信用报告订单给运维发邮件", warnStart, warnEnd, 1, func(dayFirst bool) {
@@ -437,7 +422,7 @@ func (b *bidCreditReport) NewOrderWarn() {
 			id := v.GetVar("id").Int64()
 			if _, ok := all[id]; !ok {
 				v.Set("isNew", true)
-				sendMail(v)
+				b.sendWarnNotice(v.GetVar("id").Int64(), v.GetVar("order_code").String(), v.GetVar("ent_name").String(), v.GetVar("buyer").String())
 			}
 			ids[id] = true
 			all[id] = v
@@ -456,17 +441,18 @@ func (b *bidCreditReport) NewOrderWarn() {
 				v.Set("isNew", false)
 				continue
 			}
-			sendMail(v)
+			b.sendWarnNotice(v.GetVar("id").Int64(), v.GetVar("order_code").String(), v.GetVar("ent_name").String(), v.GetVar("buyer").String())
 		}
 	})
 }
 
 // 发送企业微信机器人告警
-func (b *bidCreditReport) sendWebhook(orderCode, entName, buyer, url string) {
+func (b *bidCreditReport) sendWarnNotice(id int64, orderCode, entName, buyer string) {
+	ctx := gctx.New()
 	message := `订单编号：%s
 投标企业名称：%s
 招标单位名称：%s
-点击完善信息：%s`
+点击完善信息：%s/swordfish/page_big_pc/free/report/examine?id=%d`
 	type WeixinMessage struct {
 		MsgType string `json:"msgtype"`
 		Text    struct {
@@ -480,7 +466,7 @@ func (b *bidCreditReport) sendWebhook(orderCode, entName, buyer, url string) {
 		} `json:"text"`
 	}
 	msg.MsgType = "text"
-	msg.Text.Content = fmt.Sprintf(message, orderCode, entName, buyer, url)
+	msg.Text.Content = fmt.Sprintf(message, orderCode, entName, buyer, config.Config.WebDomain, id)
 	data, _ := json.Marshal(msg)
 	resp, err := http.Post(g.Config().MustGet(gctx.New(), "bidCreditReport.webhook").String(), "application/json", bytes.NewReader(data))
 	if err != nil {
@@ -493,4 +479,16 @@ func (b *bidCreditReport) sendWebhook(orderCode, entName, buyer, url string) {
 		log.Println(orderCode, entName, "投标企业信用报告订单 sendWebhook 失败", string(b))
 	}
 	log.Println(orderCode, entName, "投标企业信用报告订单 sendWebhook 成功")
+	//
+	content := fmt.Sprintf(g.Config().MustGet(ctx, "bidCreditReport.warnMailContent").String(), config.Config.WebDomain, id, orderCode, entName, buyer)
+	for _, v := range g.Config().MustGet(ctx, "bidCreditReport.warnUserMail").Strings() {
+		go func(vv string) {
+			log.Println(orderCode, vv, "开始给运维发送有新的投标企业信用报告订单邮件。。。")
+			if util.SendRetryMail(g.Config().MustGet(ctx, "bidCreditReport.sendMailRetry").Int(), vv, g.Config().MustGet(ctx, "bidCreditReport.warnMailSubject").String(), content, "", nil, config.GmailAuth) {
+				log.Println(orderCode, vv, "给运维发送有新的投标企业信用报告订单邮件成功。。。")
+			} else {
+				log.Println(orderCode, vv, "给运维发送有新的投标企业信用报告订单邮件邮件失败。。。")
+			}
+		}(v)
+	}
 }

src/jfw/modules/subscribepay/src/entity/bidCreditReport/bidCreditReport_test.go

@@ -48,6 +48,6 @@ func TestCallBack(t *testing.T) {
 }
 
 func TestSendWebhook(t *testing.T) {
-	BidCreditReport.sendWebhook("264436376359", "北京剑鱼信息技术有限公司", "大数据集成平台及数据中心", "https://jybx-webtest.jydev.jianyu360.com/swordfish/page_big_pc/free/report/examine?id=19")
+	BidCreditReport.sendWarnNotice(19, "264436376359", "北京剑鱼信息技术有限公司", "大数据集成平台及数据中心")
 	time.Sleep(time.Minute)
 }