lint

TeamVastsea · Mar 20, 2024 · d61fa3e · d61fa3e
1 parent f0d0835
commit d61fa3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/service/trade/mod.rs b/src/service/trade/mod.rs
@@ -16,7 +16,7 @@ lazy_static! {
         &WECHAT_PRIVATE,
         &CONFIG.wechat.serial,
         &CONFIG.wechat.key,
-        &"https://api.ituyou.cc/par/wechat".to_string()
+        &CONFIG.wechat.call_back_url,
     );
 }
 

diff --git a/src/service/trade/wechat/recall.rs b/src/service/trade/wechat/recall.rs
@@ -11,17 +11,15 @@ use crate::service::trade::{TradeStatus, WECHAT_PAY_CLIENT, WECHAT_PUBLIC};
 
 pub async fn wechat_pay_recall(header_map: HeaderMap, body: String) -> Json<WechatNoticeResponse> {
     let request: WechatPayNotify = serde_json::from_str(&body).unwrap();
-    
+
     //verify trade status
     let nonce = request.resource.nonce;
     let chiphertext = request.resource.ciphertext;
     let associated_data = request.resource.associated_data.unwrap_or_default();
     let result = WECHAT_PAY_CLIENT.decrypt_paydata(&chiphertext, &nonce, &associated_data).unwrap();
     let id = result.out_trade_no.clone();
     info!("Wechat pay recall: {result:?}");
-    let mut trade = Trade::find_by_id(id).one(&*crate::DATABASE).await.unwrap().unwrap().into_active_model();
 
-    let cert = WECHAT_PAY_CLIENT.certificates().await.unwrap();
     //verify signature
     if WECHAT_PAY_CLIENT.verify_signatrue(
         &WECHAT_PUBLIC,
@@ -35,7 +33,8 @@ pub async fn wechat_pay_recall(header_map: HeaderMap, body: String) -> Json<Wech
             message: "签名错误".to_string(),
         });
     }
-
+
+    let mut trade = Trade::find_by_id(id).one(&*crate::DATABASE).await.unwrap().unwrap().into_active_model();
     trade.status = Set(TradeStatus::Paid as i16);
     trade.pay_time = Set(Some(chrono::Local::now().naive_local()));
     trade.save(&*crate::DATABASE).await.unwrap();