Merge branch 'master' into huangfamily

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -250,6 +250,7 @@ class OrderMerchantRepository extends BaseRepository
                 //若商家返佣比例不存在 则使用平台配置
                 $base_commission = merchantConfig(0, 'extension_one_rate');
             }
+            if($params['mer_id'] == 3425) $base_commission = 0;
             $merchant_data = Db::name('merchant')->where('mer_id', $params['mer_id'])->find();
             $is_dacang = 0;
             $avaiable = 0;
@@ -1434,7 +1435,43 @@ class OrderMerchantRepository extends BaseRepository
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
         }
+        // 推荐人获得贡献值
+        if($pv >= 0.01){
+            $gongxian_data = [
+                "uid"           =>$top_data["spread_uid"],
+                "number"  =>    $pv,
+                "addtime"       =>time(),
+                "status"        =>1,
+                "order_type"    =>1,
+                "order_id"      =>$order_id,
+                "mark"          =>"推广扫码消费获得赠送贡献值",
+                "desc"          =>'',
+                "surplus"       =>$pv,
+                "type"          =>1,
+                'settlement_time' => date('Y-m-d H:i:s')
+            ];
+            Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+            Db::name('user')->where('uid', $top_data["spread_uid"])->inc('contribute',$pv)->update();
+        }
 
+        //推荐人获得积分
+        $jifen = bcmul($pv, $yonghu_tuijian, 2);
+        if($jifen >= 0.01){
+            $spread_data['uid'] = $top_data["spread_uid"];
+            $spread_data['continuity_day'] = 0;
+            $spread_data['reward_socre'] = $jifen;
+            $spread_data['signin_time'] = 0;
+            $spread_data['addtime'] = time();
+            $spread_data['status'] = 1;
+            $spread_data['mark'] = "推广扫码消费获得赠送积分";
+            $spread_data['source_type'] = 3;
+            $spread_data['order_id'] = $order_id;
+            $spread_data['pm'] = 1;
+            $spread_data['order_type'] = $order_id;
+            $spread_data['settlement_time'] = date('Y-m-d H:i:s');
+            Db::name('user_sign_score')->insertGetId($spread_data);
+            Db::name('user')->where('uid', $top_data["spread_uid"])->inc('score',$jifen)->update();
+        }
         //用户推荐人获得复购金佣金百分之10
         $tuijian_fugou = bcmul($tuijian_yongjin, $yonghu_fugou, 2);
         if ($tuijian_fugou >= 0.01) {

app/common/repositories/store/order/StoreOrderRepository.php

@@ -939,18 +939,33 @@ class StoreOrderRepository extends BaseRepository
 
 
                         } else if (!empty($array_fzone_paytype['type'] == 'b3')) {
-                            //精彩生活区 VR+京豆
+                            //精彩生活区 || 商贸区 VR+京豆
+
+//                            $groupOrder['er'] = 1;
+//                            $groupOrder['er1'] = "开发中升级中！";
+
+                            //vr+积分
+                            $vrpri = $userdatas['vr'] - $array_fzone_paytype['price'];
+                            $pricepri = $userdatas['jingdou'] - $array_fzone_paytype['other'];
 
 
-                            $groupOrder['er'] = 1;
-                            $groupOrder['er1'] = "开发中升级中！";
+                            //vr+京豆
+                            if ($vrpri >= 0 && $pricepri >= 0) {
+                                Db::name("user")->where("uid", $uid)->update(['vr' => $vrpri, 'jingdou' => $pricepri]);
+                                //修改订单状态
+                                Db::name("store_order")->where("order_id", $_order->order_id)->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s'), 'status' => 0, 'douhuomall' => 1, 'douhuomall_status' => 9]);
+                                Db::name("store_group_order")->where("group_order_id", $groupOrder->group_order_id)->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s')]);
+
+                                $paystage_status = 1;
+
+                            }
 
                         } else if (!empty($array_fzone_paytype['type'] == 'b4')) {
                             //精彩生活区 VR+京豆
 
 
-                            $groupOrder['er'] = 1;
-                            $groupOrder['er1'] = "开发中升级中！";
+//                            $groupOrder['er'] = 1;
+//                            $groupOrder['er1'] = "开发中升级中！";
 
                         } else if (!empty($array_fzone_paytype['type'] == 'b5')) {
                             //精彩生活 VR支付
@@ -1575,7 +1590,7 @@ class StoreOrderRepository extends BaseRepository
                             }
                         }
                         $order['product_id'] = $v['product_id'];
-//                        $this->gongFuDistribution($order, $order['product_id'], $v['product_attr_unique'], 0, $productType);
+                        $this->gongFuDistribution($order, $order['product_id'], $v['product_attr_unique'], 0, $productType);
 
                         if ($order['product_id'] == 15323) {
                             Db::name('activation_code')
@@ -2328,8 +2343,8 @@ class StoreOrderRepository extends BaseRepository
 
                         ['type' => 'b1', 'price' => $jcvr, 'other' => $jcjf, 'note' => "VR+积分"],
                         ['type' => 'b2', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
-                        // ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd,"note"=>"VR+京豆"],
-                        //['type'=>'b4','price'=>$jcvr1,'other'=>$jcjd,"note"=>"现金+京豆"],
+                        ['type' => 'b3', 'price' => $jcvr1, 'other' => $jcjd, "note" => "VR+京豆"],
+                        ['type' => 'b4', 'price' => $jcvr1, 'other' => $jcjd, "note" => "现金+京豆"],
                         ['type' => 'b5', 'price' => $orderpri, 'other' => 0, "note" => "VR"],
                         ['type' => 'b6', 'price' => $orderpri, 'other' => 0, "note" => "现金"],
 
@@ -2400,11 +2415,11 @@ class StoreOrderRepository extends BaseRepository
                             // ['type'=>'a2','price'=>100,'other'=>0,"note"=>"现金"],
                             // ['type'=>'a3','price'=>0,'other'=>0,"note"=>"现金+VR"],
 
-//                        ['type' => 'b1', 'price' => $jcvr, 'other' => $jcjf, 'note' => "VR+积分"],
+                            //                        ['type' => 'b1', 'price' => $jcvr, 'other' => $jcjf, 'note' => "VR+积分"],
                             ['type' => 'b2', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
-                            // ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd,"note"=>"VR+京豆"],
-//                            ['type' => 'b4', 'price' => $jcvr1, 'other' => $jcjd, "note" => "现金+京豆"],
-//                        ['type' => 'b5', 'price' => $orderpri, 'other' => 0, "note" => "VR"],
+//                            ['type' => 'b3', 'price' => $jcvr1, 'other' => $jcjd, "note" => "VR+京豆"],
+                            ['type' => 'b4', 'price' => $jcvr1, 'other' => $jcjd, "note" => "现金+京豆"],
+                            //                        ['type' => 'b5', 'price' => $orderpri, 'other' => 0, "note" => "VR"],
                             ['type' => 'b6', 'price' => $orderpri, 'other' => 0, "note" => "现金"],
 
                             // ['type'=>'c1','price'=>100,'other'=>0,'note'=>"复购金"],
@@ -3792,39 +3807,40 @@ class StoreOrderRepository extends BaseRepository
 
 
             //奖励推广佣金添加
-            $yongjinbili = 0;//奖励佣金比例
-            log::info("推荐人信息");
-            //普通用户
-            if ($sprerdUser["user_group"] == 1) {
-                $yongjinbili = 5;
-            }
-            //业务员
-            if ($sprerdUser["user_group"] == 2) {
-                $yongjinbili = 7;
-            }
-            //业务经理
-            if ($sprerdUser["user_group"] == 3) {
-                $yongjinbili = 9;
-            }
-            //初级合伙人
-            if ($sprerdUser["user_group"] == 4) {
-                $yongjinbili = 11;
-            }
-            //中级合伙人
-            if ($sprerdUser["user_group"] == 5) {
-                $yongjinbili = 13;
-            }
-            //高级合伙人
-            if ($sprerdUser["user_group"] == 6) {
-                $yongjinbili = 15;
-            }
-            //懂事
-            if ($sprerdUser["user_group"] == 7) {
-                $yongjinbili = 17;
-            }
+//            $yongjinbili = 0;//奖励佣金比例
+//            log::info("推荐人信息");
+//            //普通用户
+//            if ($sprerdUser["user_group"] == 1) {
+//                $yongjinbili = 5;
+//            }
+//            //业务员
+//            if ($sprerdUser["user_group"] == 2) {
+//                $yongjinbili = 7;
+//            }
+//            //业务经理
+//            if ($sprerdUser["user_group"] == 3) {
+//                $yongjinbili = 9;
+//            }
+//            //初级合伙人
+//            if ($sprerdUser["user_group"] == 4) {
+//                $yongjinbili = 11;
+//            }
+//            //中级合伙人
+//            if ($sprerdUser["user_group"] == 5) {
+//                $yongjinbili = 13;
+//            }
+//            //高级合伙人
+//            if ($sprerdUser["user_group"] == 6) {
+//                $yongjinbili = 15;
+//            }
+//            //懂事
+//            if ($sprerdUser["user_group"] == 7) {
+//                $yongjinbili = 17;
+//            }
+            $yongjinbili = static::getUserGroupRate($sprerdUser["user_group"]);
 
             //计算出佣金
-            $yongjin = $pvfee * $yongjinbili / 100;
+            $yongjin = $pvfee * $yongjinbili;
 
             // 佣金百分之90进入佣金池  佣金百分之10进入复购金
             $tuiguanyongjin = $this->roundOptimize($yongjin * 0.9, 2);
@@ -7441,10 +7457,10 @@ class StoreOrderRepository extends BaseRepository
         }
         Db::name('log')->insert(['data' => 'zhitui_money:' . $zhitui_money . ',spread_user_group:' . $spread_user_group]);
         if ($zhitui_money >= 0.01 && $spread_uid && $spread_user_group != 1) {
-            $mark = $user_nick_name . '购买商品';
-            $title = "直推奖" . date('m.d');
-            $commission_type = 3;
-            $this->add_bill_gongfu($title, $zhitui_money, $spread_uid, $mark, $commission_type, $order_sn, $order_id, $mer_id, 0, 0);
+//            $mark = $user_nick_name . '购买商品';
+//            $title = "直推奖" . date('m.d');
+//            $commission_type = 3;
+//            $this->add_bill_gongfu($title, $zhitui_money, $spread_uid, $mark, $commission_type, $order_sn, $order_id, $mer_id, 0, 0);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，直推奖低于0.01无法入库 特此记录！']);
         }
@@ -7455,9 +7471,9 @@ class StoreOrderRepository extends BaseRepository
         }
         //积分
         $userRepository = app()->make(UserRepository::class);
-        $userRepository->sign_add($uid, $yanglaojin_score, -1, '自购商品赠送积分', '', '', $order_id, 1, "store_order", 1);
-        if ($spread_uid && $spread_user_group != 1 && $product_id != 15323)
-            $userRepository->sign_add($spread_uid, $total_price, -1, $user_nick_name . '购买商品赠送积分', '', '', $order_id, 1, "store_order", 2);
+//        $userRepository->sign_add($uid, $yanglaojin_score, -1, '自购商品赠送积分', '', '', $order_id, 1, "store_order", 1);
+//        if ($spread_uid && $spread_user_group != 1 && $product_id != 15323)
+//            $userRepository->sign_add($spread_uid, $total_price, -1, $user_nick_name . '购买商品赠送积分', '', '', $order_id, 1, "store_order", 2);
 
         // 计算
         $mer_365_count = Db::name('store_order')
@@ -9491,7 +9507,7 @@ class StoreOrderRepository extends BaseRepository
 
                         Db::name('gzc_logs')->insert($ylj_data_log);
 
-                    } 
+                    }
                 }
 
             }
@@ -9817,7 +9833,7 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
 
-        } else {
+        } else if($store_order_data['mer_id'] != 496 && $store_order_data['mer_id'] != 439 && $store_order_data['mer_id'] != 491){
             // 商贸区
             /** @var \app\common\repositories\merchant\MerchantRepository $merchant */
             $merchant = app()->make(MerchantRepository::class);

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -200,7 +200,7 @@ class UserOfflineRechargeRepository extends BaseRepository
                     $order = (object)$order;
                     $userRepository = app()->make(UserRepository::class);
                     $user = $userRepository->getOne(['uid' => $unionUser->uid]);
-                    $userRepository->doBind($user, $order, $flag);
+                    $OrderMerchantRepository->doBind($user, $order, $flag);
 
                     OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->update(['uid' => $unionUser->uid, 'binds' => 1]);
                 }

app/controller/admin/system/merchant/GzcLogs.php

@@ -145,7 +145,7 @@ class GzcLogs extends BaseController
      */
     public function inGzcAll()
     { 
-        $ids = intval($this->request->param('ids'));
+        $ids = $this->request->param('ids');
         if(!$ids) return app('json')->fail('请选择需要入账的记录');
         $ids = explode(",", $ids);
         if(!count($ids)){

app/controller/api/Auth.php

@@ -1093,7 +1093,11 @@ class Auth extends BaseController
         $user->append(['service', 'user_group','total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);
         $userInfo = $user->toArray();
 
-        $data['mweb_info'] = $this->curl_java_login($userInfo['phone'])['data'];
+        $temp = $this->curl_java_login($userInfo['phone']);
+        $data['mweb_info'] = [];
+        if(isset($temp['data'])){
+            $data['mweb_info'] = $temp['data'];
+        }
         $data['merchant_info'] = [];
 
         return app('json')->success($data);

app/controller/api/Notify.php

@@ -247,8 +247,8 @@ class Notify
                                             $yj_amount_90 = bcmul($pv, 0.05,2) * 0.9;
                                             $fgj_amount_10 = bcmul($pv, 0.05,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
-                                            $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
-                                            $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
+//                                            $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
+//                                            $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
                                             $this->fugou_user_log($merchant_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1);
 
 
@@ -794,6 +794,40 @@ class Notify
                                     $note_arr = ["uid"=>$user_data['uid'],"msg"=>"数据异常","fzone_paytype"=>$store_order_data['fzone_paytype']];
                                     Db::name("test_log")->insert(['create_time'=>date('Y-m-d H:i:s'),'note'=>json_encode($note_arr, JSON_UNESCAPED_UNICODE)]);
                                 }
+                            } else if($array_fzone_paytype['type']=='b4'){
+                                if(!empty($array_fzone_paytype['other']) && is_numeric($array_fzone_paytype['other']) == true){
+                                    $jdpri = $user_data['jingdou'] -  $array_fzone_paytype['other'];
+
+                                    // 现金+京豆
+                                    if($jdpri  >= 0 ){
+                                        Db::name("user")->where("uid", $user_data['uid'])->update(['jingdou'=>$jdpri]);
+                                        //消费京豆日志
+                                        $log_data = [
+                                            "uid" => $user_data['uid'],
+                                            "reward_socre" => $array_fzone_paytype['other'],
+                                            "addtime" => time(),
+                                            "status" => 1,
+                                            "order_id" => $store_order_data['order_id'],
+                                            "mark" => "购买" . $wenan . "商品消费京豆",
+                                            "surplus" => $jdpri,
+                                            "pm" => 2,
+                                            "source_type" => 5
+                                        ];
+                                        Db::name("user_sign_score")->insert($log_data);
+                                    }else{
+                                        $note_arr = [
+                                            "uid"=>$user_data['uid'],
+                                            "dec_score"=>$array_fzone_paytype['other'],
+                                            "rem_score"=>$user_data['score'],
+                                            "msg"=>"京豆不足",
+                                            "fzone_paytype"=>$store_order_data['fzone_paytype']
+                                        ];
+                                        Db::name("test_log")->insert(['create_time'=>date('Y-m-d H:i:s'),'note'=>json_encode($note_arr, JSON_UNESCAPED_UNICODE)]);
+                                    }
+                                }else{
+                                    $note_arr = ["uid"=>$user_data['uid'],"msg"=>"数据异常","fzone_paytype"=>$store_order_data['fzone_paytype']];
+                                    Db::name("test_log")->insert(['create_time'=>date('Y-m-d H:i:s'),'note'=>json_encode($note_arr, JSON_UNESCAPED_UNICODE)]);
+                                }
                             }
                             //end 现金+积分
 
@@ -1554,12 +1588,12 @@ class Notify
             //     // }
 
                 // 检查是否包含“购买”
-                if (strpos($mark, "购买") !== false) {
-                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
-                    /** @var UserRepository $userRepository */
-                    $userRepository = app()->make(UserRepository::class);
-                    $userRepository->setUserIdentity($uid);
-                }
+//                if (strpos($mark, "购买") !== false) {
+//                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+//                    /** @var UserRepository $userRepository */
+//                    $userRepository = app()->make(UserRepository::class);
+//                    $userRepository->setUserIdentity($uid);
+//                }
 
                  
                

app/controller/api/merchant/sxy/Access.php

@@ -807,6 +807,26 @@ class Access
 
             }
 
+            //b4 现金+京豆支付
+            if($array_fzone_paytype['type'] == 'b4'){
+
+                $userdata = Db::name('user')->where('uid',$store_order_data['uid'])->find();
+                //查询用户的京豆是否足够
+                $jingdou_pri = $userdata['jingdou'] - $array_fzone_paytype['other'];
+                if($jingdou_pri < 0){
+                    return app('json')->fail('京豆不足，请重试!');
+                }
+
+                //如果京豆足够，修改订单的实际价格
+                $group_order_datas = Db::name('store_group_order')->where('group_order_id',$oid)->find();
+                if(!empty($group_order_datas)){
+                    Db::name('store_group_order')->where('group_order_id',$oid)->update(['pay_price'=>$array_fzone_paytype['price']]);
+                }else{
+                    return app('json')->fail('找不到订单，请重试!');
+                }
+
+            }
+
 
         }else{
             return app('json')->fail('数据异常，请重新下单,并选择支付方式!');

app/controller/api/store/merchant/Merchant.php

@@ -168,8 +168,11 @@ class Merchant extends BaseController
         if($params['pageSize']!=''){
             $limit=$params['pageSize'];
         }
-        $category_id = $params['category_id']?:32;
-        $mer_list = Db::name('merchant')->where(['category_id' => $category_id,'status' => 1,'is_del' => 0])->page($page)->limit($limit)->select();
+        $category_id = $params['category_id']?:0;
+        $where['is_del'] = 0;
+        $where['status'] = 1;
+        $category_id && $where['category_id'] = $category_id;
+        $mer_list = Db::name('merchant')->where($where)->page($page)->limit(100)->select();
         $where['is_gift_bag'] = 0;
         $where['is_used'] = 1;
         $where['product_type'] = 0;
@@ -182,6 +185,9 @@ class Merchant extends BaseController
                 $goods = $this->repository->productList($mer['mer_id'],$where, 1, 3,$this->userInfo,false,$is_commercetrade);
                 if(empty($goods['list'])) continue;
                 $mer['goods_list'] = $goods['list'];
+                if (mb_strlen($mer['mer_name']) > 8) {
+                    $mer['mer_name'] = mb_substr($mer['mer_name'], 0, 8) . '...';
+                }
                 $return_list[] = $mer;
             }
         }

app/controller/api/store/order/StoreOrder.php

@@ -487,15 +487,23 @@ class StoreOrder extends BaseController
 
             }else if(!empty($array_fzone_paytype['type'] == 'b3')){
                 //精彩生活区 VR+京豆
-
-
-                return app('json')->fail("开发中升级中！");
+                $vrpri = $userdatas['vr'] -  $array_fzone_paytype['price'];
+                $pricepri = $userdatas['jingdou'] -  $array_fzone_paytype['other'];
+                //vr+积分
+                if($vrpri < 0 || $pricepri < 0){
+                    return app('json')->fail("支付失败,VR或京豆不足!");
+                }
 
             }else if(!empty($array_fzone_paytype['type'] == 'b4')){
                 //精彩生活区 VR+京豆
+                $pricepri = $userdatas['jingdou'] -  $array_fzone_paytype['other'];
 
+                // //现金+积分
+                if($pricepri  < 0 ){
+                    return app('json')->fail("支付失败,京豆不足!");
+                }
 
-                return app('json')->fail("开发中升级中！");
+//                return app('json')->fail("开发中升级中！");
 
             }else if(!empty($array_fzone_paytype['type'] == 'b5')){
                 //精彩生活 VR支付

app/controller/api/store/product/Jt.php

@@ -153,13 +153,7 @@ class Jt extends BaseController
           'sortName' => 'brokerage',
           'sort' => 'desc',
         ];
-      
-        // 尝试从缓存获取数据
-        $cachedData = cache('jd_goods_list');
-        if ($cachedData) {
-          return $cachedData;
-        }
-      
+
         $response = self::curlPost($url, $params);
       
         if (isset($response['result']['total_count'])) {
@@ -169,8 +163,7 @@ class Jt extends BaseController
           // 处理错误或返回合适信息
           return 'Error: 无法获取总数量';
         }
-      
-        $allGoods = [];
+
         for ($i = 1; $i <= $totalPages; $i++) {
           $params['pageIndex'] = $i;
           $response = self::curlPost($url, $params);
@@ -178,17 +171,9 @@ class Jt extends BaseController
           if (!isset($response['result']['data']) || count($response['result']['data']) < 1) {
             break;
           }
-      
-          $allGoods = array_merge($allGoods, $response['result']['data']);
+            $this->formatGoodsList($response['result']['data']);
         }
-      
-        // 格式化并处理商品列表
-        $formattedGoods = $this->formatGoodsList($allGoods);
-      
-        // 缓存数据 (根据需求调整过期时间)
-        cache('jd_goods_list', $formattedGoods, 3600);
-      
-        return $formattedGoods;
+        return '执行结束';
       }
 
 

app/controller/api/store/product/Other.php

@@ -383,7 +383,6 @@ class Other extends BaseController
             list($startTime, $endTime) = explode("-", $date);
         }
 
-
         $userId = $this->uid;
         [$page, $limit] = $this->getPage();
         //1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么
@@ -396,7 +395,8 @@ class Other extends BaseController
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                         $pdd_list = Db::name("order_pdd")
                             ->where("order_sn",$value['order_sn'])
@@ -419,8 +419,8 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
+                $list = array_values($list);
                 break;
             case 2://唯品会(没有商品价格)
                 $list = Db::name('user_bill')
@@ -430,7 +430,8 @@ class Other extends BaseController
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                         $vip_list = Db::name("order_vip")
                             ->where("order_sn",$value['order_sn'])
@@ -453,7 +454,6 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 3://苏宁订单列表
@@ -487,7 +487,6 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 5://淘宝客
@@ -529,7 +528,6 @@ class Other extends BaseController
                             $value['goods_img'] = "http:".$value['goods_img'];
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 6://京东订单
@@ -540,7 +538,8 @@ class Other extends BaseController
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                         $jd_list = Db::name("order_jd")
                             ->where("order_sn",$value['order_sn'])
@@ -565,7 +564,6 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 9: //抖音
@@ -576,7 +574,8 @@ class Other extends BaseController
                     ->where('pay_success_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('pay_success_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                         $dy_list = Db::name("order_dy")
                             ->where("order_sn",$value['order_sn'])
@@ -601,7 +600,6 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 10: //话费
@@ -612,7 +610,8 @@ class Other extends BaseController
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                     $huafei_list = Db::name("order_huafei")
                         ->where("order_sn",$value['order_sn'])
@@ -638,7 +637,6 @@ class Other extends BaseController
                     }
                     $value['yanglao'] = $yanglao;
                 }
-                $list = array_values($list);
                 break;
             default:
                 $list = [];

app/controller/api/store/product/StoreProduct.php

@@ -327,23 +327,14 @@ class StoreProduct extends BaseController
         $url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" . $access_token;
 //        $data['scene'] = 'spread=' . $uid . '&goods_id=' . $pid;
         $data['scene'] = 'id=' . $pid . '&shareID=' . $share_id;
-        $data['page'] = 'pages/store/product/detail';
+        $data['page'] = 'subPages/pages/store/product/detail';
 
         $domain = $this->request->domain();
-        if(strpos($domain, 'test.hebeiyhc.com') !== false) {
+        if(strpos($domain, 'testapi.hxxfb.com') !== false) {
             // 域名中包含 "test.hebeiyhc.com'" 字符串
             $data['env_version'] = 'trial';
         }
         $res = $user->posturl($url, $data);
-        if(isset(json_decode($res,true)['errcode']) && json_decode($res,true)['errcode']=='40001'){
-            Cache::delete('wx9082e5ac2fdb513f1_mp_access_token');
-            $access_token = $this->get_mp_access_token();
-            $url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" . $access_token;
-            $data['scene'] = 'id=' . $pid . '&shareID=' . $share_id;
-            $data['page'] = 'pages/store/product/detail';
-            $res = $user->posturl($url, $data);
-        }
-
         //判断是否是 json格式
         if (is_null(json_decode($res))) {
             $new_file = (int)(microtime(true) * 1000);

app/controller/api/store/product/TaoKe.php

@@ -143,13 +143,13 @@ class TaoKe extends BaseController
             'with_coupon' => true,
             'sort_type'=>6
         ];
+
         if($keyword && $token){
             $service = new JwtTokenService();
             $payload = $service->decode($token);
             $uid =$payload->jti[0];
             $this->generateAd($uid);
             $thirdInfo = $this->userThird->getDetail(['uid' => $uid, 'type' => 1]);
-
             $customParameters = json_encode(['uid' => (string)$uid]);
             $auth=$this->isAuthBind($thirdInfo['pid'],$customParameters);
             if($auth==1){
@@ -158,18 +158,21 @@ class TaoKe extends BaseController
                 $params['pid']=$thirdInfo['pid'];
                 $params['custom_parameters']=$customParameters;
             }else{
-                $apiName = 'pdd.ddk.rp.prom.url.generate';
-                $params = [
-                    'channel_type' => 10,
-                    'custom_parameters' => $customParameters,
-                    'p_id_list' => json_encode([$thirdInfo['pid']]),
-                    'generate_we_app' => 'true'
-                ];
-                $response = $this->getUrlResult($apiName, $params);
-//                $data['pdd_mobile_url']=$response['rp_promotion_url_generate_response']['url_list'][0]['mobile_url'];
-                $data=$response['rp_promotion_url_generate_response']['url_list'][0];
-                return app('json')->success(json_encode($data), []);
-//                var_dump($response);die;
+//                $apiName = 'pdd.ddk.rp.prom.url.generate';
+//                $params = [
+//                    'channel_type' => 10,
+//                    'custom_parameters' => $customParameters,
+//                    'p_id_list' => json_encode([$thirdInfo['pid']]),
+//                    'generate_we_app' => 'true'
+//                ];
+//                $response = $this->getUrlResult($apiName, $params);
+////                $data['pdd_mobile_url']=$response['rp_promotion_url_generate_response']['url_list'][0]['mobile_url'];
+//                $data=$response['rp_promotion_url_generate_response']['url_list'][0];
+//                return app('json')->success($data);
+////                var_dump($response);die;
+                $params['pid']='42283665_303898619';
+                $params['keyword']=$keyword;
+                $params['custom_parameters']= '{"uid":"17"}';
             }
         }
         if($keyword && !isset($params['pid'])){

app/controller/api/store/service/Huafei.php

@@ -95,11 +95,11 @@ class Huafei extends BaseController
 					Db::name('log')->insert(['data'=>'话费充值汇付支付撤销返回结果：'.json_encode($hf_refund_res)]);
 
 					//把赠送出去的养老金 积分 贡献值 复购金 改为已失效
-					Db::name('user_bill')->where('order_sn', $huafeiInfo['order_sn'])->update(['status'=> -1]);
-					Db::name('user_sign_score')->where('order_id', $huafeiInfo['order_sn'])->update(['status'=> 0]);
-					Db::name('user_sign_gongxian')->where('order_id', $huafeiInfo['order_sn'])->update(['status'=> 0]);
-					Db::name('user_sign_fugou')->where('order_id', $huafeiInfo['order_sn'])->update(['status'=> 0]);
-					Db::name('user_sign_hongbao')->where('order_id', $huafeiInfo['order_sn'])->update(['status'=> 0]);
+					Db::name('user_bill')->where('link_id', $order_data['order_id'])->update(['status'=> -1]);
+					Db::name('user_sign_score')->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
+					Db::name('user_sign_gongxian')->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
+					Db::name('user_sign_fugou')->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
+					Db::name('user_sign_hongbao')->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
 				}
 	
 				echo 'success';
@@ -208,6 +208,7 @@ class Huafei extends BaseController
 			'order_huafei');
 		//预估积分&贡献值
 		$orderThird->yuguJifen(
+            $order_id,
 			$commissionMoney,
 			$uid,
 			$order_sn,

extend/alipay/aop/cert/alipayCertPublicKey_RSA2_2021003138690179.crt

@@ -0,0 +1,43 @@
+-----BEGIN CERTIFICATE-----
+MIIDsjCCApqgAwIBAgIQICISIA09Ta0GjN+XMwoLtDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
+YXNzIDIgUjEwHhcNMjIxMjIwMDIwMTA0WhcNMjcxMjE5MDIwMTA0WjCBkjELMAkGA1UEBhMCQ04x
+LTArBgNVBAoMJOWMl+S6rOWkqeWcsOWNmueIseenkeaKgOaciemZkOWFrOWPuDEPMA0GA1UECwwG
+QWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWP
+uC0yMDg4OTMxNTQ2Mjg0NDgyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArHwMZtNY
+BkK5q2jQ0Ml18H8MhQX9Bpuz/ignvuJC47K7LHY+F6/U/+o/nYeDhqHzUajMAAyM06N3r2qBnWQR
+jC4JKFMO4i5xIDVycuumzcsWz3LwAkHOFG/S1pGXFWh74zdQDNednhvnNOiTDwjefZRnf5HUqEZK
+/7tRSaZvzSUIAwHG2zj0C6AYkhg5wr6ZJxgRDjPjqbs6ZMqLT+pITsnCcc6IgIisZbPTdtw1U2FK
+mQm5n228drI3XKYbE3UVT2y6R0mZNmqmiHDszmYSKOjDrpgtMExWpee8kUFn7J800HIyYtq0nRv1
+ypdWngUZtkm+szVWOTDGgN4eHQW3FwIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcN
+AQELBQADggEBABWKT9u96l0vRXJ1xRQj9H2/JJtELNzRCvjiwgFGW7N2uuVmObrTKl2LfOjl5Tah
+0mJMHSjFwwgOO9SDue40xru9DrshzNe4QIJE4zidZVekNbRm/LOHW3RJhxzmOBDbwSaZefH5qMmd
+oFHp6L92gI32vlwpN0Fycm0AYEJ8iSeEuwBwv3pIU3/03DsbFxHDjIjXOCkU/ZhhQk7BJ0B0DhqC
+2qFGIaaWSK5CPEvTh47Gf8VxaSCfVZMs7V/GceOObwq/k2SNl8Cnn8VmFAnCxWVq5ymC7WRoEXkO
+ChPAthAnx83opRQtoXKRBSUsup1VjBuunLPh4aEEYQ1mJtVoDeM=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU
+BgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEw
+LwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMy
+MjE0MzQxNVoXDTM3MTEyNjE0MzQxNVowgYIxCzAJBgNVBAYTAkNOMRYwFAYDVQQKDA1BbnQgRmlu
+YW5jaWFsMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE5MDcGA1UEAwwwQW50IEZp
+bmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDbGFzcyAyIFIxMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAsLMfYaoRoPRbmDcAfXPCmKf43pWRN5yTXa/KJWO0l+mrgQvs89bA
+NEvbDUxlkGwycwtwi5DgBuBgVhLliXu+R9CYgr2dXs8D8Hx/gsggDcyGPLmVrDOnL+dyeauheARZ
+fA3du60fwEwwbGcVIpIxPa/4n3IS/ElxQa6DNgqxh8J9Xwh7qMGl0JK9+bALuxf7B541Gr4p0WEN
+G8fhgjBV4w4ut9eQLOoa1eddOUSZcy46Z7allwowwgt7b5VFfx/P1iKJ3LzBMgkCK7GZ2kiLrL7R
+iqV+h482J7hkJD+ardoc6LnrHO/hIZymDxok+VH9fVeUdQa29IZKrIDVj65THQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBRfdLQEwE8HWurlsdsio4dBspzhATAdBgNVHQ4EFgQUSqHkYINtUSAtDPnS8Xoy
+oP9p7qEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB
+AIQ8TzFy4bVIVb8+WhHKCkKNPcJe2EZuIcqvRoi727lZTJOfYy/JzLtckyZYfEI8J0lasZ29wkTt
+a1IjSo+a6XdhudU4ONVBrL70U8Kzntplw/6TBNbLFpp7taRALjUgbCOk4EoBMbeCL0GiYYsTS0mw
+7xdySzmGQku4GTyqutIGPQwKxSj9iSFw1FCZqr4VP4tyXzMUgc52SzagA6i7AyLedd3tbS6lnR5B
+L+W9Kx9hwT8L7WANAxQzv/jGldeuSLN8bsTxlOYlsdjmIGu/C9OWblPYGpjQQIRyvs4Cc/mNhrh+
+14EQgwuemIIFDLOgcD+iISoN8CqegelNcJndFw1PDN6LkVoiHz9p7jzsge8RKay/QW6C03KNDpWZ
+EUCgCUdfHfo8xKeR+LL1cfn24HKJmZt8L/aeRZwZ1jwePXFRVtiXELvgJuM/tJDIFj2KD337iV64
+fWcKQ/ydDVGqfDZAdcU4hQdsrPWENwPTQPfVPq2NNLMyIH9+WKx9Ed6/WzeZmIy5ZWpX1TtTolo6
+OJXQFeItMAjHxW/ZSZTok5IS3FuRhExturaInnzjYpx50a6kS34c5+c8hYq7sAtZ/CNLZmBnBCFD
+aMQqT8xFZJ5uolUaSeXxg7JFY1QsYp5RKvj4SjFwCGKJ2+hPPe9UyyltxOidNtxjaknOCeBHytOr
+-----END CERTIFICATE-----

extend/alipay/aop/cert/alipayRootCert_2021003138690179.crt

@@ -0,0 +1,88 @@
+-----BEGIN CERTIFICATE-----
+MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG
+EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw
+MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO
+UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE
+MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT
+V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti
+W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ
+MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b
+53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI
+pDoiVhsLwg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
+BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0
+MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV
+BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j
+aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk
+rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2
+xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp
+dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6
+vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl
+YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1
+Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H
+DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98
+SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG
+PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe
+9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC
+AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90
+tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy
+nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf
+tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq
+JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3
+IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW
+05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41
+T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI
+kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop
+PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N
+1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y
+jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02
+77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi
+kT9qhqn+lw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG
+EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0
+WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE
+CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp
+YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU
+WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt
+rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ
+4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2
+zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg
+wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH
+Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF
+BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM
+E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg
+MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq
+MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp
+bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv
+b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV
+nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5
+4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg
+wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw
+WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN
+z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g
+KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA
+uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp
+emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3
+U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I
+UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn
+DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU
+1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX
+Yf4Zr0fJsGuv
+-----END CERTIFICATE-----

extend/alipay/aop/cert/appCertPublicKey_2021003138690179.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEsTCCA5mgAwIBAgIQICIHJ1//pqIuT5xJxAzrVDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
+YXNzIDEgUjEwHhcNMjIwNzI3MDgwMTQ3WhcNMjcwNzI2MDgwMTQ3WjB5MQswCQYDVQQGEwJDTjEt
+MCsGA1UECgwk5YyX5Lqs5aSp5Zyw5Y2a54ix56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQLDAZB
+bGlwYXkxKjAoBgNVBAMMITIwODg5MzE1NDYyODQ0ODItMjAyMTAwMzEzODY5MDE3OTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAInOt7v3ZFCzt2oj8zRbEZrlTqLTi5SCxx+wXHWErkNh
+T3GtPnDEvuLG63DFB7Ri2m3YIvB6uUazz6z0559jl4NPjIGqUz/DKkQqTEL6cLiBTgrk9EhBoiTc
+euqztT8V7eDVdVjtsmlGhgRan4RafqZ4lJDnc/Ao9SmbsSOgrKOmsDD5ST7ZTv3spH/kA0jJEQuw
+JkMfBAYb7OzhayYnmu+kBGtMVs/EqeWnejMGo/cn83k9WvznfB/vYbYuDwfkk52dl8qZb5DsN6j0
+SeBnnXH0ochEBv7dLXM11F8IKVRfAUrhFUyue4axY9xzr+jxC2682P18AQL8rzY2AzHdnssCAwEA
+AaOCASkwggElMB8GA1UdIwQYMBaAFHEH4gRhFuTl8mXrMQ/J4PQ8mtWRMB0GA1UdDgQWBBRERJMl
+oAo7/9Ir+k6d2IziXvdKFzBABgNVHSAEOTA3MDUGB2CBHAFuAQEwKjAoBggrBgEFBQcCARYcaHR0
+cDovL2NhLmFsaXBheS5jb20vY3BzLnBkZjAOBgNVHQ8BAf8EBAMCBsAwLwYDVR0fBCgwJjAkoCKg
+IIYeaHR0cDovL2NhLmFsaXBheS5jb20vY3JsNjcuY3JsMGAGCCsGAQUFBwEBBFQwUjAoBggrBgEF
+BQcwAoYcaHR0cDovL2NhLmFsaXBheS5jb20vY2E2LmNlcjAmBggrBgEFBQcwAYYaaHR0cDovL2Nh
+LmFsaXBheS5jb206ODM0MC8wDQYJKoZIhvcNAQELBQADggEBAFzXnMFC/VveEoStYNhg2m2utKRH
+JRCnkXPuAQHpZb2o69Cl0fT02z5FWZPQUSycBADQEnasZ7f46hjZ3oz8Lz/ZEFqb24ngk6uJP/KX
+pQMUHCZWZJ3qsglsWr87mlZk7XbzTbEVocFj6wSt+iE8kwgxSUIWJB+srLqglmAK5Lh1IXbRuWlt
+Lyo56K0hYe9HqEjpPIepSLAsQVF6aZA1Zie1kLErwHmRRjiy2PnXpFpncR6Nqv7yQjG8qPAGpZFg
+axttsJD/FKg/sEJi54iSd4aJ3r8J5Ialphu5NXNAbtxOekmeUwQFv8MidvxFnhD3QI5h30F3dXca
+mgFvqZa1e1Q=
+-----END CERTIFICATE-----

route/api.php

@@ -276,6 +276,8 @@ Route::group('api/', function () {
             Route::post('getAccount', 'User/getAccount');
             //更新绑定微信支付宝账号
             Route::post('updateAccount', 'User/updateAccount');
+            //解绑微信支付宝账号
+            Route::post('unbindAccount', 'User/unbindAccount');
 
             Route::get('doUpgrade', 'Volunteer/doUpgrade');