|
|
@@ -187,18 +187,19 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
|
|
|
a,_ = strconv.ParseFloat(tax, 64)
|
|
|
rate = "0.00"
|
|
|
}
|
|
|
- typeString := ""
|
|
|
- if pay.OilPaymentInfo.PayType == "1" {
|
|
|
- typeString = "准入交费"
|
|
|
- } else if pay.OilPaymentInfo.PayType == "2" {
|
|
|
- typeString = "年审交费"
|
|
|
- } else if pay.OilPaymentInfo.PayType == "3" {
|
|
|
- typeString = "增项交费"
|
|
|
- } else if pay.OilPaymentInfo.PayType == "7" {
|
|
|
- typeString = "信息变更交费"
|
|
|
- }
|
|
|
+ //typeString := ""
|
|
|
+ //if pay.OilPaymentInfo.PayType == "1" {
|
|
|
+ // typeString = "准入交费"
|
|
|
+ //} else if pay.OilPaymentInfo.PayType == "2" {
|
|
|
+ // typeString = "年审交费"
|
|
|
+ //} else if pay.OilPaymentInfo.PayType == "3" {
|
|
|
+ // typeString = "增项交费"
|
|
|
+ //} else if pay.OilPaymentInfo.PayType == "7" {
|
|
|
+ // typeString = "信息变更交费"
|
|
|
+ //}
|
|
|
//paramsString += "{'goodsname':'" + pay.SupplierTypeName + " " + typeString + "','num':'','price':'','hsbz':'1','taxrate':'" + rate + "','spec':'','unit':'','spbm':'10101150101','zsbm':'','fphxz':'0','yhzcbs':'" + yhzcbs + "','zzstsgl':'" + zzstsgl + "','lslbs':'" + israte + "','kce':'','taxfreeamt':" + fmt.Sprintf("%.2f", amount-a) + ",'tax':" + tax + ",'taxamt':" + strconv.Itoa(int(amount)) + "}"
|
|
|
- detail.Goodsname = pay.SupplierTypeName + " " + typeString
|
|
|
+ //detail.Goodsname = pay.SupplierTypeName + " " + typeString
|
|
|
+ detail.Goodsname = "资质认证服务费"
|
|
|
detail.Hsbz = "1"
|
|
|
detail.Taxrate = rate
|
|
|
detail.Fphxz = "0"
|
|
|
@@ -206,6 +207,7 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
|
|
|
detail.Zzstsgl = zzstsgl
|
|
|
detail.Lslbs = israte
|
|
|
detail.Tax = tax
|
|
|
+ detail.Spbm = "3040101"
|
|
|
detail.Taxamt = strconv.Itoa(int(amount))
|
|
|
detail.Taxfreeamt = fmt.Sprintf("%.2f", amount-a)
|
|
|
paramsDetail = append(paramsDetail, detail)
|
|
|
@@ -223,7 +225,7 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
|
|
|
paramsOrder.Address = entity.Address
|
|
|
paramsOrder.Account = entity.DepositBank + " " + entity.BankAccount
|
|
|
paramsOrder.Telephone = supplierEntity.Telphone
|
|
|
- paramsOrder.Orderno = "dg21" + entity.BankSerialNum
|
|
|
+ paramsOrder.Orderno = "dg" + entity.BankSerialNum
|
|
|
paramsOrder.Invoicedate = time.Now().Format("2006-01-02 15:04:05")
|
|
|
paramsOrder.Clerk = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople3")
|
|
|
paramsOrder.Saleaccount = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceSaleaccount")
|
dubch