|
@@ -1062,6 +1062,7 @@ func (this *Invoice) InvoiceSubmit() {
|
|
|
return
|
|
|
}
|
|
|
orderArr := []string{}
|
|
|
+ mailOrderArr := []string{}
|
|
|
orderMap := map[string]interface{}{}
|
|
|
Allmoney := int64(0)
|
|
|
for _, v := range strings.Split(invoiceMoney, ",") {
|
|
@@ -1069,6 +1070,8 @@ func (this *Invoice) InvoiceSubmit() {
|
|
|
orderArr = append(orderArr, invoiceMoneyArr[0])
|
|
|
Allmoney += qutil.Int64All(invoiceMoneyArr[1])
|
|
|
orderMap[invoiceMoneyArr[0]] = invoiceMoneyArr[1]
|
|
|
+ mailOrderArr = append(mailOrderArr, fmt.Sprintf("%s(%s元)", invoiceMoneyArr[0], qutil.InterfaceToStr(qutil.Int64All(invoiceMoneyArr[1])/100)))
|
|
|
+
|
|
|
}
|
|
|
//提交时订单金额再做一次校验
|
|
|
for orderCode, money := range orderMap {
|
|
@@ -1166,6 +1169,7 @@ func (this *Invoice) InvoiceSubmit() {
|
|
|
html := fmt.Sprintf(email_format_new,
|
|
|
FormatDate(&now, Date_Full_Layout),
|
|
|
strings.Join(orderArr, ","),
|
|
|
+ strings.Join(mailOrderArr, ","),
|
|
|
Allmoney/100,
|
|
|
this.GetString("invoice_variety"),
|
|
|
qutil.InterfaceToStr(qutil.If(this.GetString("invoice_type") == "", "--", this.GetString("invoice_type"))),
|