diff --git a/org.pb.go b/org.pb.go
index 5e59d2f..ea3d99d 100644
--- a/org.pb.go
+++ b/org.pb.go
@@ -544,8 +544,10 @@ type QueryReq struct {
 	Org      string `protobuf:"bytes,3,opt,name=Org,proto3" json:"Org,omitempty" dc:"渠道标识"`            //渠道标识
 	OrgNo    string `protobuf:"bytes,4,opt,name=OrgNo,proto3" json:"OrgNo,omitempty" dc:"渠道订单号"`       //渠道订单号
 	OrderNo  string `protobuf:"bytes,5,opt,name=OrderNo,proto3" json:"OrderNo,omitempty" dc:"商户订单号"`   //商户订单号
-	RefundNo string `protobuf:"bytes,6,opt,name=RefundNo,proto3" json:"RefundNo,omitempty" dc:"退款单号"`  //退款单号
-	TokenNo  string `protobuf:"bytes,7,opt,name=TokenNo,proto3" json:"TokenNo,omitempty" dc:"TokenId"` // TokenId
+	TokenNo  string `protobuf:"bytes,6,opt,name=TokenNo,proto3" json:"TokenNo,omitempty" dc:"TokenId"` // TokenId
+	StoreNo  string `protobuf:"bytes,7,opt,name=StoreNo,proto3" json:"StoreNo,omitempty" dc:"门店编号"`    // 门店编号
+	DeviceNo string `protobuf:"bytes,8,opt,name=DeviceNo,proto3" json:"DeviceNo,omitempty" dc:"设备编号"`  // 设备编号
+	RefundNo string `protobuf:"bytes,10,opt,name=RefundNo,proto3" json:"RefundNo,omitempty" dc:"退款单号"` //退款单号
 }
 
 func (x *QueryReq) Reset() {
@@ -613,16 +615,30 @@ func (x *QueryReq) GetOrderNo() string {
 	return ""
 }
 
-func (x *QueryReq) GetRefundNo() string {
+func (x *QueryReq) GetTokenNo() string {
 	if x != nil {
-		return x.RefundNo
+		return x.TokenNo
 	}
 	return ""
 }
 
-func (x *QueryReq) GetTokenNo() string {
+func (x *QueryReq) GetStoreNo() string {
 	if x != nil {
-		return x.TokenNo
+		return x.StoreNo
+	}
+	return ""
+}
+
+func (x *QueryReq) GetDeviceNo() string {
+	if x != nil {
+		return x.DeviceNo
+	}
+	return ""
+}
+
+func (x *QueryReq) GetRefundNo() string {
+	if x != nil {
+		return x.RefundNo
 	}
 	return ""
 }
@@ -635,6 +651,8 @@ type CallbackReq struct {
 	Kid    uint64            `protobuf:"varint,1,opt,name=Kid,proto3" json:"Kid,omitempty" dc:"主体ID"`                                                                                                // 主体ID
 	Uid    string            `protobuf:"bytes,2,opt,name=Uid,proto3" json:"Uid,omitempty" dc:"用户ID"`                                                                                                 // 用户ID
 	Org    string            `protobuf:"bytes,3,opt,name=Org,proto3" json:"Org,omitempty" dc:"渠道标识"`                                                                                                 //渠道标识
+	Url    string            `protobuf:"bytes,5,opt,name=Url,proto3" json:"Url,omitempty" dc:"URL"`                                                                                                  //URL
+	Action string            `protobuf:"bytes,7,opt,name=Action,proto3" json:"Action,omitempty" dc:"Action"`                                                                                         //Action
 	Query  map[string]string `protobuf:"bytes,8,rep,name=Query,proto3" json:"Query,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" dc:"Query"`    //Query
 	Header map[string]string `protobuf:"bytes,9,rep,name=Header,proto3" json:"Header,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" dc:"Header"` //Header
 	Body   []byte            `protobuf:"bytes,10,opt,name=Body,proto3" json:"Body,omitempty" dc:"回调数据"`                                                                                              //回调数据
@@ -691,6 +709,20 @@ func (x *CallbackReq) GetOrg() string {
 	return ""
 }
 
+func (x *CallbackReq) GetUrl() string {
+	if x != nil {
+		return x.Url
+	}
+	return ""
+}
+
+func (x *CallbackReq) GetAction() string {
+	if x != nil {
+		return x.Action
+	}
+	return ""
+}
+
 func (x *CallbackReq) GetQuery() map[string]string {
 	if x != nil {
 		return x.Query
@@ -786,22 +818,28 @@ var file_org_proto_rawDesc = []byte{
 	0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
 	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
 	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa6, 0x01, 0x0a, 0x08,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xdc, 0x01, 0x0a, 0x08,
 	0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x69, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x4b, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x69,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
 	0x4f, 0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4f, 0x72, 0x67, 0x12, 0x14,
 	0x0a, 0x05, 0x4f, 0x72, 0x67, 0x4e, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f,
 	0x72, 0x67, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x1a,
-	0x0a, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x6f,
-	0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x4e, 0x6f, 0x22, 0xad, 0x02, 0x0a, 0x0b, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63,
-	0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x04, 0x52, 0x03, 0x4b, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4f, 0x72, 0x67, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4f, 0x72, 0x67, 0x12, 0x2d, 0x0a, 0x05, 0x51, 0x75,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x18,
+	0x0a, 0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x74, 0x6f, 0x72,
+	0x65, 0x4e, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x74, 0x6f, 0x72, 0x65,
+	0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x12, 0x1a,
+	0x0a, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x22, 0xd7, 0x02, 0x0a, 0x0b, 0x43,
+	0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x4b, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x69, 0x64, 0x12, 0x10,
+	0x0a, 0x03, 0x4f, 0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4f, 0x72, 0x67,
+	0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55,
+	0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x05, 0x51, 0x75,
 	0x65, 0x72, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x6c, 0x6c,
 	0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x6e, 0x74,
 	0x72, 0x79, 0x52, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x30, 0x0a, 0x06, 0x48, 0x65, 0x61,