Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/user/UserRepository.php

@@ -3109,7 +3109,8 @@ class UserRepository extends BaseRepository
             }
         }
         $res=Db::name('user_extract_openid')->where('uid',$uid)->value('openid');
-        if($res){
+        $wechat_user_id = Db::name('user') -> where('uid',$uid) -> value('wechat_user_id');
+        if($res && !empty($wechat_user_id)){
 
             $arr[]=array(
                 'id'=>'1',

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('数据异常，请重新下单,并选择支付方式!');