fix:上传logo--debug模式
This commit is contained in:
parent
8dcd2b531a
commit
b3c1e21ccf
@ -9,7 +9,6 @@ import (
|
|||||||
"fusenapi/model/gmodel"
|
"fusenapi/model/gmodel"
|
||||||
"fusenapi/utils/basic"
|
"fusenapi/utils/basic"
|
||||||
"fusenapi/utils/file"
|
"fusenapi/utils/file"
|
||||||
"fusenapi/utils/format"
|
|
||||||
"fusenapi/utils/handlers"
|
"fusenapi/utils/handlers"
|
||||||
"fusenapi/utils/hash"
|
"fusenapi/utils/hash"
|
||||||
"fusenapi/utils/order"
|
"fusenapi/utils/order"
|
||||||
@ -17,7 +16,6 @@ import (
|
|||||||
"fusenapi/utils/pdf"
|
"fusenapi/utils/pdf"
|
||||||
"fusenapi/utils/queue"
|
"fusenapi/utils/queue"
|
||||||
"math"
|
"math"
|
||||||
"strconv"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go/aws/session"
|
"github.com/aws/aws-sdk-go/aws/session"
|
||||||
@ -404,20 +402,20 @@ func (d *defaultOrder) Invoice(ctx context.Context, in *InvoiceReq) (res *Invoic
|
|||||||
for _, orderProduct := range ress.OrderDetail.OrderProduct {
|
for _, orderProduct := range ress.OrderDetail.OrderProduct {
|
||||||
var model00301 = constants.INVOICE_TEMPLATE_0301
|
var model00301 = constants.INVOICE_TEMPLATE_0301
|
||||||
|
|
||||||
var priceStr = format.NumToStringWithThousandthPercentile(orderProduct.ItemPrice.Current.CurrentAmount.(string))
|
var priceStr = orderProduct.ItemPrice.Current.CurrentAmount.(string)
|
||||||
var price = fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(orderProduct.ItemPrice.Current.CurrentCurrency)], priceStr)
|
var price = fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(orderProduct.ItemPrice.Current.CurrentCurrency)], priceStr)
|
||||||
|
|
||||||
var priceTotalStr = format.NumToStringWithThousandthPercentile(orderProduct.TotalPrice.Current.CurrentAmount.(string))
|
var priceTotalStr = orderProduct.TotalPrice.Current.CurrentAmount.(string)
|
||||||
var priceTotal = fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(orderProduct.TotalPrice.Current.CurrentCurrency)], priceTotalStr)
|
var priceTotal = fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(orderProduct.TotalPrice.Current.CurrentCurrency)], priceTotalStr)
|
||||||
|
|
||||||
productNum := strconv.FormatFloat(orderProduct.PurchaseQuantity.Current.(float64), 'f', -1, 64)
|
productNum := orderProduct.PurchaseQuantity.Current.(string)
|
||||||
var productNumStr = format.NumToStringWithThousandthPercentile(productNum)
|
var productNumStr = productNum
|
||||||
|
|
||||||
var productsInfo = fmt.Sprintf(model00301, orderProduct.ProductName, price, productNumStr, priceTotal)
|
var productsInfo = fmt.Sprintf(model00301, orderProduct.ProductName, price, productNumStr, priceTotal)
|
||||||
products = products + productsInfo
|
products = products + productsInfo
|
||||||
}
|
}
|
||||||
model003 = fmt.Sprintf(constants.INVOICE_TEMPLATE_03, products)
|
model003 = fmt.Sprintf(constants.INVOICE_TEMPLATE_03, products)
|
||||||
var subtotalStr = format.NumToStringWithThousandthPercentile(ress.OrderDetail.OrderAmount.Subtotal.Current.CurrentAmount.(string))
|
var subtotalStr = ress.OrderDetail.OrderAmount.Subtotal.Current.CurrentAmount.(string)
|
||||||
var subtotal = fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.Subtotal.Current.CurrentCurrency)], subtotalStr)
|
var subtotal = fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.Subtotal.Current.CurrentCurrency)], subtotalStr)
|
||||||
var taxStr = "0.00"
|
var taxStr = "0.00"
|
||||||
if ress.OrderDetail.OrderAmount.Tax.Current.CurrentAmount != nil {
|
if ress.OrderDetail.OrderAmount.Tax.Current.CurrentAmount != nil {
|
||||||
@ -428,14 +426,14 @@ func (d *defaultOrder) Invoice(ctx context.Context, in *InvoiceReq) (res *Invoic
|
|||||||
taxCurrency = constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.Total.Current.CurrentCurrency)]
|
taxCurrency = constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.Total.Current.CurrentCurrency)]
|
||||||
}
|
}
|
||||||
var tax = fmt.Sprintf("%s%s", taxCurrency, taxStr)
|
var tax = fmt.Sprintf("%s%s", taxCurrency, taxStr)
|
||||||
var totalStr = format.NumToStringWithThousandthPercentile(ress.OrderDetail.OrderAmount.Total.Current.CurrentAmount.(string))
|
var totalStr = ress.OrderDetail.OrderAmount.Total.Current.CurrentAmount.(string)
|
||||||
var total = fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.Total.Current.CurrentCurrency)], totalStr)
|
var total = fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.Total.Current.CurrentCurrency)], totalStr)
|
||||||
|
|
||||||
// 生成收据发票--首款
|
// 生成收据发票--首款
|
||||||
if receiptSnsDeposit != "" {
|
if receiptSnsDeposit != "" {
|
||||||
model002 = fmt.Sprintf(constants.INVOICE_TEMPLATE_02, receiptSnsDeposit, name, ctimeDate, street+" "+suite, city, state+zipCode)
|
model002 = fmt.Sprintf(constants.INVOICE_TEMPLATE_02, receiptSnsDeposit, name, ctimeDate, street+" "+suite, city, state+zipCode)
|
||||||
|
|
||||||
var payAmountStr01 = format.NumToStringWithThousandthPercentile(ress.OrderDetail.OrderAmount.Deposit.PayAmount.Current.CurrentAmount.(string))
|
var payAmountStr01 = ress.OrderDetail.OrderAmount.Deposit.PayAmount.Current.CurrentAmount.(string)
|
||||||
v7 := "Deposit Requested"
|
v7 := "Deposit Requested"
|
||||||
v8 := fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.Deposit.PayAmount.Current.CurrentCurrency)], payAmountStr01)
|
v8 := fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.Deposit.PayAmount.Current.CurrentCurrency)], payAmountStr01)
|
||||||
v9 := "Deposit Due"
|
v9 := "Deposit Due"
|
||||||
@ -489,7 +487,7 @@ func (d *defaultOrder) Invoice(ctx context.Context, in *InvoiceReq) (res *Invoic
|
|||||||
// 生成收据发票--尾款
|
// 生成收据发票--尾款
|
||||||
if receiptSnsFinal != "" {
|
if receiptSnsFinal != "" {
|
||||||
model002 = fmt.Sprintf(constants.INVOICE_TEMPLATE_02, receiptSnsDeposit, name, ctimeDate, street+" "+suite, city, state+zipCode)
|
model002 = fmt.Sprintf(constants.INVOICE_TEMPLATE_02, receiptSnsDeposit, name, ctimeDate, street+" "+suite, city, state+zipCode)
|
||||||
var payAmountStr02 = format.NumToStringWithThousandthPercentile(ress.OrderDetail.OrderAmount.RemainingBalance.PayAmount.Current.CurrentAmount.(string))
|
var payAmountStr02 = ress.OrderDetail.OrderAmount.RemainingBalance.PayAmount.Current.CurrentAmount.(string)
|
||||||
v7 := "Balance Requested"
|
v7 := "Balance Requested"
|
||||||
v8 := fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.RemainingBalance.PayAmount.Current.CurrentCurrency)], payAmountStr02)
|
v8 := fmt.Sprintf("%s%s", constants.OrderCurrencyMessage[constants.Currency(ress.OrderDetail.OrderAmount.RemainingBalance.PayAmount.Current.CurrentCurrency)], payAmountStr02)
|
||||||
v9 := "Balance Due"
|
v9 := "Balance Due"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user