.gitignore

@@ -0,0 +1,3 @@
+public/
+.idea/
+.env

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

@@ -159,8 +159,66 @@ class StoreGroupOrderRepository extends BaseRepository
                 // 取消订单时 删除限制合伙人商品代理限制
                 $key ='area_manage_order:'.$order['area_manage_address_ids'];
                 $redis->del($key);
+
+                //取消订单，返还京豆和积分
+                $orderId = $order->order_id;
+                $userSignScoreInfo = Db::name('user_sign_score')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
+                if($userSignScoreInfo){
+                    $userDecScore = $userSignScoreInfo['reward_socre'];
+                    Db::name('user_sign_score')
+                        ->where('id', $userSignScoreInfo['id'])
+                        ->update([
+                            'status' => 0,
+                        ]);
+
+                    //返还扣除积分
+                    $user = Db::name('user')->where('uid', $uid)->find();
+                    $userScore = $user['score'];
+                    $ins_data['uid'] = $uid;
+                    $ins_data['reward_socre'] = $userDecScore;
+                    $ins_data['addtime'] = time();
+                    $ins_data['status'] = 1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
+                    $ins_data['order_type'] = 'cancel_order';
+                    $ins_data['order_id'] = $orderId;
+                    $ins_data['mark'] = "取消订单返还预扣积分";
+                    $ins_data['desc'] = '取消订单返还预扣积分';
+                    $ins_data['surplus'] = $userScore + $userDecScore;
+                    $ins_data['type'] = 4;//没用
+                    $ins_data['pm'] = 1;
+                    Db::name('user_sign_score')->insertGetId($ins_data);
+                    Db::name('user')->where('uid', $uid)->inc('score', $userDecScore)->update();
+                }
+
+                $userSignJingdouInfo = Db::name('user_sign_jingdou')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
+                if($userSignJingdouInfo){
+                    $userDecJingScore = $userSignJingdouInfo['number'];
+                    Db::name('user_sign_jingdou')
+                        ->where('id',$userSignJingdouInfo['id'])
+                        ->update([
+                            'status' => 0,
+                        ]);
+
+                    //返还扣除京豆
+                    $user = Db::name('user')->where('uid', $uid)->find();
+                    $userJingdou = $user['jingdou'];
+                    $ins_data['uid'] = $uid;
+                    $ins_data['number'] = $userDecJingScore;
+                    $ins_data['status'] = 1;
+                    $ins_data['mark'] = "取消订单返还预扣京豆";
+                    $ins_data['desc'] = "取消订单返还预扣京豆";
+                    $ins_data['order_id'] = $orderId;
+                    $ins_data['surplus'] = $userJingdou + $userDecJingScore;
+                    $ins_data['order_type'] = 'cancel_order';
+                    $ins_data['type'] = 1;
+                    $ins_data['addtime'] = time();
+                    Db::name('user_sign_jingdou')
+                        ->insertGetId($ins_data);
+                    Db::name('user')->where('uid', $uid)->inc('jingdou', $userDecJingScore)->update();
+                }
+
             }
             $groupOrder->save();
+
             app()->make(StoreOrderStatusRepository::class)->insertAll($orderStatus);
 
         });

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

@@ -117,7 +117,7 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/8/1
      */
-    public function createOrder(User $user, int $pay_type, array $cartId, int $addressId, array $coupons, array $takes, array $mark, bool $psType = true, $table_id = null, $share_id = 0, $payType, $mer_id = 0, $dacang_id = 0, $distribution_mode = 1, $ziti_address = '', $area_manage_address_ids = '',$youhui_price_key='')
+    public function createOrder(User $user, int $pay_type, array $cartId, int $addressId, array $coupons, array $takes, array $mark, bool $psType = true, $table_id = null, $share_id = 0, $payType, $mer_id = 0, $dacang_id = 0, $distribution_mode = 1, $ziti_address = '', $area_manage_address_ids = '',$youhui_price_key='',$cartIdAndPayTypMap)
     {
         $test_user = $user['test_user'] ?? 0;
         $address = Db::name('user_address')->field('code_list,village_id')->where('address_id', $addressId)->find();
@@ -129,7 +129,7 @@ class StoreOrderRepository extends BaseRepository
             $share_uid = Db::name('product_share')->where('id',$share_id)->value('uid');
             Log::info("商品分享，uid：".$user->uid."，share_uid：".$share_uid." cartId：".json_encode($cartId));
         }
-        if ($payType == 5) {
+        if (false) {
             $uid = $user->uid;
             $couponUserRepository = app()->make(StoreCouponUserRepository::class);
             foreach ($coupons as $merId => $coupon) {
@@ -371,7 +371,7 @@ class StoreOrderRepository extends BaseRepository
             $productRepository = app()->make(ProductRepository::class);
             $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
 
-            $group = Db::transaction(function () use ($topUid, $spreadUid, $uid, $productCouponList, $storeCouponList, $allUseCoupon, $couponUserRepository, $storeOrderProductRepository, $productRepository, $attrValueRepository, $storeCartRepository, $storeGroupOrderRepository, $groupOrder, $orderList, $orderInfo, $totalPayPrice) {
+            $group = Db::transaction(function () use ($topUid, $spreadUid, $uid, $productCouponList, $storeCouponList, $allUseCoupon, $couponUserRepository, $storeOrderProductRepository, $productRepository, $attrValueRepository, $storeCartRepository, $storeGroupOrderRepository, $groupOrder, $orderList, $orderInfo, $totalPayPrice, $decScore) {
                 $cartIds = [];
                 $uniqueList = [];
                 //更新库存
@@ -474,21 +474,20 @@ class StoreOrderRepository extends BaseRepository
                     }
                     //更新用户积分
                     $user = Db::name('user')->where('uid', $uid)->find();
-                    $deduct_score = $totalPayPrice * 30;
                     $user_score = $user['score'];
                     $ins_data['uid'] = $uid;
-                    $ins_data['reward_socre'] = $deduct_score;
+                    $ins_data['reward_socre'] = $decScore;
                     $ins_data['addtime'] = time();
-                    $ins_data['status'] = 1;
+                    $ins_data['status'] = -1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
                     $ins_data['order_type'] = 'store_order';
                     $ins_data['order_id'] = $_order->order_id;
-                    $ins_data['mark'] = "兑换商品扣减积分";
+                    $ins_data['mark'] = "兑换商品预扣积分";
                     $ins_data['desc'] = '';
-                    $ins_data['surplus'] = $user_score - $deduct_score;
+                    $ins_data['surplus'] = $user_score - $decScore;
                     $ins_data['type'] = 4;
                     $ins_data['pm'] = 2;
                     Db::name('user_sign_score')->insertGetId($ins_data);
-                    Db::name('user')->where('uid', $uid)->dec('score', $deduct_score)->update();
+                    Db::name('user')->where('uid', $uid)->dec('score', $decScore)->update();
                 }
                 $storeOrderStatusRepository->insertAll($orderStatus);
                 $storeOrderProductRepository->insertAll($orderProduct);
@@ -785,7 +784,7 @@ class StoreOrderRepository extends BaseRepository
             $productRepository = app()->make(ProductRepository::class);
             $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
 
-            $group = Db::transaction(function () use ($topUid, $spreadUid, $uid, $productCouponList, $storeCouponList, $allUseCoupon, $couponUserRepository, $storeOrderProductRepository, $productRepository, $attrValueRepository, $storeCartRepository, $storeGroupOrderRepository, $groupOrder, $orderList, $orderInfo) {
+            $group = Db::transaction(function () use ($topUid, $spreadUid, $uid, $productCouponList, $storeCouponList, $allUseCoupon, $couponUserRepository, $storeOrderProductRepository, $productRepository, $attrValueRepository, $storeCartRepository, $storeGroupOrderRepository, $groupOrder, $orderList, $orderInfo ,$cartIdAndPayTypMap) {
                 $cartIds = [];
                 $uniqueList = [];
                 //更新库存
@@ -828,6 +827,8 @@ class StoreOrderRepository extends BaseRepository
                     $_orderInfo = $order['orderInfo'];
                     unset($order['cartInfo'], $order['orderInfo']);
                     $_order = $this->dao->create($order);
+
+                    $decScore = $decJingScore = 0;
                     foreach ($cartInfo as $k => $cart) {
 //                        $is_dacang=Db::name('da_cang_user')->where('status',1)->where('uid',$uid)->find();
 //                        $is_dacang_product = Db::name('store_product')->where('product_id',$cart['product_id'])->field('type,seckill')->find();
@@ -893,8 +894,57 @@ class StoreOrderRepository extends BaseRepository
                                 'product_type' => $cart['product_type']
                             ])
                         ];
+
+                        $cartId = $cart['cart_id'];
+                        $storeProduct = Db::name('store_product')->where('product_id', $cartInfo['product_id'])->find();
+                        $productDecScore = $storeProduct['score'];
+                        $productDecJingdou = $storeProduct['jingdou'];
+                        if ($cartIdAndPayTypMap[$cartId] == 'score') {
+                            $decScore += $productDecScore;
+                        } else if ($cartIdAndPayTypMap[$cartId] == 'jingdou') {
+                            $decJingScore += $productDecJingdou;
+                        }
+                    }
+
+
+                    if ($decScore) {
+                        $decScore = $productDecScore;
+                        //更新用户积分
+                        $user = Db::name('user')->where('uid', $uid)->find();
+                        $user_score = $user['score'];
+                        $ins_data['uid'] = $uid;
+                        $ins_data['reward_socre'] = $decScore;
+                        $ins_data['addtime'] = time();
+                        $ins_data['status'] = -1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
+                        $ins_data['order_type'] = 'store_order';
+                        $ins_data['order_id'] = $_order->order_id;
+                        $ins_data['mark'] = "兑换商品预扣积分";
+                        $ins_data['desc'] = '';
+                        $ins_data['surplus'] = $user_score - $decScore;
+                        $ins_data['type'] = 4;
+                        $ins_data['pm'] = 2;
+                        Db::name('user_sign_score')->insertGetId($ins_data);
+                        Db::name('user')->where('uid', $uid)->dec('score', $decScore)->update();
+                    }
+                    if ($decJingScore) {
+                        //更新用户京豆
+                        $user = Db::name('user')->where('uid', $uid)->find();
+                        $userJingdou = $user['jingdou'];
+                        $ins_data['uid'] = $uid;
+                        $ins_data['number'] = $decJingScore;
+                        $ins_data['status'] = -1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
+                        $ins_data['mark'] = "购买商品预扣京豆";
+                        $ins_data['desc'] = "购买商品预扣京豆";
+                        $ins_data['order_id'] = $_order->order_id;
+                        $ins_data['surplus'] = $userJingdou - $decJingScore;
+                        $ins_data['order_type'] = 'store_order';
+                        $ins_data['type'] = 2;
+                        $ins_data['addtime'] = time();
+                        Db::name('user_sign_jingdou')->insertGetId($ins_data);
+                        Db::name('user')->where('uid', $uid)->dec('jingdou', $decJingScore)->update();
                     }
                 }
+
                 $storeOrderStatusRepository->insertAll($orderStatus);
                 $storeOrderProductRepository->insertAll($orderProduct);
                 return $groupOrder;
@@ -1197,6 +1247,28 @@ class StoreOrderRepository extends BaseRepository
                                 ]);
                         }
                     }
+
+
+                    //支付成功 修改账单状态为1
+                    $orderId = $order->order_id;
+                    $userSignScoreInfo = Db::name('user_sign_score')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
+                    if($userSignScoreInfo){
+                        Db::name('user_sign_score')
+                            ->where('id', $userSignScoreInfo['id'])
+                            ->update([
+                                'status' => 1,
+                            ]);
+                    }
+
+                    $userSignJingdouInfo = Db::name('user_sign_jingdou')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
+                    if($userSignJingdouInfo){
+                        Db::name('user_sign_jingdou')
+                            ->where('id',$userSignJingdouInfo['id'])
+                            ->update([
+                                'status' => 1,
+                            ]);
+                    }
+
                 }
 
                 app()->make(UserRepository::class)->update($groupOrder->uid, [

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

@@ -682,8 +682,8 @@ class Access
 
     public function test1111()
     {
-        $domain = $this->request->domain();
-        if(strpos($domain, 'test.hebeiyhc.com') !== false){
+//        $domain = $this->request->domain();
+//        if(strpos($domain, 'test.hebeiyhc.com') !== false){
             $requestId[0]=input('order_sn');
 //        $pay_type=5;
             Db::name('store_group_order') -> where('group_order_sn',$requestId[0]) -> update(['rand'=>mt_rand(1000,9999)]);
@@ -695,7 +695,7 @@ class Access
 //        event('pay_success_order', ['order_sn' => $requestId[0],'pay_type'=>$pay_type]);
             dump('成功');
 //        dump($this->randomFromDev(20));
-        }
+//        }
     }
 
 

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

@@ -12,6 +12,7 @@ namespace app\controller\api\store\order;
 
 
 use app\common\model\store\order\StoreRefundOrder;
+use app\common\model\system\admin\Log;
 use app\common\repositories\merchant\MerchantRepository;
 use app\common\repositories\store\product\ProductAttrValueRepository;
 use app\common\repositories\user\UserAddressRepository;
@@ -110,7 +111,7 @@ class StoreOrder extends BaseController
         $coupon = (array)$this->request->param('coupon', []);
         $take = (array)$this->request->param('take', []);
         $mark = (array)$this->request->param('mark', []);
-        $payType = $this->request->param('pay_type');
+        $payType = $this->request->param('pay_type');// 5积分 6京豆
         $share_id = $this->request->param('share_id','');//分享id
         $mer_id = $this->request->param('mer_id','');//分享id
         $psType = $this->request->param('type',true);//是否需要地址Boolean
@@ -120,8 +121,20 @@ class StoreOrder extends BaseController
         $distribution_mode = $this->request->param('distribution_mode','1');//配送方式
         $ziti_address = $this->request->param('distribution_address','');//自提地址
         $youhui_price_key = $this->request->param('youhui_price_key','');//优惠key
+        $cartIdAndPayTypMap = (array)$this->request->param('cartIdAndPayTypMap', []);
+
+        if(!$cartIdAndPayTypMap){
+            return app('json')->fail('支付方式不正确');
+        }
         $uid = $this->request->uid();
         $gong = app()->make(ProductAttrValueRepository::class);
+
+        $allParams = input();
+        \think\facade\Log::info("createOrder params".json_encode($allParams));
+
+        $cartId = $allParams['cart_id'];
+        \think\facade\Log::info("createOrder cart_id".json_encode($cartId));
+
 //        Db::name('log')->insert(['data'=>'购物车ID---'.$cartId[0]]);
         $price=0;
 //        if (!in_array($payType, StoreOrderRepository::PAY_TYPE))
@@ -132,102 +145,73 @@ class StoreOrder extends BaseController
         $special_merchant = merchantConfig($product_mer_id, 'special_merchant');
         $member_settings=merchantConfig($product_mer_id, 'member_settings');
 
-        return app('json')->fail('正在升级');
         // 增加锁，防止同一用户重读点击
         $redis = Cache::store('redis')->handler();
         $key = 'createOrder'.$uid;
         if (!$redis->setnx($key, 1))
             return app('json')->fail('请勿重复下单');
         $redis->expire($key, 3);
+        if (!in_array($payType, [5, 6])) {
+            return app('json')->fail('支付方式不正确');
+        }
 
         $user_group = (int)Db::name('user') -> where('uid',$uid)->value('user_group');
-        if($payType=='5'){
-            //$product_mer_id!=148&&$product_mer_id!==290&&
-
 
-            if(empty($mer_id) || ($product_mer_id!=148 && $special_merchant != "beishengtang")) {
-                return app('json')->fail('此商户/商品不支持积分支付');
-            }
-
-//            Db::name('log')->insert(['data'=>'购物车ID'.json_encode($cartId)]);
-            $cartIds=Db::name('store_cart')->where('cart_id','in',$cartId)->select()->toArray();
-
-//            Db::name('log')->insert(['data'=>'购物车数据'.json_encode($cartIds)]);
-            foreach ($cartIds as $k=>$item){
-                $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
-                if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
-                $money=Db::name('store_product_attr_value')->where('unique',$item['product_attr_unique'])->value('price');
-                $price+=bcmul($money,$item['cart_num'],2);
-            }
-//            $have_money=Db::name('entropy_barter_user_'.$mer_id)->where('uid',$uid)->value('integral');
-            if ($special_merchant == "beishengtang"){
-                $have_money = Db::name('user') -> where('uid',$uid) -> value('score_beishengtang');
-                if($have_money<$price){
-                    return app('json')->fail('积分不足无法支付');
-                }
-            }else{
-
-                $have_money = Db::name('user') -> where('uid',$uid) -> value('score');
-                if($have_money<$price*30){
-                    return app('json')->fail('积分不足无法支付');
+//        $cartIdAndPayTypMap = [
+//            13662 => 'score',
+//            13663 => 'jingdou',
+//            13664 => 'jingdou',
+//        ];
+//        $cartId = [
+//            13662, 订单1
+//            13663, 订单1
+//            13664  订单2
+//        ];
+
+        // 商品A 后台设置是扣除60积分 或者 扣除120京豆
+        // 商品B 后台设置是扣除20积分 或者 扣除40京豆
+        // payType=5 积分支付的时候
+        //
+        $cartList=Db::name('store_cart')->where('cart_id','in',$cartId)->select()->toArray();
+        $price = $decScore = $decJingScore =  0;//总消耗积分和京豆
+        foreach ($cartList as $cartInfo){
+            $checkGong = $gong -> checkGong($cartInfo['product_id'],$cartInfo['product_attr_unique'],$cartInfo['cart_num'],$uid,$addressId);
+            if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
+            $money=Db::name('store_product_attr_value')->where('unique',$cartInfo['product_attr_unique'])->value('price');
+            $price += bcmul($money, $cartInfo['cart_num'], 2);
+
+            $storeProduct = Db::name('store_product')->where('product_id', $cartInfo['product_id'])->find();
+            $productDecScore = $storeProduct['score'];
+            $productDecJingdou = $storeProduct['jingdou'];
+
+            $itemCartId = $cartInfo['cart_id'];
+            if ($cartIdAndPayTypMap[$itemCartId] == 'score') {
+                //积分支付的话
+                if ($productDecScore == 0) {
+                    return app('json')->fail($storeProduct['store_name'] . '必须消耗积分');
                 }
-            }
-
-
-        }else if($payType==6){
-            //一壶茶红积分兑换
-            $cartIds=Db::name('store_cart')->where('cart_id','in',$cartId)->select()->toArray();
-            $red_jifen=0;
-            foreach ($cartIds as $k=>$item){
-                $s_type = Db::name('store_product') -> where('product_id', $item['product_id']) -> value('type');
-                if($s_type!=17){
-                    return app('json')->fail('只有会员商品才能使用积分');
+                $decScore += $productDecScore;
+            } else if ($cartIdAndPayTypMap[$itemCartId] == 'jingdou') {
+                //京豆支付的话
+                if ($productDecJingdou == 0) {
+                    return app('json')->fail($storeProduct['store_name'] . '必须消耗京豆');
                 }
-
-                $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
-                if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
-                $money=Db::name('store_product_attr_value')->where('unique',$item['product_attr_unique'])->value('price');
-                $red_jifen+=bcmul($money,$item['cart_num'],2);
-            }
-            $red_jifen=ceil($red_jifen);
-
-            $enterprise_user_data = Db::name('enterprise_user') -> where('uid',$uid)-> where('mer_id',$this->merId) ->find();
-            $green_integral = $enterprise_user_data['green_integral'];
-            if(!$green_integral || $green_integral < $red_jifen){
-                return app('json')->fail('用户红积分不足，请刷新后再试');
-            }
-            if($enterprise_user_data['identity'] < 100){
-                return app('json')->fail('需要您升级为合伙人');
-            }
-
-
-            $exchange_phone = $this->request->param('phone','');
-            if(!$exchange_phone || !preg_match("/^1[3456789]{1}\d{9}$/", $exchange_phone)){
-                return app('json')->fail('请正确输入开通账号');
+                $decJingScore += $productDecJingdou;
             }
-            $ex_user=Db::name('user')->where('account',$exchange_phone)->find();
-            if(!$ex_user){
-                $userRepository = app()->make(UserRepository::class);
-                $ex_user = $userRepository->registr($exchange_phone,'123456','APP',$uid);
-                Db::name('user')->where('uid',$ex_user['uid'])->update(['spread_uid'=>$uid,'spread_time'=>date('Y-m-d H:i:s')]);
-            }
-            $enterprise_user_ex_user=Db::name('enterprise_user')->where('uid',$ex_user['uid'])-> where('mer_id',$this->merId)->find();
-            if(!$enterprise_user_ex_user){
-                $inset['uid']=$ex_user['uid'];
-                $inset['mer_id']=$this->merId;
-                $inset['puid']=$uid;
-                $inset['node_uid']=$uid;
-                Db::name('enterprise_user')->insert($inset);
-                $enterprise_user_ex_user['identity']=0;
-            }else if($enterprise_user_ex_user['node_uid']!=$uid){
-                return app('json')->fail('红积分只能用于本人和直推用户使用');
-            }
-            if($enterprise_user_ex_user && in_array($enterprise_user_ex_user['identity'],[100,101,102,103,104,105])){
-                return app('json')->fail('此用户已经是合伙人');
-            }
-
-
         }
+        if (!$decScore && !$decJingScore) {
+            return app('json')->fail('必须消耗京豆或积分');
+        }
+        $userInfo = Db::name('user')->where('uid', $uid)->find();
+        $haveScore = $userInfo['score'];
+        if ($haveScore < $decScore) {
+            return app('json')->fail('积分不足');
+        }
+        $haveJingScore = $userInfo['jingdou'];
+        if ($haveJingScore < $decJingScore) {
+            return app('json')->fail('京豆不足');
+        }
+
         $cartIds=Db::name('store_cart')->where('cart_id','in',$cartId)->select()->toArray();
 //        $count=count($cartIds);
         $product_id=explode('=',systemConfig('product_ids'));
@@ -431,7 +415,7 @@ class StoreOrder extends BaseController
 
         makeLock()->lock();
         try {
-            $groupOrder = $this->repository->createOrder($this->request->userInfo(), array_search($payType, StoreOrderRepository::PAY_TYPE), $cartId, $addressId, $coupon, $take, $mark,$psType,$table_id,$share_id,$payType,$mer_id,$dacang_id,$distribution_mode,$ziti_address,$area_manage_address_ids,$youhui_price_key);
+            $groupOrder = $this->repository->createOrder($this->request->userInfo(), array_search($payType, StoreOrderRepository::PAY_TYPE), $cartId, $addressId, $coupon, $take, $mark,$psType,$table_id,$share_id,$payType,$mer_id,$dacang_id,$distribution_mode,$ziti_address,$area_manage_address_ids,$youhui_price_key,$cartIdAndPayTypMap);
         } catch (\Throwable $e) {
             makeLock()->unlock();
             throw $e;
@@ -442,19 +426,19 @@ class StoreOrder extends BaseController
         //删除缓存的优惠价格
         Cache::delete($uid.'_youhui_price_'.$product_type_id);
 
-        if($payType==5){
-
-
-            $this->repository->integralPaySuccess($groupOrder,5);
-            //积分商品
-            $order_id=Db::name('store_order')->where('group_order_id',$groupOrder['group_order_id'])->value('order_id');
-
-            $userRepository = app()->make(UserRepository::class);
-            if ($special_merchant == "beishengtang"){
-                $userRepository -> sign_add($uid,$price,1,'积分消费','','',$order_id,2,"store_order_beishengtang");
-            }else{
-                $userRepository -> sign_add($uid,$price*30,1,'积分消费','','',$order_id,2,'store_order');
-            }
+//        if($payType==5){
+//
+//
+//            $this->repository->integralPaySuccess($groupOrder,5);
+//            //积分商品
+//            $order_id=Db::name('store_order')->where('group_order_id',$groupOrder['group_order_id'])->value('order_id');
+//
+//            $userRepository = app()->make(UserRepository::class);
+//            if ($special_merchant == "beishengtang"){
+//                $userRepository -> sign_add($uid,$price,1,'积分消费','','',$order_id,2,"store_order_beishengtang");
+//            }else{
+//                $userRepository -> sign_add($uid,$price*30,1,'积分消费','','',$order_id,2,'store_order');
+//            }
 
 
 //            Db::name('user') -> where('uid',$uid) -> dec('score', $price*30)->update();
@@ -496,67 +480,67 @@ class StoreOrder extends BaseController
 //            Db::name('entropy_barter_bill')->insert($insert);
             return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
 //
-        }else if($payType==6){
-            //积分商品
-            $userRepository = app()->make(UserRepository::class);
-            $order_id=Db::name('store_order')->where('group_order_id',$groupOrder['group_order_id'])->value('order_id');
-            $hongjifen_kou=$userRepository -> sign_yhc_add($uid,$this->merId,$red_jifen,'兑换合伙人商品('.$ex_user['nickname'].')',$order_id,2,$ex_user['uid']);
-            if(!$hongjifen_kou){
-                return app('json')->fail('用户红积分不足，请刷新后再试');
-            }
-
-
-            Db::name('store_order')->where('group_order_id',$groupOrder['group_order_id'])->update(['exchange_phone'=>$exchange_phone]);
-
-            $this->repository->integralPaySuccess($groupOrder,5);
-
-
-            $enterprise_user=Db::name('enterprise_user')->where('uid',$ex_user['uid'])-> where('mer_id',$this->merId)->find();
-            if($enterprise_user && $enterprise_user['identity']<100){ //不是合伙人就升级为合伙人
-                Db::name('enterprise_user')->where('uid',$enterprise_user['uid'])->where('mer_id',$enterprise_user['mer_id'])->update(['identity'=>100,'exchange'=>100]);
-            }
-
-
-
-            $order=Db::name('store_order')->where('order_id',$order_id)->find();
-            $store_order_product =Db::name('store_order_product')->where('order_id',$order_id)->where('type',17)->find();
-            $cart_info=json_decode($store_order_product['cart_info'],true);
-            $pay_price =$order['pay_price'];
-            $unique=isset($cart_info['productAttr']['unique'])?$cart_info['productAttr']['unique']:'';
-            $product_id=isset($cart_info['product']['product_id'])?$cart_info['product']['product_id']:'';
-            if($unique){
-                $store_product_attr_value=Db::name('store_product_attr_value')->where('unique',$unique)->find();
-            }
-            if($product_id && isset($store_product_attr_value)){
-                $product_data=Db::name('store_product')->where('product_id',$product_id)->find();
-                if($product_data && $product_data['pension_is']==1 && isset($store_product_attr_value['pension_num']) ){
-                    $member_settings['ylj']=$store_product_attr_value['pension_num'];//养老金比例单独设置
-                }
-
-                Db::name('enterprise_user')->where('uid',$enterprise_user['uid'])->inc('stock_right',$store_product_attr_value['stock_num'])->inc('stock_num',$store_product_attr_value['shares_num'])->update();
-
-            }
-
-
-            $user_yanglaojin=decimal2($member_settings['ylj']/100*$pay_price);//养老金 一壶茶会员商户从2后台设置比例
-
-
-
-
-
-
-            $StoreOrderRepository = app()->make(StoreOrderRepository::class);
-
-
-
-            if($user_yanglaojin>=0.01) {
-                $order_sn=Db::name('store_order')->where('group_order_id',$groupOrder['group_order_id'])->value('order_sn');
-                $StoreOrderRepository->add_bill_gongfu("养老金", $user_yanglaojin, $enterprise_user['uid'], "商城消费获得养老金" . $user_yanglaojin, 5, $order_sn, $order_id, $enterprise_user['mer_id'], 0, 0);
-            }
-
-
-            return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
-        }
+//        }else if($payType==6){
+//            //积分商品
+//            $userRepository = app()->make(UserRepository::class);
+//            $order_id=Db::name('store_order')->where('group_order_id',$groupOrder['group_order_id'])->value('order_id');
+//            $hongjifen_kou=$userRepository -> sign_yhc_add($uid,$this->merId,$red_jifen,'兑换合伙人商品('.$ex_user['nickname'].')',$order_id,2,$ex_user['uid']);
+//            if(!$hongjifen_kou){
+//                return app('json')->fail('用户红积分不足，请刷新后再试');
+//            }
+//
+//
+//            Db::name('store_order')->where('group_order_id',$groupOrder['group_order_id'])->update(['exchange_phone'=>$exchange_phone]);
+//
+//            $this->repository->integralPaySuccess($groupOrder,5);
+//
+//
+//            $enterprise_user=Db::name('enterprise_user')->where('uid',$ex_user['uid'])-> where('mer_id',$this->merId)->find();
+//            if($enterprise_user && $enterprise_user['identity']<100){ //不是合伙人就升级为合伙人
+//                Db::name('enterprise_user')->where('uid',$enterprise_user['uid'])->where('mer_id',$enterprise_user['mer_id'])->update(['identity'=>100,'exchange'=>100]);
+//            }
+//
+//
+//
+//            $order=Db::name('store_order')->where('order_id',$order_id)->find();
+//            $store_order_product =Db::name('store_order_product')->where('order_id',$order_id)->where('type',17)->find();
+//            $cart_info=json_decode($store_order_product['cart_info'],true);
+//            $pay_price =$order['pay_price'];
+//            $unique=isset($cart_info['productAttr']['unique'])?$cart_info['productAttr']['unique']:'';
+//            $product_id=isset($cart_info['product']['product_id'])?$cart_info['product']['product_id']:'';
+//            if($unique){
+//                $store_product_attr_value=Db::name('store_product_attr_value')->where('unique',$unique)->find();
+//            }
+//            if($product_id && isset($store_product_attr_value)){
+//                $product_data=Db::name('store_product')->where('product_id',$product_id)->find();
+//                if($product_data && $product_data['pension_is']==1 && isset($store_product_attr_value['pension_num']) ){
+//                    $member_settings['ylj']=$store_product_attr_value['pension_num'];//养老金比例单独设置
+//                }
+//
+//                Db::name('enterprise_user')->where('uid',$enterprise_user['uid'])->inc('stock_right',$store_product_attr_value['stock_num'])->inc('stock_num',$store_product_attr_value['shares_num'])->update();
+//
+//            }
+//
+//
+//            $user_yanglaojin=decimal2($member_settings['ylj']/100*$pay_price);//养老金 一壶茶会员商户从2后台设置比例
+//
+//
+//
+//
+//
+//
+//            $StoreOrderRepository = app()->make(StoreOrderRepository::class);
+//
+//
+//
+//            if($user_yanglaojin>=0.01) {
+//                $order_sn=Db::name('store_order')->where('group_order_id',$groupOrder['group_order_id'])->value('order_sn');
+//                $StoreOrderRepository->add_bill_gongfu("养老金", $user_yanglaojin, $enterprise_user['uid'], "商城消费获得养老金" . $user_yanglaojin, 5, $order_sn, $order_id, $enterprise_user['mer_id'], 0, 0);
+//            }
+//
+//
+//            return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
+//        }
         if ($groupOrder['pay_price'] == 0) {
             $this->repository->paySuccess($groupOrder);
             return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);