|
|
@@ -243,7 +243,10 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
|
|
|
return ""
|
|
|
}()
|
|
|
}
|
|
|
-
|
|
|
+ isShowTransaction := "" //支付订单号为空，邮件不显示此字段
|
|
|
+ if transaction_id == "" {
|
|
|
+ isShowTransaction = "none"
|
|
|
+ }
|
|
|
mailcontent := ""
|
|
|
var mail_title = ""
|
|
|
if mailType == 1 { //支付完成后给北京财务发送导出数据接口信息的邮件
|
|
|
@@ -291,7 +294,7 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
|
|
|
log.Println("用户筛选条件错误", err, sc)
|
|
|
}
|
|
|
mail_title = "剑鱼标讯历史数据订单【" + order_code + "】，请查收"
|
|
|
- mailcontent = fmt.Sprintf(ExConf.Mail_order_finance_content, order_code, create_time, pay_time, product_type, pay_way, transaction_id, data_spec, data_count, order_money, user_mail, user_phone, publishtime, region, industry, keys, sc_money, subtype, buyer, winner)
|
|
|
+ mailcontent = fmt.Sprintf(ExConf.Mail_order_finance_content, order_code, create_time, pay_time, product_type, isShowTransaction, pay_way, transaction_id, data_spec, data_count, order_money, user_mail, user_phone, publishtime, region, industry, keys, sc_money, subtype, buyer, winner)
|
|
|
} else {
|
|
|
//申请发票
|
|
|
pay_time = util.ObjToString((*order)["pay_time"])
|
|
|
@@ -332,7 +335,7 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
|
|
|
}
|
|
|
}
|
|
|
mail_title = "电子发票申请，剑鱼标讯历史数据订单【" + order_code + "】，请查收"
|
|
|
- mailcontent = fmt.Sprintf(ExConf.Mail_invoice_finance_content, bill_title, company_flag, bill_company, taxnum_flag, bill_taxnum, order_code, create_time, pay_time, product_type, pay_way, transaction_id, offlineImgSrc, data_spec, data_count, order_money, user_mail, user_phone)
|
|
|
+ mailcontent = fmt.Sprintf(ExConf.Mail_invoice_finance_content, bill_title, company_flag, bill_company, taxnum_flag, bill_taxnum, order_code, create_time, pay_time, product_type, isShowTransaction, pay_way, transaction_id, offlineImgSrc, data_spec, data_count, order_money, user_mail, user_phone)
|
|
|
}
|
|
|
//发送邮件
|
|
|
for _, finance_mail := range ExConf.Finance_emails {
|
