Browse Source

开票二维码存表

renjiaojiao 1 năm trước cách đây
mục cha
commit
82125ade55

+ 0 - 1
src/jfw/modules/subscribepay/src/config/config.go

@@ -243,7 +243,6 @@ type Invoice struct {
 	SigningSubject     string          `json:"signing_subject"` //管理后台订单发票签约主体配置
 	SubmitNum          int64           `json:"submit_num"`
 	Invoice_type       map[string]bool //发票类型
-	Admin_webdomain    string          //管理后台域名
 }
 
 type entnicheConfig struct {

+ 1 - 2
src/jfw/modules/subscribepay/src/invoice.json

@@ -20,6 +20,5 @@
     "电子普通发票": true,
     "电子专用发票": true,
     "普通发票(电子发票)": true
-  },
-  "admin_webdomain": "https://web-qmx_admin.jydev.jianyu360.com"
+  }
 }

+ 3 - 3
src/jfw/modules/subscribepay/src/service/invoice.go

@@ -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", "")