Merge branch 'dev/v4.9.21_rjj' of qmx/jy into feature/v4.9.21

src/jfw/modules/subscribepay/src/service/invoice.go

@@ -1467,9 +1467,9 @@ func (this *Invoice) InvoiceSubmit() {
 		//"invoice_order_money": payMoney,
 		"invoicing_entity": "北京剑鱼信息技术有限公司",
 		"remark":           this.GetString("remark"),
-		"source":           0,
-		"invoice_variety":  this.GetString("invoice_variety"),
-		"bank_account":     this.GetString("bank_account"),
+		//"source":           0,
+		"invoice_variety": this.GetString("invoice_variety"),
+		"bank_account":    this.GetString("bank_account"),
 		//"only_Identifying":    onlyIdentifying,
 		"company_address":  this.GetString("company_address"),
 		"bank_name":        this.GetString("bank_name"),
@@ -1556,6 +1556,7 @@ func JyOpenInvoice(orderCode, userId string, data map[string]interface{}) error
 	data["invoice_order_money"] = invoiceMoney
 	data["product_type"] = qutil.ObjToString((*orderInfo)["product_type"])
 	data["user_id"] = userId
+	data["source"] = 0
 	if !util.Mysql.ExecTx("用户端开发票", func(tx *sql.Tx) bool {
 		if util.Mysql.InsertByTx(tx, "invoice", data) <= 0 {
 			log.Println("插入invoice出错", orderCode)
@@ -1623,6 +1624,7 @@ func AdminOpenInvoice(onlyIdentifying, invoiceMoney, operator string, data map[s
 			data["product_type"] = productType
 			data["user_id"] = qutil.ObjToString((*orderInfo)["user_id"])
 			data["operator"] = operator
+			data["source"] = 1
 			if util.Mysql.Insert("invoice", data) <= 0 {
 				log.Println("扫码开票插入invoice表出错", orderCode)
 				return false