新增小程序美美号源

application/admin/controller/MobileOrder.php

@@ -85,7 +85,7 @@ class MobileOrder extends Backend
                 ->with(['info','operation','operation.admin','admin','admin.admin'])
                 ->where($where)
                 ->where($map)
-                ->where(['type'=>1,'platform_source'=>['in','美美靓号,旺卡']])
+                ->where(['type'=>1,'platform_source'=>['in','美美靓号,旺卡','美美号源']])
                 ->where(function($q) {
                     //供应商
                     if($this->proxy){

application/api/controller/User.php

@@ -21,6 +21,7 @@ use think\Db;
 use think\Log;
 use think\Validate;
 use app\common\model\User as UserModel;
+use app\service\byte_dance\ByteDance;
 
 /**
  * 会员接口
@@ -248,7 +249,7 @@ class User extends Api
      * @ApiParams (name=encryptedData,description=encryptedData)
      * @ApiParams (name=iv,description=iv)
      */
-    public function dy_login(){
+    public function dy_login_bak(){
         $data=$this->_validate([
             'code'=>['require'],
             'encryptedData'=>['require'],
@@ -278,6 +279,95 @@ class User extends Api
         Db::commit();
         $this->success(__('Logged in successful'), $data);
     }
+    
+    /**
+     * 抖音小程序登陆
+     * @ApiParams (name=code,description=code)
+     * @ApiParams (name=encryptedData,description=encryptedData)
+     * @ApiParams (name=iv,description=iv)
+     */
+    public function dy_login(){
+        $data=$this->_validate([
+            'code'=>['require'],
+            'encryptedData'=>['require'],
+            'iv'=>['require'],
+        ]);
+        $appid = $this->request->get('appid');
+        $code2Session = new ByteDanceCode2Session();
+        $byteDanceDecrypt = new ByteDanceDecrypt();
+        if($appid == ByteDance::appIdTwo()){
+            $info = $code2Session->setCodeTwo($data['code'])->getTwo();
+                                                        // echo 123;
+        // exit();
+            $byteDanceDecrypt->setEncryptedData($data['encryptedData']);
+
+            $byteDanceDecrypt->setIv($data['iv']);
+            $byteDanceDecrypt->setSessionKey($info['session_key']);
+            $mobileInfo = $byteDanceDecrypt->get();
+
+            Db::startTrans();
+            $user = UserModel::where('openid', $info['openid'])->find();
+            if ($user) {
+                $this->auth->direct($user['id']);
+            } else {
+                $this->auth->register(session_create_id(), '', null, $mobileInfo['phoneNumber'] ?? null, [
+                    'openid' => $info['openid'],
+                    'unionid' => $info['unionid'],
+                    'avatar' => $mobileInfo['avatarUrl'],
+                    'nickname' => $mobileInfo['nickName'],
+                ]);
+            }
+            Db::commit();
+            $data = ['userinfo' => $this->auth->getUserinfo()];
+            $this->success(__('Logged in successful'), $data);
+        } else if ($appid == ByteDance::appIdThree()){
+            $info = $code2Session->setCodeThree($data['code'])->getThree();
+                                                        // echo 123;
+        // exit();
+            $byteDanceDecrypt->setEncryptedData($data['encryptedData']);
+
+            $byteDanceDecrypt->setIv($data['iv']);
+            $byteDanceDecrypt->setSessionKey($info['session_key']);
+            $mobileInfo = $byteDanceDecrypt->get();
+
+            Db::startTrans();
+            $user = UserModel::where('openid', $info['openid'])->find();
+            if ($user) {
+                $this->auth->direct($user['id']);
+            } else {
+                $this->auth->register(session_create_id(), '', null, $mobileInfo['phoneNumber'] ?? null, [
+                    'openid' => $info['openid'],
+                    'unionid' => $info['unionid'],
+                    'avatar' => $mobileInfo['avatarUrl'],
+                    'nickname' => $mobileInfo['nickName'],
+                ]);
+            }
+            Db::commit();
+            $data = ['userinfo' => $this->auth->getUserinfo()];
+            $this->success(__('Logged in successful'), $data);
+        } else {
+            $info = $code2Session->setCode($data['code'])->get();
+            $byteDanceDecrypt->setEncryptedData($data['encryptedData']);
+            $byteDanceDecrypt->setIv($data['iv']);
+            $byteDanceDecrypt->setSessionKey($info['session_key']);
+            $mobileInfo = $byteDanceDecrypt->get();
+            Db::startTrans();
+            $user = UserModel::where('openid', $info['openid'])->find();
+            if ($user) {
+                $this->auth->direct($user['id']);
+            } else {
+                $this->auth->register(session_create_id(), '', null, $mobileInfo['phoneNumber'] ?? null, [
+                    'openid' => $info['openid'],
+                    'unionid' => $info['unionid'],
+                    'avatar' => $mobileInfo['avatarUrl'],
+                    'nickname' => $mobileInfo['nickName'],
+                ]);
+            }
+            $data = ['userinfo' => $this->auth->getUserinfo()];
+            Db::commit();
+            $this->success(__('Logged in successful'), $data);
+        }
+    }
 
     /**
      * 抖音小程序登陆

application/index/controller/Payment.php

@@ -224,6 +224,26 @@ class Payment extends Frontend
         $info['err_tips']='fail';
         return json($info);
     }
+    public function notify_dy_three($order_no){
+        $info=[
+            'err_no'=>0,
+            'err_tips'=>'success',
+        ];
+        $postData=input();
+        user_log('dyPayNotify',$postData);
+        $payed=(new ByteDanceQueryOrder())->setOrderNo($postData['order_no'])->getHaoYuan();
+        if(!$payed){
+            $info['err_no']=1;
+            $info['err_tips']='not pay';
+            return json($info);
+        }
+        if($this->paySucc($order_no,json_decode(html_entity_decode(html_entity_decode($postData['msg'])),true),'dy')){
+            return json($info);
+        }
+        $info['err_no']=2;
+        $info['err_tips']='fail';
+        return json($info);
+    }
     public function settle_dy($no){
         $data=input();
         $payment=\app\common\model\Payment::where('settle_no',$no)->find();

application/service/byte_dance/ByteDance.php

@@ -30,6 +30,12 @@ class ByteDance{
     public static function appSecretTwo(){
         return config('site.byte_dance _mapp_two_appSecret');
     }
+    public static function appIdThree(){
+        return config('site.byte_dance_mapp_three_appId');
+    }
+    public static function appSecretThree(){
+        return config('site.byte_dance_mapp_three_secret');
+    }
     public static function httpGet($url){
         $request=(new Client)
             ->get($url);
@@ -92,4 +98,22 @@ class ByteDance{
         sort($rList, 2);
         return md5(implode('&', $rList));
     }
+    public static function signHaoYuan($map) {
+        $rList = array();
+        foreach($map as $k =>$v) {
+            if ($k == "other_settle_params" || $k == "app_id" || $k == "sign" || $k == "thirdparty_id")
+                continue;
+            $value = trim(strval($v));
+            $len = strlen($value);
+            if ($len > 1 && substr($value, 0,1)=="\"" && substr($value,$len, $len-1)=="\"")
+                $value = substr($value,1, $len-1);
+            $value = trim($value);
+            if ($value == "" || $value == "null")
+                continue;
+            array_push($rList, $value);
+        }
+        array_push($rList, config('site.byte_dance_mapp_three_pay_salt'));
+        sort($rList, 2);
+        return md5(implode('&', $rList));
+    }
 }

application/service/byte_dance/ByteDanceAccessToken.php

@@ -35,6 +35,20 @@ class ByteDanceAccessToken implements ByteDanceInterface {
         }
         return $token;
     }
+    public function getHaoYuan()
+    {
+        $token=Cache::get($this->cacheName);
+        if(!$token){
+            $request=ByteDance::httpPost('https://developer.toutiao.com/api/apps/v2/token',[
+                'appid'=>ByteDance::appIdThree(),
+                'secret'=>ByteDance::appSecretThree(),
+                'grant_type'=>'client_credential',
+            ]);
+            $token=$request['access_token'];
+            Cache::set($this->cacheName,$token,$request['expires_in']-10);
+        }
+        return $token;
+    }
 
 
     /**

application/service/byte_dance/ByteDanceCode2Session.php

@@ -41,4 +41,23 @@ class ByteDanceCode2Session implements ByteDanceInterface {
             'code'=>$this->code,
         ];
     }
+    
+    //新新小程序
+    public function setCodeThree($code)
+    {
+        $this->code = $code;
+        return $this;
+    }
+    public function getThree()
+    {
+        return ByteDance::httpPost('https://developer.toutiao.com/api/apps/v2/jscode2session',$this->paramsThree());
+    }
+
+    protected function paramsThree(){
+        return [
+            'appid'=>ByteDance::appIdThree(),
+            'secret'=>ByteDance::appSecretThree(),
+            'code'=>$this->code,
+        ];
+    }
 }

application/service/byte_dance/ByteDanceOrderPush.php

@@ -129,6 +129,54 @@ class ByteDanceOrderPush implements ByteDanceInterface {
             ]);
         }
     }
+    public function getHaoYuan()
+    {
+        $openid=$this->getOpenid();
+        if(!$openid){
+            return false;
+        }
+        if(!$this->payment){
+            return false;
+        }
+        $params=[
+            'access_token'=>(new ByteDanceAccessToken())->getHaoYuan(),
+            'app_name'=>'douyin',
+            'open_id'=>$openid,
+            'order_detail'=>json_encode([
+                'order_id'=>$this->payment['order_no'],
+                'create_time'=>$this->order['create_time']*1000,
+                'status'=>$this->order->getOrderStatusText(),
+                'amount'=>1,
+                'total_price'=>$this->order['amount']*100,
+                //'detail_url'=>"pages/payment/payment?id={$this->order->id}",
+                'detail_url'=>"pages/index/index",
+                'item_list'=>[
+                    [
+                        'item_code'=>(string)$this->order['mobile_id'],
+                        'img'=>$this->getImg(),
+                        'title'=>$this->getTitle(),
+                        'price'=>$this->order['amount']*100,
+                    ]
+                ]
+            ],256),
+            'order_status'=>$this->getOrderStatus(),
+            'order_type'=>0,
+            'update_time'=>time()*1000,
+        ];
+        try {
+            $data=ByteDance::httpPost('https://developer.toutiao.com/api/apps/order/v2/push',$params,[],false);
+            if($data['err_code']!=0){
+                unset($params['access_token']);
+                throw_user($data['err_msg'],$params);
+            }
+        }catch (\Exception $e){
+            user_log('ByteDanceOrderPush',[
+                'e'=>$e->getMessage(),
+                'file'=>$e->getFile(),
+                'line'=>$e->getLine(),
+            ]);
+        }
+    }
     protected function getOpenid(){
         $user_id=$this->order['user_id'];
         if($user_id){

application/service/byte_dance/ByteDancePay.php

@@ -55,6 +55,24 @@ class ByteDancePay implements ByteDanceInterface {
         return $class;
     }
 
+    /**
+     * @param mixed $order_no
+     * @param $amount
+     * @param $subject
+     * @return ByteDancePay
+     */
+    public static function setInfo3($order_no,$amount,$subject)
+    {
+        $class=new self;
+        $class->data['app_id']=ByteDance::appIdThree();
+        $class->data['out_order_no'] = $order_no;
+        $class->data['total_amount'] = $amount*100;
+        $class->data['subject'] = $subject;
+        $class->data['body'] = $subject;
+        $class->data['notify_url']=request()->domain().'/index/payment/notify_dy_three/order_no/'.$order_no;
+        return $class;
+    }
+
     public function get()
     {
         $data=$this->data;
@@ -77,6 +95,17 @@ class ByteDancePay implements ByteDanceInterface {
         }
         return $obj;
     }
+    public function getHaoYuan()
+    {
+        $data=$this->data;
+        $data['sign']=ByteDance::signHaoYuan($data);
+        $order=ByteDance::httpPost('https://developer.toutiao.com/api/apps/ecpay/v1/create_order',$data);
+        $obj=ByteDanceResult::make();
+        foreach ($order as $key=>$item){
+            $obj->offsetSet($key,$item);
+        }
+        return $obj;
+    }
 }
 /**
  * @property string $order_id

application/service/byte_dance/ByteDanceQueryOrder.php

@@ -34,4 +34,15 @@ class ByteDanceQueryOrder implements ByteDanceInterface {
         user_log('dyQueryOrderPayed',['orderNo'=>$this->orderNo,'data'=>$data]);
         return $data['err_no']===0;
     }
+    public function getHaoYuan()
+    {
+        $params=[
+            'app_id'=>ByteDance::appIdThree(),
+            'out_order_no'=>$this->orderNo,
+        ];
+        $params['sign']=ByteDance::signHaoYuan($params);
+        $data=ByteDance::httpPost('https://developer.toutiao.com/api/apps/ecpay/v1/query_order',$params,[],false);
+        user_log('dyQueryOrderPayed',['orderNo'=>$this->orderNo,'data'=>$data]);
+        return $data['err_no']===0;
+    }
 }

application/service/byte_dance/ByteDanceQueryRefund.php

@@ -17,12 +17,20 @@ class ByteDanceQueryRefund implements ByteDanceInterface {
     }
     public function get()
     {
-        if(MobileOrder::where('refund_no',$this->orderNo)->value('platform_source')=='旺卡'){
+        $platformSource = MobileOrder::where('refund_no',$this->orderNo)->value('platform_source');
+
+        if($platformSource=='旺卡'){
             $params=[
                 'app_id'=>ByteDance::appIdTwo(),
                 'out_refund_no'=>$this->orderNo,
             ];
             $params['sign']=ByteDance::signWangKa($params);
+        } else if ($platformSource=='美美号源') {
+            $params=[
+                'app_id'=>ByteDance::appIdThree(),
+                'out_refund_no'=>$this->orderNo,
+            ];
+            $params['sign']=ByteDance::signHaoYuan($params);
         }else{
             $params=[
                 'app_id'=>ByteDance::appId(),

application/service/byte_dance/ByteDanceRefund.php

@@ -38,7 +38,8 @@ class ByteDanceRefund implements ByteDanceInterface {
     public function get()
     {
         $refundNo=$this->payment['refund_no'];
-        if(MobileOrder::where('refund_no',$refundNo)->value('platform_source')=='旺卡') {
+        $platformSource = MobileOrder::where('refund_no',$refundNo)->value('platform_source');
+        if($platformSource=='旺卡') {
             $data = [
                 'app_id' => ByteDance::appIdTwo(),
                 'out_order_no' => $this->payment['order_no'],
@@ -48,6 +49,16 @@ class ByteDanceRefund implements ByteDanceInterface {
                 'notify_url' => sprintf('%s/%s', request()->domain(), 'index/payment/refund_url/type/dy/order/' . $refundNo)
             ];
             $data['sign'] = ByteDance::signWangKa($data);
+        } else if($platformSource=='美美号源') {
+            $data = [
+                'app_id' => ByteDance::appIdThree(),
+                'out_order_no' => $this->payment['order_no'],
+                'out_refund_no' => $refundNo,
+                'reason' => $this->reason,
+                'refund_amount' => $this->amount,
+                'notify_url' => sprintf('%s/%s', request()->domain(), 'index/payment/refund_url/type/dy/order/' . $refundNo)
+            ];
+            $data['sign'] = ByteDance::signHaoYuan($data);
         }else{
             $data = [
                 'app_id' => ByteDance::appId(),