cqpCow 1 year ago
parent
commit
3f4e67f3af
3 changed files with 4 additions and 12 deletions
  1. 1 0
      app/Service/PaymentReceiptService.php
  2. 3 3
      app/Service/Weixin/WeixinService.php
  3. 0 9
      routes/weixin.php

+ 1 - 0
app/Service/PaymentReceiptService.php

@@ -294,6 +294,7 @@ class PaymentReceiptService extends Service
                     'amount' => $value['amount'],
                     'total_amount' => $order[$value['data_order_no']] ?? 0,
                     'has_amount' => $infos_map[$value['data_order_no']] ?? 0,
+                    'receipt_amount' => $customer['state'] == PaymentReceipt::STATE_TWO ? $value['amount'] : 0
                 ];
                 $customer['amount_list'][] = $tmp;
             }

+ 3 - 3
app/Service/Weixin/WeixinService.php

@@ -7,12 +7,12 @@ use Illuminate\Support\Facades\Redis;
 
 class WeixinService extends Service
 {
-    const APPID = '';
-    const APPSECRET = '';
+    const APPID = 'wxe048bcdcc21aae6e';
+    const APPSECRET = '191789c5b4ef2b3d5b9e79bb62428092';
     const ACCESS_URL = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s';
     const OPENID = '';
     const TOKEN = '';
-    const KEY = 'weixin';
+    const KEY = 'weixintnine';
 
     public function getToken(){
         $token_key = self::KEY.'_'.'token';

+ 0 - 9
routes/weixin.php

@@ -21,14 +21,5 @@ Route::any('wxSetUser', 'Api\WeixinController@setUser');
 Route::any('wxLogin', 'Api\WeixinController@login');
 
 Route::group(['middleware'=> ['checkWeixin']],function ($route){
-    //菜单
-    $route->any('menuAdd', 'Api\WxSysMenuController@add');
-    $route->any('menuEdit', 'Api\WxSysMenuController@edit');
-    $route->any('menuDel', 'Api\WxSysMenuController@del');
-    $route->any('menuList', 'Api\WxSysMenuController@menuList');
-    $route->any('menuMove', 'Api\WxSysMenuController@menuMove');
 
-    //用户的工资
-    $route->any('departList', 'Api\WxSalaryCalController@departList');
-    $route->any('salaryCalDetail', 'Api\WxSalaryCalController@salaryCalDetail');
 });