Merge pull request #18 from ipconfiger/master

wandercn · web-flow · commit 80e3a9e78d35 · 2025-05-29T18:11:46.000+08:00
去掉BizContent trait里的set_array, 直接使用JsonV实现的发起分账，分账查询，绑定分账用户，解绑分账用户接口
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/alipay_sdk_rust.iml b/.idea/alipay_sdk_rust.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,3 +25,4 @@ x509-parser = "0.17.0"
 md5 = "0.7.0"
 thiserror ="2.0"
 anyhow= "1.0"
+chrono = "0.4.41"
diff --git a/src/biz/biz_content.rs b/src/biz/biz_content.rs
@@ -1,6 +1,5 @@
 use core::hash;
 use std::{clone, hash::Hash};
-
 use gostd::strings;
 use jsonmap::{JsonMap, JsonV};
 use serde::{Deserialize, Serialize};
diff --git a/src/biz/mod.rs b/src/biz/mod.rs
@@ -27,3 +27,14 @@ mod trade_refund;
 pub use trade_refund::*;
 mod trade_wap_pay;
 pub use trade_wap_pay::*;
+mod trade_order_settle;
+pub use trade_order_settle::*;
+mod trade_order_settle_query;
+pub use trade_order_settle_query::*;
+mod trade_royalty_relation_bind;
+pub use trade_royalty_relation_bind::*;
+
+mod trade_royalty_relation_unbind;
+pub use trade_royalty_relation_unbind::*;
+
+
diff --git a/src/biz/trade_app_pay.rs b/src/biz/trade_app_pay.rs
@@ -1,7 +1,7 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
-use super::{BizContenter, BizObject,V};
+use jsonmap::{JsonMap, JsonV};
+use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Default)]
@@ -17,6 +17,7 @@ impl BizContenter for TradeAppPayBiz
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+    
 }
 
 // 以下是设置必选字段方法
diff --git a/src/biz/trade_cancel.rs b/src/biz/trade_cancel.rs
@@ -1,7 +1,7 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
-use super::{BizContenter, BizObject,V};
+use jsonmap::{JsonMap, JsonV};
+use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Default)]
@@ -17,6 +17,7 @@ impl BizContenter for TradeCancelBiz
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+
 }
 // 以下是设置必选字段方法
 impl TradeCancelBiz
diff --git a/src/biz/trade_close.rs b/src/biz/trade_close.rs
@@ -1,7 +1,7 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
-use super::{BizContenter, BizObject,V};
+use jsonmap::{JsonMap, JsonV};
+use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Default)]
@@ -17,6 +17,7 @@ impl BizContenter for TradeCloseBiz
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+
 }
 // 以下是设置必选字段方法
 impl TradeCloseBiz
diff --git a/src/biz/trade_create.rs b/src/biz/trade_create.rs
@@ -1,6 +1,6 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
+use jsonmap::{JsonMap, JsonV};
 use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +15,7 @@ impl BizContenter for TradeCreateBiz {
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+    
 }
 // 以下是设置必选字段方法
 impl TradeCreateBiz {
diff --git a/src/biz/trade_fastpay_refund_query.rs b/src/biz/trade_fastpay_refund_query.rs
@@ -1,6 +1,6 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
+use jsonmap::{JsonMap, JsonV};
 use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +15,7 @@ impl BizContenter for TradeFastpayRefundQueryBiz {
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+
 }
 // 以下是设置必选字段方法
 impl TradeFastpayRefundQueryBiz {
diff --git a/src/biz/trade_order_settle.rs b/src/biz/trade_order_settle.rs
@@ -0,0 +1,79 @@
+#![allow(unused)]
+
+use std::collections::HashMap;
+use std::hash::BuildHasher;
+use jsonmap::{JsonMap, JsonV};
+use super::{BizContenter, BizObject, V};
+use serde::{Deserialize, Serialize};
+
+
+#[derive(Serialize, Deserialize, Clone)]
+pub struct RoyaltyParameter{
+    pub royalty_type: String,
+    pub trans_in_type: String,
+    pub trans_in: String,
+    pub amount: String,
+    pub desc: String,
+}
+
+impl RoyaltyParameter {
+    pub fn init_with(trans_in: String, amount: String, desc: String) -> Self {
+        Self {
+            royalty_type: "transfer".to_string(),
+            trans_in_type: "userId".to_string(),
+            trans_in,
+            amount,
+            desc,
+        }
+    }
+    pub fn into_map(self) -> JsonV<String> {
+        let mut map = JsonMap::new();
+        map.insert("royalty_type".to_string(), self.royalty_type.clone().into());
+        map.insert("trans_in_type".to_string(), self.trans_in_type.clone().into());
+        map.insert("trans_in".to_string(), self.trans_in.clone().into());
+        map.insert("amount".to_string(), self.amount.clone().into());
+        map.insert("desc".to_string(), self.desc.clone().into());
+        JsonV::Object(map)
+    }
+}
+
+
+#[derive(Serialize, Deserialize, Default)]
+pub struct TradeOrderSettleBiz(BizObject);
+
+impl BizContenter for TradeOrderSettleBiz
+
+{
+    fn method(&self) -> String {
+        "_".to_string()
+    }
+    // 设置可选字段方法
+    fn set(&mut self, key: &str, value: V) {
+        self.0.insert(key.to_string(), value.clone());
+    }
+    
+}
+
+// 以下是设置必选字段方法
+impl TradeOrderSettleBiz
+{
+    pub fn new() -> Self {
+        Self(BizObject::new())
+    }
+    // 以下是设置必选字段方法
+
+    pub fn set_out_trade_no(&mut self, value: V) {
+        self.set("out_trade_no", value);
+    }
+    
+    pub fn set_trade_no(&mut self, value: V) {
+        self.set("trade_no", value);
+    }
+    
+    pub fn set_royalty_parameters(&mut self, value: Vec<RoyaltyParameter>) {
+        self.set("royalty_parameters", JsonV::Array(value.iter().map(|v| v.clone().into_map()).collect::<Vec<JsonV<String>>>()));
+    }
+    
+}
+
+
diff --git a/src/biz/trade_order_settle_query.rs b/src/biz/trade_order_settle_query.rs
@@ -0,0 +1,39 @@
+#![allow(unused)]
+
+use std::collections::HashMap;
+use std::hash::BuildHasher;
+use jsonmap::{JsonMap, JsonV};
+use super::{BizContenter, BizObject, V};
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Default)]
+pub struct TradeOrderSettleQueryBiz(BizObject);
+
+impl BizContenter for TradeOrderSettleQueryBiz
+{
+    fn method(&self) -> String {
+        "_".to_string()
+    }
+    // 设置可选字段方法
+    fn set(&mut self, key: &str, value: V) {
+        self.0.insert(key.to_string(), value.clone());
+    }
+
+}
+
+impl TradeOrderSettleQueryBiz {
+    pub fn new() -> Self {
+        Self(BizObject::new())
+    }
+ 
+    pub fn set_settle_no(&mut self, settle_no: String) {
+        self.set("settle_no", settle_no.into());
+    }
+    pub fn set_out_request_no(&mut self, out_request_no: String) {
+        self.set("out_request_no", out_request_no.into());
+    }
+    pub fn set_trade_no(&mut self, trade_no: String) {
+        self.set("trade_no", trade_no.into());
+    }
+
+}
diff --git a/src/biz/trade_page_pay.rs b/src/biz/trade_page_pay.rs
@@ -1,6 +1,6 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
+use jsonmap::{JsonMap, JsonV};
 use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +15,7 @@ impl BizContenter for TradePagePayBiz {
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+
 }
 // 以下是设置必选字段方法
 impl TradePagePayBiz {
diff --git a/src/biz/trade_page_refund.rs b/src/biz/trade_page_refund.rs
@@ -1,6 +1,6 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
+use jsonmap::{JsonMap, JsonV};
 use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +15,7 @@ impl BizContenter for TradePageRefundBiz {
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+    
 }
 // 以下是设置必选字段方法
 impl TradePageRefundBiz {
diff --git a/src/biz/trade_pay.rs b/src/biz/trade_pay.rs
@@ -1,6 +1,6 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
+use jsonmap::{JsonMap, JsonV};
 use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +15,7 @@ impl BizContenter for TradePayBiz {
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+    
 }
 // 以下是设置必选字段方法
 impl TradePayBiz {
diff --git a/src/biz/trade_precreate.rs b/src/biz/trade_precreate.rs
@@ -1,6 +1,6 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
+use jsonmap::{JsonMap, JsonV};
 use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +15,7 @@ impl BizContenter for TradePrecreateBiz {
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+
 }
 // 以下是设置必选字段方法
 impl TradePrecreateBiz {
diff --git a/src/biz/trade_query.rs b/src/biz/trade_query.rs
@@ -1,6 +1,6 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
+use jsonmap::{JsonMap, JsonV};
 use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +15,7 @@ impl BizContenter for TradeQueryBiz {
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+
 }
 // 以下是设置必选字段方法
 impl TradeQueryBiz {
diff --git a/src/biz/trade_refund.rs b/src/biz/trade_refund.rs
@@ -1,6 +1,6 @@
 #![allow(unused)]
 use std::hash::BuildHasher;
-
+use jsonmap::{JsonMap, JsonV};
 use super::{BizContenter, BizObject, V};
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +15,7 @@ impl BizContenter for TradeRefundBiz {
     fn set(&mut self, key: &str, value: V) {
         self.0.insert(key.to_string(), value.clone());
     }
+
 }
 // 以下是设置必选字段方法
 impl TradeRefundBiz {
diff --git a/src/biz/trade_royalty_relation_bind.rs b/src/biz/trade_royalty_relation_bind.rs
diff --git a/src/biz/trade_royalty_relation_unbind.rs b/src/biz/trade_royalty_relation_unbind.rs
diff --git a/src/biz/trade_wap_pay.rs b/src/biz/trade_wap_pay.rs
diff --git a/src/pay.rs b/src/pay.rs
diff --git a/src/response.rs b/src/response.rs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#![allow(unused)]`
`2`	`2`	`use std::hash::BuildHasher;`
`3`		`-`
	`3`	`+use jsonmap::{JsonMap, JsonV};`
`4`	`4`	`use super::{BizContenter, BizObject, V};`
`5`	`5`	`use serde::{Deserialize, Serialize};`
`6`	`6`
`@@ -15,6 +15,7 @@ impl BizContenter for TradeCreateBiz {`
`15`	`15`	`fn set(&mut self, key: &str, value: V) {`
`16`	`16`	`self.0.insert(key.to_string(), value.clone());`
`17`	`17`	`}`
	`18`	`+`
`18`	`19`	`}`
`19`	`20`	`// 以下是设置必选字段方法`
`20`	`21`	`impl TradeCreateBiz {`