fix: antom回调动态传channelCode

api/account/account.pb.go

@@ -699,7 +699,7 @@ type UserListInfo struct {
 	Id                 uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
 	Status             int32  `protobuf:"varint,2,opt,name=status,proto3" json:"status"`
 	Name               string `protobuf:"bytes,3,opt,name=name,proto3" json:"name"`
-	Sex                int32  `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`
+	Sex                string `protobuf:"bytes,4,opt,name=sex,proto3" json:"sex"`
 	Nationality        string `protobuf:"bytes,5,opt,name=nationality,proto3" json:"nationality"`
 	DocumentType       int32  `protobuf:"varint,6,opt,name=documentType,proto3" json:"documentType"`
 	CertificatePicture string `protobuf:"bytes,7,opt,name=certificatePicture,proto3" json:"certificatePicture"`
@@ -771,11 +771,11 @@ func (x *UserListInfo) GetName() string {
 	return ""
 }
 
-func (x *UserListInfo) GetSex() int32 {
+func (x *UserListInfo) GetSex() string {
 	if x != nil {
 		return x.Sex
 	}
-	return 0
+	return ""
 }
 
 func (x *UserListInfo) GetNationality() string {
@@ -899,7 +899,7 @@ type UserListRequest struct {
 	SubNum        string `protobuf:"bytes,2,opt,name=subNum,proto3" json:"subNum"`
 	RealNameOrNot int32  `protobuf:"varint,3,opt,name=realNameOrNot,proto3" json:"realNameOrNot"`
 	Name          string `protobuf:"bytes,4,opt,name=name,proto3" json:"name"`
-	Sex           int32  `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"`
+	Sex           string `protobuf:"bytes,5,opt,name=sex,proto3" json:"sex"`
 	DocumentType  int32  `protobuf:"varint,6,opt,name=documentType,proto3" json:"documentType"`
 	AuditStatus   int32  `protobuf:"varint,7,opt,name=auditStatus,proto3" json:"auditStatus"`
 	Page          uint64 `protobuf:"varint,8,opt,name=page,proto3" json:"page"`
@@ -966,11 +966,11 @@ func (x *UserListRequest) GetName() string {
 	return ""
 }
 
-func (x *UserListRequest) GetSex() int32 {
+func (x *UserListRequest) GetSex() string {
 	if x != nil {
 		return x.Sex
 	}
-	return 0
+	return ""
 }
 
 func (x *UserListRequest) GetDocumentType() int32 {
@@ -1009,7 +1009,7 @@ type UserInfoResponse struct {
 	Id                 uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
 	Status             int32  `protobuf:"varint,2,opt,name=status,proto3" json:"status"`
 	Name               string `protobuf:"bytes,3,opt,name=name,proto3" json:"name"`
-	Sex                int32  `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`
+	Sex                string `protobuf:"bytes,4,opt,name=sex,proto3" json:"sex"`
 	Nationality        string `protobuf:"bytes,5,opt,name=nationality,proto3" json:"nationality"`
 	DocumentType       int32  `protobuf:"varint,6,opt,name=documentType,proto3" json:"documentType"`
 	CertificatePicture string `protobuf:"bytes,7,opt,name=certificatePicture,proto3" json:"certificatePicture"`
@@ -1078,11 +1078,11 @@ func (x *UserInfoResponse) GetName() string {
 	return ""
 }
 
-func (x *UserInfoResponse) GetSex() int32 {
+func (x *UserInfoResponse) GetSex() string {
 	if x != nil {
 		return x.Sex
 	}
-	return 0
+	return ""
 }
 
 func (x *UserInfoResponse) GetNationality() string {
@@ -1238,7 +1238,7 @@ type RealNameRequest struct {
 
 	Id                 uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
 	Name               string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
-	Sex                int32  `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`
+	Sex                string `protobuf:"bytes,3,opt,name=sex,proto3" json:"sex"`
 	Nationality        string `protobuf:"bytes,4,opt,name=nationality,proto3" json:"nationality"`
 	DocumentType       int32  `protobuf:"varint,5,opt,name=documentType,proto3" json:"documentType"`
 	CertificatePicture string `protobuf:"bytes,6,opt,name=certificatePicture,proto3" json:"certificatePicture"`
@@ -1294,11 +1294,11 @@ func (x *RealNameRequest) GetName() string {
 	return ""
 }
 
-func (x *RealNameRequest) GetSex() int32 {
+func (x *RealNameRequest) GetSex() string {
 	if x != nil {
 		return x.Sex
 	}
-	return 0
+	return ""
 }
 
 func (x *RealNameRequest) GetNationality() string {
@@ -5729,7 +5729,7 @@ type AccountInfo struct {
 	JobNum         string          `protobuf:"bytes,18,opt,name=JobNum,json=jobNum,proto3" json:"JobNum"`
 	BirthDate      string          `protobuf:"bytes,19,opt,name=BirthDate,json=birth_date,proto3" json:"BirthDate"`
 	Age            uint64          `protobuf:"varint,20,opt,name=Age,json=age,proto3" json:"Age"`
-	Sex            uint64          `protobuf:"varint,21,opt,name=Sex,json=sex,proto3" json:"Sex"`
+	Sex            string          `protobuf:"bytes,21,opt,name=Sex,json=sex,proto3" json:"Sex"`
 	Title          string          `protobuf:"bytes,22,opt,name=Title,json=title,proto3" json:"Title"`
 	Departments    []*Department   `protobuf:"bytes,23,rep,name=Departments,json=departments,proto3" json:"Departments"`
 	Ip             string          `protobuf:"bytes,24,opt,name=Ip,json=ip,proto3" json:"Ip"`
@@ -5926,11 +5926,11 @@ func (x *AccountInfo) GetAge() uint64 {
 	return 0
 }
 
-func (x *AccountInfo) GetSex() uint64 {
+func (x *AccountInfo) GetSex() string {
 	if x != nil {
 		return x.Sex
 	}
-	return 0
+	return ""
 }
 
 func (x *AccountInfo) GetTitle() string {
@@ -7891,7 +7891,7 @@ var file_api_account_account_proto_rawDesc = []byte{
 	0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
 	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
 	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73,
-	0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x20, 0x0a,
+	0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x20, 0x0a,
 	0x0b, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12,
 	0x22, 0x0a, 0x0c, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18,
@@ -7934,7 +7934,7 @@ var file_api_account_account_proto_rawDesc = []byte{
 	0x61, 0x6d, 0x65, 0x4f, 0x72, 0x4e, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d,
 	0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x4f, 0x72, 0x4e, 0x6f, 0x74, 0x12, 0x12, 0x0a,
 	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
 	0x73, 0x65, 0x78, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x54,
 	0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x64, 0x6f, 0x63, 0x75, 0x6d,
 	0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x75, 0x64, 0x69, 0x74,
@@ -7948,7 +7948,7 @@ var file_api_account_account_proto_rawDesc = []byte{
 	0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
 	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65,
-	0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b,
+	0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b,
 	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x0b, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x22,
 	0x0a, 0x0c, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06,
@@ -7984,7 +7984,7 @@ var file_api_account_account_proto_rawDesc = []byte{
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65,
-	0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b,
+	0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b,
 	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x0b, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x22,
 	0x0a, 0x0c, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05,
@@ -8536,7 +8536,7 @@ var file_api_account_account_proto_rawDesc = []byte{
 	0x69, 0x72, 0x74, 0x68, 0x44, 0x61, 0x74, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
 	0x62, 0x69, 0x72, 0x74, 0x68, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x41, 0x67,
 	0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03,
-	0x53, 0x65, 0x78, 0x18, 0x15, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x14,
+	0x53, 0x65, 0x78, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x14,
 	0x0a, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74,
 	0x69, 0x74, 0x6c, 0x65, 0x12, 0x35, 0x0a, 0x0b, 0x44, 0x65, 0x70, 0x61, 0x72, 0x74, 0x6d, 0x65,
 	0x6e, 0x74, 0x73, 0x18, 0x17, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x61, 0x63, 0x63, 0x6f,

api/account/account.proto

@@ -125,7 +125,7 @@ message UserListInfo{
   uint64 id = 1;
   int32 status = 2;
   string name = 3;
-  int32 sex = 4;
+  string sex = 4;
   string nationality = 5;
   int32 documentType =6;
   string certificatePicture = 7;
@@ -148,7 +148,7 @@ message UserListRequest{
   string subNum = 2;
   int32 realNameOrNot = 3;
   string name = 4;
-  int32 sex = 5;
+  string sex = 5;
   int32 documentType = 6;
   int32 auditStatus = 7;
   uint64 page = 8;
@@ -158,7 +158,7 @@ message UserInfoResponse{
   uint64 id = 1;
   int32 status = 2;
   string name = 3;
-  int32 sex = 4;
+  string sex = 4;
   string nationality = 5;
   int32 documentType =6;
   string certificatePicture = 7;
@@ -180,7 +180,7 @@ message RealNameResponse{
 message RealNameRequest{
   uint64 id = 1;
   string name = 2;
-  int32 sex = 3;
+  string sex = 3;
   string nationality = 4;
   int32 documentType = 5;
   string certificatePicture = 6;
@@ -635,7 +635,7 @@ message AccountInfo {
   string    JobNum          = 18 [json_name = "jobNum"];
   string    BirthDate       = 19 [json_name = "birth_date"];
   uint64    Age             = 20 [json_name = "age"];
-  uint64    Sex             = 21 [json_name = "sex"];
+  string    Sex             = 21 [json_name = "sex"];
   string    Title           = 22 [json_name = "title"];
   repeated Department   Departments          = 23 [json_name = "departments"];
   string    Ip              = 24 [json_name = "ip"];

api/bundle/bundle.pb.go

@@ -519,7 +519,7 @@ type OrderRecord struct {
 	ValueAddSavedAmount   float32 `protobuf:"fixed32,23,opt,name=valueAddSavedAmount,proto3" json:"valueAddSavedAmount"`     //节省金额
 	Num                   int32   `protobuf:"varint,24,opt,name=num,proto3" json:"num"`
 	TotalAmount           float32 `protobuf:"fixed32,25,opt,name=totalAmount,proto3" json:"totalAmount"` //总金额
-	Sex                   int32   `protobuf:"varint,26,opt,name=sex,proto3" json:"sex"`
+	Sex                   string  `protobuf:"bytes,26,opt,name=sex,proto3" json:"sex"`
 	Nationality           string  `protobuf:"bytes,27,opt,name=nationality,proto3" json:"nationality"`
 	CertificatePicture    string  `protobuf:"bytes,28,opt,name=certificatePicture,proto3" json:"certificatePicture"`
 	PlaceOfResidence      string  `protobuf:"bytes,29,opt,name=placeOfResidence,proto3" json:"placeOfResidence"`
@@ -733,11 +733,11 @@ func (x *OrderRecord) GetTotalAmount() float32 {
 	return 0
 }
 
-func (x *OrderRecord) GetSex() int32 {
+func (x *OrderRecord) GetSex() string {
 	if x != nil {
 		return x.Sex
 	}
-	return 0
+	return ""
 }
 
 func (x *OrderRecord) GetNationality() string {
@@ -1716,7 +1716,7 @@ var file_pb_bundle_proto_rawDesc = []byte{
 	0x75, 0x6d, 0x18, 0x18, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a,
 	0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x19, 0x20, 0x01,
 	0x28, 0x02, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
-	0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65,
+	0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65,
 	0x78, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x69, 0x74, 0x79,
 	0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
 	0x69, 0x74, 0x79, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,

api/payment/payment.proto

@@ -28,7 +28,7 @@ service Payment{
 
   // stripe支付
   rpc CreateStripeCheckoutSession(CreateStripeCheckoutSessionRequest) returns (CreateStripeCheckoutSessionResponse){}; // 创建支付会话链接
-//  rpc CommonCheckoutWebhook(GetCheckoutWebhookRequest) returns(GetCheckoutWebhookResponse){}; // 支付回调,通用
+  //  rpc CommonCheckoutWebhook(GetCheckoutWebhookRequest) returns(GetCheckoutWebhookResponse){}; // 支付回调,通用
 
   // 支付宝支付
   rpc AliWapPay(AliWapPayRequest) returns (AliWapPayResponse) {}; // ali网页支付
@@ -71,6 +71,7 @@ message AntomNotifyPayRequest {
   string paymentTime = 4 [json_name = "paymentTime"];
   string resultStatus = 5 [json_name = "resultStatus"];
   string resultMessage = 6 [json_name = "resultMessage"];
+  string channelCode = 7 [json_name = "channelCode"];
 }
 
 message AntomNotifyPayResponse {

docs/prod/dubbogo.yaml

@@ -26,9 +26,11 @@ dubbo:
         protocol: tri
         retries: 0
         interface: com.fontree.microservices.common.micro.account
-      PaymentClientImpl:
-        interface: com.fontree.microservices.common.payment # must be compatible with grpc or dubbo-java
-        filter: cshutdown,sign,auth
+      PaymentCentClientImpl:
+        protocol: tri
+        retries: 0
+        interface: com.fontree.microservices.common.payment.cent # must be compatible with grpc or dubbo-java
+#        filter: cshutdown,sign,auth
         params:
           .accessKeyId: "Paymentksl"
           .secretAccessKey: "BSDY-FDF1-Fontree_payment"

pkg/model/login/login.go

@@ -14,7 +14,7 @@ type Info struct {
 	ID                 uint64 `json:"ID"`
 	Status             int32  `json:"status"`
 	Name               string `json:"name"`
-	Sex                int32  `json:"sex"`
+	Sex                string `json:"sex"`
 	Nationality        string `json:"nationality"`
 	DocumentType       int32  `json:"documentType"`
 	CertificatePicture string `json:"certificatePicture"`

pkg/model/union/user.go

@@ -87,7 +87,7 @@ type AccountInfo struct {
 	Status       string `json:"Status"`       //头像
 	CreatedAt    string `json:"CreatedAt"`    //头像
 	IsNeedChange uint64 `json:"IsNeedChange"` //是否强制修改密码
-	Sex          uint64 `json:"Sex"`
+	Sex          string `json:"Sex"`
 }
 
 type Login struct {

pkg/service/bundle/pay.go

@@ -238,13 +238,19 @@ func CreateAntomPay(c *gin.Context) {
 		CheckoutSessionId:  result.CheckoutSessionId,
 		CheckoutSessionUrl: result.Url,
 	})
+	fmt.Println("=====================================")
+	resp := &order.CreateStripeCheckoutSessionResponse{}
+	resp.CheckoutSessionUrl = result.Url
+	resp.CheckoutSessionId = result.CheckoutSessionId
+	fmt.Println("resp:", resp)
 
 	if updateOrderRecordErr != nil {
+		fmt.Println("有更新报错：", updateOrderRecordErr)
 		service.Error(c, updateOrderRecordErr)
 		return
 	}
 
-	service.Success(c, result)
+	service.Success(c, resp)
 
 }
 
@@ -336,6 +342,7 @@ func AntomWebhook(c *gin.Context) {
 		PaymentTime:   paymentTime,
 		ResultStatus:  resultStatus,
 		ResultMessage: resultMessage,
+		ChannelCode:   "Antom", // fiee对应payment的渠道码
 	}
 
 	resp, err := service.PaymentProvider.AntomWebhook(c, params)