From 0717611f4c0c70acb274cafc7db99a01d73965e6 Mon Sep 17 00:00:00 2001
From: vguanyiwgd <v-guanyiw.gd@chinatelecom.cn>
Date: Mon, 15 Apr 2024 17:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I426cdccc89bd2e05181d0ad341d942690c3e1594
---
 show/get.php | 44 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/show/get.php b/show/get.php
index fbe7aea..64e1674 100644
--- a/show/get.php
+++ b/show/get.php
@@ -243,7 +243,7 @@ if($act == 'applet_unifiedorder') {
   $data['body'] = '订餐系统-充值'.($total_fee/100)."元";
   $data['mch_id'] = $applet_mch_id;
   $data['nonce_str'] = $nonce_str;
-  $data['notify_url'] = "https://yzms.fsecity.com/show/wxpay_recv.php";
+  $data['notify_url'] = "https://yzms.fsecity.com/show/appletpay_recv.php";
   $data['out_trade_no'] = $code;
   $data['spbill_create_ip'] = $_SERVER['REMOTE_ADDR'];
   $data['total_fee'] = $total_fee;
@@ -274,18 +274,6 @@ if($act == 'applet_unifiedorder') {
     preg_match("/<prepay_id>(.+)<\/prepay_id>/i", $c, $m);
     if($m[1]) {
       $prepay_id = str_replace(array('<![CDATA[', ']]>'), '', $m[1]);
-
-//        $mweb_url = '';
-//        preg_match("/<mweb_url>(.+)<\/mweb_url>/i", $c, $m);
-//        if($m[1]) {
-//          $mweb_url = str_replace(array('<![CDATA[', ']]>'), '', $m[1]);
-//        }
-//
-//        $code_url = '';
-//        preg_match("/<code_url>(.+)<\/>/i", $c, $m);
-//        if($m[1]) {
-//          $code_url = str_replace(array('<![CDATA[', ']]>'), '', $m[1]);
-//        }
     }
   }
   if(!$prepay_id) {
@@ -293,27 +281,16 @@ if($act == 'applet_unifiedorder') {
   }
 
   //临时增加redirect_url
-//  $ua = $_SERVER['HTTP_USER_AGENT'];
-////    if(!stristr($ua, "android")) $mweb_url.= "&redirect_url=".urlencode($protocol.$host."/m/wx.html");
-//  $sql = "insert into tb_recharge_pay_weixin set code='{$code}', trade_type='{$trade_type}', uid={$uid}, prepay_id='{$prepay_id}', total_fee=".($total_fee/100).", time_expire='{$time_expire}', state=0, is_applet=1, addtime=now()";
-//  //echo $sql;
-//  $db->query($sql, 'SILENT');
-//  if($db->affected_rows() != 1) {
-//    echoRs(0, '下单失败！请重试2！');
-//  }
+  $ua = $_SERVER['HTTP_USER_AGENT'];
+  $sql = "insert into tb_recharge_pay_weixin set code='{$code}', trade_type='{$trade_type}', uid={$uid}, prepay_id='{$prepay_id}', total_fee=".($total_fee/100).", time_expire='{$time_expire}', state=0, is_applet=1, addtime=now()";
+  //echo $sql;
+  $db->query($sql, 'SILENT');
+  if($db->affected_rows() != 1) {
+    echoRs(0, '下单失败！请重试2！');
+  }
   $data = array();
-//  if($isjsapi) {
-//
-//    $return_url = "https://yzms.fsecity.com/m/recharge.html?code=".$code;
-//    $sign = md5($prepay_id."_".date("Y-m-d")."_vfj389umk9o3");
-//    $data['mweb_url'] = "https://dc.fsecity.com/show/wxpay/ft_pay.php?prepay_id=".urlencode($prepay_id)."&return_url=".urlencode($return_url)."&sign=".$sign;
-//  } else {
-//    $data['mweb_url'] = $mweb_url;
-//  }
   $data['code'] = $code;
-//  $data['prepay_id'] = $prepay_id;
-
-  $signData['appId'] = $applet_mch_id;
+  $signData['appId'] = $applet_appid;
   $signData['timeStamp'] = time();
   $signData['nonceStr'] = $nonce_str;
   $signData['package'] = "prepay_id=".$prepay_id;
@@ -325,8 +302,9 @@ if($act == 'applet_unifiedorder') {
     $s2 .= $key."=".$item;
   }
   $s2 .= "&key=".$applet_key;
-  $signData['paySign'] = md5($s2);
+  $signData['paySign'] = strtoupper(md5($s2));
 
+  unset($signData['appId']);
   $data['requestPayment'] = $signData;
   echoRs(1, 'ok', array('data' => $data));