Merge branch 'master' into huangfamily

app/common/repositories/movie/MovieRepository.php

@@ -7,32 +7,9 @@
 
 namespace app\common\repositories\movie;
 
-use app\common\dao\store\product\ProductDao as dao;
-use app\common\model\store\product\Product;
-use app\common\model\user\User;
+use app\common\dao\movie\order\MovieOrderDao;
 use app\common\repositories\BaseRepository;
-use app\common\repositories\merchant\MerchantRepository;
-use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
-use app\common\repositories\store\product\ProductAttrRepository;
-use app\common\repositories\store\product\ProductAttrValueRepository;
-use app\common\repositories\store\product\ProductCateRepository;
-use app\common\repositories\store\product\ProductContentRepository;
-use app\common\repositories\store\product\ProductReplyRepository;
-use app\common\repositories\store\shipping\ShippingTemplateRepository;
-use app\common\repositories\store\StoreBrandRepository;
-use app\common\repositories\store\StoreCategoryRepository;
-use app\common\repositories\store\StoreSeckillActiveRepository;
-use app\common\repositories\store\StoreSeckillTimeRepository;
-use app\common\repositories\user\UserRelationRepository;
-use app\common\repositories\user\UserVisitRepository;
-use app\controller\merchant\gong\Goods;
-use app\traits\ShouxinyiApiRequest;
-use crmeb\exceptions\ApiException;
-use crmeb\services\QrcodeService;
-use crmeb\services\SwooleTaskService;
-use think\Exception;
-use think\exception\ValidateException;
 use think\facade\Db;
 use think\facade\Log;
 
@@ -40,18 +17,17 @@ use think\facade\Log;
  * Class MovieRepository
  * @package app\common\repositories\movie
  * @author xaboy
- * @mixin dao
+ * @mixin MovieOrderDao
  */
 class MovieRepository extends BaseRepository
 {
     protected $dao;
-    protected $filed = 'concession_pri,product_id,mer_id,brand_id,unit_name,rate,reply_count,store_info,cate_id,ficti,image,slider_image,store_name,keyword,sort,is_show,sales,price,refusal,cost,ot_price,stock,is_gift_bag,care_count,status,is_used,create_time,seckill,plate_mer_profit,type';
 
     /**
      * ProductRepository constructor.
-     * @param dao $dao
+     * @param MovieOrderDao $dao
      */
-    public function __construct(dao $dao)
+    public function __construct(MovieOrderDao $dao)
     {
         $this->dao = $dao;
     }
@@ -120,4 +96,249 @@ class MovieRepository extends BaseRepository
     {
         return DouHuoMallFilmApiRequest::getSchedSeat($relation_id, $sched_sign);
     }
+
+    /**
+     * 锁座订单
+     * @param $sched_sign
+     * @param $seat_sign
+     * @param $channel_type
+     * @param $third_order
+     * @param $order_price
+     * @param $phone
+     * @return mixed|string
+     */
+    public function submitOrder($userinfo, $params)
+    {
+        /** @var StoreOrderRepository $storeOrder */
+        $storeOrder = app()->make(StoreOrderRepository::class);
+        $order_sn = $storeOrder->getNewOrderId() . '0';
+
+        $order_price = round($params['number'] * $params['price'], 2);
+        $submitOrder = DouHuoMallFilmApiRequest::submitOrder($userinfo->phone, $params['channel_type'], $params['sched_sign'], $order_sn, $order_price);
+        if (!empty($submitOrder) && isset($submitOrder['code']) && ($submitOrder['code'] == 200) && isset($submitOrder['data']['plat_order'])){
+            $_order = [
+                'uid' => $userinfo->uid,
+                'mobile' => $userinfo->phone,
+                'order_sn' => $order_sn,
+                'plat_order' => $submitOrder['data']['plat_order'],
+                'price' => $params['price'],
+                'number' => $params['number'],
+                'order_price' => $order_price,
+                'channel_type' => $params['channel_type'],
+                'pay_type' => $params['pay_type'],
+                'city_sign' => $params['city_sign'],
+                'city_name' => $params['city_name'],
+                'area_code' => $params['area_code'],
+                'area_name' => $params['area_name'],
+                'cinema_sign' => $params['cinema_sign'],
+                'cinema_name' => $params['cinema_name'],
+                'address' => $params['address'],
+                'longitude' => $params['longitude'],
+                'latitude' => $params['latitude'],
+                'hall_sign' => $params['hall_sign'],
+                'hall_name' => $params['hall_name'],
+                'relation_id' => $params['relation_id'],
+                'sched_sign' => $params['sched_sign'],
+                'film_sign' => $params['film_sign'],
+                'film_name' => $params['film_name'],
+                'show_date' => $params['show_date'],
+                'show_time' => $params['show_time'],
+                'sched_seat' => $params['sched_seat'],
+                'create_time' => time()
+            ];
+
+            $group = Db::transaction(function () use ($userinfo, $_order) {
+                $_order = $this->dao->create($_order);
+                if ($_order) return static::pay();
+
+
+            });
+            return $group;
+        } else {
+            return $submitOrder;
+        }
+    }
+
+    private static function pay($payType,$code,$groupOrder,$title,$notify_url,$pay_mode=null,$appid=''){
+
+        $order_no = $groupOrder['group_order_sn'] ?? $groupOrder['order_no'];
+
+
+
+        if($payType == 'wx'){
+
+            if(!$code || $code == '' || $code =='undefined')
+                return "授权失败，code为空";
+            if($appid == '') {
+
+
+                $pay_wx = systemConfig('pay_wx');
+
+                if ($pay_wx == 2){
+                    $appid = env('WECHAT_MP.APPID');
+                    $new_secret = env('WECHAT_MP.SECRET');
+
+                    $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
+                    $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+
+                }elseif ($pay_wx == 3){
+                    $appid = env('WECHAT_TDYL.APPID');
+                    $new_secret = env('WECHAT_TDYL.SECRET');
+
+
+                    Db::name('log')->insert(['data'=>'appid---'.$appid]);
+                    Db::name('log')->insert(['data'=>'new_secret---'.$new_secret]);
+                    $app_id='app_383a75dd-c03d-44ab-8f58-92c60fe9b9d0';
+                    $key='api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+
+                }
+
+            }else{
+                $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
+                $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+                $new_secret = "c8cbe24fa3b83f77a88b79554b3aeab4";
+            }
+
+            $url = "https://api.weixin.qq.com/sns/jscode2session?appid=".$appid."&secret=".$new_secret."&js_code=".$code."&grant_type=authorization_code";
+            $get = curlGet($url);
+            Db::name('log')->insert(['data'=>'pay_wx---'.$pay_wx]);
+            Db::name('log')->insert(['data'=>'code---'.$code]);
+            Db::name('log')->insert(['data'=>'url---'.$url]);
+            Db::name('log')->insert(['data'=>'open_id---'.json_encode($get)]);
+            if(!isset($get['openid']) || empty($get['openid'])){
+                return '授权失败';
+            }
+            $openid = $get['openid'];
+
+            $member_id=0;
+            $type='2';
+            $pay_channel='wx_lite';
+
+            $expend=[
+                'open_id'=>$openid,
+                'wx_app_id'=> $appid
+            ];
+
+
+            if ($groupOrder['order_type'] = "marketing"){
+
+                db::name("test_log")->insert(["note"=>"pay_huifu" . json_encode($groupOrder)]);
+                // 创富宝 分账
+                //创富宝
+                $cfb = sprintf("%01.2f",round(bcmul($groupOrder['pay_price'],'0.094',5),2));//9.4%的分账
+
+                $cfb_member = "jsdk_member_1680162243019";
+                //  平台
+                $cxb = sprintf("%01.2f",round(bcsub($groupOrder['pay_price'],$cfb,5),2));//剩下的归平台
+
+                $div_members=[
+                    [
+                        'member_id'=>$member_id,
+                        'amount'=>$cxb,
+                        'fee_flag'=>'Y'
+                    ],
+                    [
+                        'member_id'=>$cfb_member,
+                        'amount'=>$cfb,
+                        'fee_flag'=>'N'
+                    ]
+                ];
+            }else{
+                $div_members=[
+                    [
+                        'member_id'=>$member_id,
+                        'amount'=>$groupOrder['pay_price'],
+                        'fee_flag'=>'Y'
+                    ]
+                ];
+            }
+
+            $params=[
+                'order_no'=>$order_no."_".rand(1000,9999),
+                'app_id'=>$app_id,
+                'pay_channel'=>$pay_channel,
+                'pay_amt'=>(string)$groupOrder['pay_price'],
+                'goods_title'=> strlen($title) > 64 ? mb_substr($title, 0, 64,'utf-8') : $title,// 解决因为太长不能支付问题
+                'goods_desc' => strlen($title) > 42 ? mb_substr($title, 0, 127,'utf-8') : $title,// 解决因为太长不能支付问题
+                'device_info'=>[
+                    'device_ip'=>app('request')->ip()
+//                    'device_ip'=>'115.171.134.68'
+                ],
+
+                'expend'=>json_encode($expend),
+                'div_members'=>json_encode($div_members),
+                'fee_mode'=>'I',
+                'notify_url'=>$notify_url
+            ];
+            if($pay_mode == 'delay'){
+                $params['pay_mode'] = 'delay';
+                unset($params['div_members']);
+                unset($params['fee_mode']);
+            }
+            return $this->Payment_create_traits_b($params,$type,$key);
+        }elseif($payType=='ALI'){
+//            throw new AuthException('支付宝正在升级，请使用微信支付');
+            $member_id=0;
+            $type='1';
+            $pay_channel='alipay_qr';
+            // 天地博爱科技通道
+            $app_id='app_44108546-d27a-48ee-88c1-84b45b75114f';
+            $key='api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
+            // 天地博爱通道
+//            $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
+//            $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+
+            $div_members=[
+                [
+                    'member_id'=>$member_id,
+                    'amount'=>$groupOrder['pay_price'],
+                    'fee_flag'=>'Y'
+                ]
+            ];
+
+            $params=[
+                'order_no'=>$order_no."_".rand(1000,9999),
+                'app_id'=>$app_id,
+                'pay_channel'=>$pay_channel,
+                'pay_amt'=>(string)$groupOrder['pay_price'],
+                'goods_title'=> strlen($title) > 64 ? mb_substr($title, 0, 64,'utf-8') : $title,// 解决因为太长不能支付问题
+                'goods_desc' => strlen($title) > 42 ? mb_substr($title, 0, 127,'utf-8') : $title,// 解决因为太长不能支付问题
+                'device_info'=>[
+                    'device_ip'=>app('request')->ip()
+//                    'device_ip'=>'115.171.134.68'
+                ],
+
+//                    'expend'=>json_encode($expend),
+                'div_members'=>json_encode($div_members),
+                'fee_mode'=>'I',
+                'notify_url'=>$notify_url
+            ];
+            if($pay_mode == 'delay'){
+                $params['pay_mode'] = 'delay';
+                unset($params['div_members']);
+                unset($params['fee_mode']);
+            }
+            return $this->Payment_create_traits_a($params,$type,$key);
+        }
+
+    }
+
+    /**
+     * @param $third_order
+     * @param $order_price
+     * @return mixed|string
+     */
+    public function confirmOrder($third_order, $order_price)
+    {
+        return DouHuoMallFilmApiRequest::confirmOrder($third_order, $order_price);
+    }
+
+    /**
+     * @param $third_order
+     * @return mixed|string
+     */
+    public function getOrderInfo($third_order)
+    {
+        return DouHuoMallFilmApiRequest::getOrderInfo($third_order);
+    }
 }

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

@@ -6614,18 +6614,19 @@ class StoreOrderRepository extends BaseRepository
                 log::info("传参数据333========");
                 $gong = app()->make(ProductAttrValueRepository::class);
                 $order = $order->toArray();
-                $check = true;
                 foreach ($order as $key => $value) {
+                    $check = true;
                     $cartIds = Db::name('store_cart')->where('cart_id', 'in', $value['cart_id'])->select()->toArray();
                     foreach ($cartIds as $k => $v) {
                         $checkGong = $gong->checkGong($v['product_id'], $v['product_attr_unique'], $v['cart_num'], $value['uid'], $value['address_id'], false, true);
-                        if (!$checkGong) $check = false;
+                        if ($checkGong != true){
+                            $check = false;
+                        }
                     }
-//                }
-                    if (!$check) {
+                    if ($check != true) {
+                        echo '订单号：' . $value['order_sn']. ':' .json_encode($check). '<br>'. ':' .json_encode($checkGong). '<br>';
                         continue;
                     }
-//                foreach ($order as $key => $value){
                     $query = Db::name('user_address')->where('uid', $value['uid']);
                     $query->where('address_id', $value['address_id']);
                     $address_code_list = $query->value('code_list');
@@ -6633,12 +6634,9 @@ class StoreOrderRepository extends BaseRepository
                     if ($address_code_list) {
                         $address_id = explode(',', $address_code_list);
                         $address_id = end($address_id);
-//                        $address_id = $address_id[0];
                     }
-//                    $address_id = $value['address_id'];
                     $cart_id = [$value['cart_id']];
                     $cartIds = Db::name('store_cart')->where('cart_id', 'in', $cart_id)->select()->toArray();
-//                    $address = $value['user_address'];
                     log::info("传参数据22========");
                     $address = $query->value('detail');
                     $third_order = $value['order_sn'];

app/common/repositories/user/UserRepository.php

@@ -1185,7 +1185,7 @@ class UserRepository extends BaseRepository
     public function registr(string $phone, ?string $pwd, $user_type = 'h5',$url="",$nickname="",$external=1,$spread_uid=null)
     {
         $user_res = Db::name('user')->where('phone', $phone)->find();
-        if ($user_res || !$user_res['account']) {
+        if ($user_res && !$user_res['account']) {
             $data = [
                 'account' => $phone,
             ];

route/admin.php

@@ -124,6 +124,9 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
 
         //上传图片
         Route::post('upload/image/:id/:field', 'admin.system.attachment.Attachment/image')->name('uploadImage');
+        
+        //上传视频
+        Route::post('upload/video/:id/:field', 'admin.system.attachment.Attachment/video')->name('merchantUploadVideo');
 
         //附件分类管理
         Route::group('system/attachment/category', function () {