wangkaiyue пре 6 година
родитељ
комит
1af217057e

+ 1 - 1
src/jfw/front/datareport.go

@@ -253,7 +253,7 @@ func (d *DataReport) PayCallback() {
 
 				if updateStatus {
 					//发送数据
-					go public.SendDatareportMailToPayUser(util.IntAll((*orderdata)["report_id"]), util.ObjToString((*orderdata)["user_mail"]), config.GmailAuth)
+					go public.SendDatareportMailToPayUser(util.IntAll((*orderdata)["report_id"]), util.ObjToString(ret["out_trade_no"]), util.ObjToString((*orderdata)["user_mail"]), config.GmailAuth)
 				}
 			}
 		} else {

+ 1 - 1
src/jfw/modules/app/src/app/front/datareport.go

@@ -246,7 +246,7 @@ func DataReportCalBakAfter(order_money, cash_fee int, out_trade_no, transaction_
 			if updateStatus {
 				//发送数据
 				log.Println("========数据报告支付完成=====")
-				go public.SendDatareportMailToPayUser(util.IntAll((*orderdata)["report_id"]), util.ObjToString((*orderdata)["user_mail"]), config.GmailAuth)
+				go public.SendDatareportMailToPayUser(util.IntAll((*orderdata)["report_id"]), out_trade_no, util.ObjToString((*orderdata)["user_mail"]), config.GmailAuth)
 
 			}
 		}

+ 4 - 3
src/jfw/public/dataexport.go

@@ -681,7 +681,7 @@ func (wx *WeixinStruct) GetAppWxPayStr(prepayid string) string {
 }
 
 //数据报告发送邮件
-func SendDatareportMailToPayUser(report_id int, user_mail string, auth []*mail.GmailAuth) {
+func SendDatareportMailToPayUser(report_id int, out_trade_no, user_mail string, auth []*mail.GmailAuth) {
 	res := Mysql.FindOne("jy_datareport", map[string]interface{}{
 		"report_id": report_id,
 	}, "s_url", "")
@@ -694,13 +694,14 @@ func SendDatareportMailToPayUser(report_id int, user_mail string, auth []*mail.G
 		log.Printf("用户%s:数据报告附件邮件发送成功!数据报告id:%d\n", user_mail, report_id)
 		now := time.Now()
 		Mysql.Update("jy_datareport_order", map[string]interface{}{
-			"report_id": report_id,
+			"out_trade_no": out_trade_no,
+			"report_id":    report_id,
 		}, map[string]interface{}{
 			"service_status": 1,
 			"service_time":   util.FormatDate(&now, util.Date_Full_Layout),
 		})
 	} else {
-		log.Printf("%s数据报告发送邮件出错,数据报告id:%d\n", user_mail, report_id)
+		log.Printf("%s数据报告发送邮件出错,数据报告id:%d\n", out_trade_no, report_id)
 	}
 }