fix

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

@@ -188,7 +188,7 @@ class StoreGroupOrderRepository extends BaseRepository
                 $ins_data['type'] = 4;//没用
                 $ins_data['pm'] = 1;
                 Db::name('user_sign_score')->insertGetId($ins_data);
-                Db::name('user')->where('uid', $uid)->dec('score', $userDecScore)->update();
+                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();
@@ -215,7 +215,7 @@ class StoreGroupOrderRepository extends BaseRepository
                 $ins_data['addtime'] = time();
                 Db::name('user_sign_jingdou')
                     ->insertGetId($ins_data);
-                Db::name('user')->where('uid', $uid)->dec('jingdou', $userDecJingScore)->update();
+                Db::name('user')->where('uid', $uid)->inc('jingdou', $userDecJingScore)->update();
             }
 
 

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

@@ -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) {
@@ -784,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 ,$decJingScore) {
+            $group = Db::transaction(function () use ($topUid, $spreadUid, $uid, $productCouponList, $storeCouponList, $allUseCoupon, $couponUserRepository, $storeOrderProductRepository, $productRepository, $attrValueRepository, $storeCartRepository, $storeGroupOrderRepository, $groupOrder, $orderList, $orderInfo ,$decJingScore, $decScore, $payType) {
                 $cartIds = [];
                 $uniqueList = [];
                 //更新库存
@@ -895,21 +895,41 @@ class StoreOrderRepository extends BaseRepository
                     }
                 }
 
-                //更新用户京豆
-                $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();
+                if ($payType == 5) {
+
+                    //更新用户积分
+                    $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();
+                } else if ($payType == 6) {
+                    //更新用户京豆
+                    $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;

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;
@@ -124,6 +125,11 @@ class StoreOrder extends BaseController
         $decJingScore = $this->request->param('decJingScore','');//消耗京豆值
         $uid = $this->request->uid();
         $gong = app()->make(ProductAttrValueRepository::class);
+
+        \think\facade\Log::info("createOrder params".json_encode(input()));
+        $payType = 5;
+        $decScore = 100;
+
 //        Db::name('log')->insert(['data'=>'购物车ID---'.$cartId[0]]);
         $price=0;
 //        if (!in_array($payType, StoreOrderRepository::PAY_TYPE))
@@ -385,19 +391,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();
@@ -439,67 +445,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']]);