精彩生活区要现金加京豆vr加京豆支付商贸区要现金加京豆支付

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'];
+
 
+                            //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')]);
 
-                            $groupOrder['er'] = 1;
-                            $groupOrder['er1'] = "开发中升级中！";
+                                $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支付
@@ -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'=>"复购金"],

app/controller/api/Notify.php

@@ -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 现金+积分
 

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支付