|
@@ -1569,9 +1569,9 @@ func JyOpenInvoice(orderCode, userId string, data map[string]interface{}) error
|
|
|
if qutil.ObjToString((*orderInfo)["signing_subject"]) == "h02" {
|
|
|
return errors.New("签约主体为拓普")
|
|
|
}
|
|
|
- if qutil.IntAll((*orderInfo)["applybill_status"]) != 0 {
|
|
|
+ /*if qutil.IntAll((*orderInfo)["applybill_status"]) != 0 {
|
|
|
return errors.New("已提交发票信息")
|
|
|
- }
|
|
|
+ }*/
|
|
|
invoicedMoney := InvoiceAmount(orderCode) //已开票金额
|
|
|
invoiceMoney := qutil.Int64All((*orderInfo)["pay_money"]) - invoicedMoney
|
|
|
data["order_code"] = orderCode
|
|
@@ -1606,7 +1606,7 @@ func AdminOpenInvoice(onlyIdentifying, invoiceMoney, operator string, data map[s
|
|
|
//二维码
|
|
|
path := "/front/invoiceScan/qr"
|
|
|
urlStr := fmt.Sprintf("onlyIdentifying=%s&invoiceMoney=%s&operator=%s", encrypt.SE.EncodeString(onlyIdentifying), encrypt.SE.EncodeString(invoiceMoney), encrypt.SE.Encode2HexByCheck(operator))
|
|
|
- fullUrl := config.InvoiceConfig.Admin_webdomain + path + "?" + urlStr
|
|
|
+ fullUrl := config.Config.WebDomain + path + "?" + urlStr
|
|
|
oldData := util.Mysql.FindOne("invoice", map[string]interface{}{
|
|
|
"only_Identifying": onlyIdentifying,
|
|
|
}, "id", "")
|