Merge branch 'master' into huangfamily

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -836,65 +836,63 @@ class OrderMerchantRepository extends BaseRepository
         $unionUser = $unionUsersRepository->getWhere(['unionid' => $order->pay_user_id]);
         $userOfflineRechargeRepository = app()->make(UserOfflineRechargeRepository::class);
         if ($user) {
-//            $order->binds = 1;
-//            $order->uid = $user->uid;
-//            $order->save();
             Db::name('order_merchant')->where('id', $order->id)->update(['binds' => 1, 'uid' => $user->uid]);
             //锁定商户
             if (!$user->mer_id || !$user->locktime) {
-                // $user->mer_id = $order->mer_id;
-                // $user->save();
+                //锁住
                 Db::name('user')->where('uid', $user->uid)->update(['mer_id' => $order->mer_id, 'locktime' => date('Y-m-d H:i:s')]);
 
-                $mer_fanyongbili = merchantConfig($order->mer_id, 'base_commission');
-                //如果商户返佣比例设置的是0怎查系统设设置的分佣比例
-                if ($mer_fanyongbili == 0) {
-                    $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
-                }
-                //如果系统设置的是0就不执行！
-                if ($mer_fanyongbili == 0) {
-                    Db::name('log')->insert(['data' => '订单号：' . $order->order_sn . ' 订单因商家、平台没有设置返佣比例无任何奖励特此记录！']);
-                    return '';
-                }
-                $order_sn = $order->order_sn ?? '';
-                $order_id = $order->order_id ?? '';
-                //可分总佣金
-                $divisible_commission = bcmul($order->money, bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
-                $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
-
-                //商户锁客收益：PV的5%==14元X5%=0.7元 （加入到用户佣金，可以从用户佣金中提现，商户显示锁客收益总额）
+                //获取锁客商户的uid
                 $mer_data = Db::name('merchant')->where('mer_id', $order->mer_id)->field('uid,mer_id')->find();
                 $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
 
-                $suo_commission = bcmul($pv, '0.5', 2);
-                if ($suo_commission >= 0.01) {
-                    $mark = "用户获得商户锁客收益" . $suo_commission . '佣金';
-                    $title = "佣金";
-                    $source = 1;
-                    $commission_type = 3;
-                    $this->add_bill($title, $suo_commission, $merchant_user->uid, $mark, $commission_type, $order_sn, $order_id, $order->mer_id, $source, 1);
-                } else {
-                    Db::name('log')->insert(['data' => '订单号：' . $order->order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
+                //跨店锁客分发
+                $orders = OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->where('status', 1) ->whereNotIn('mer_id', [$order->mer_id])->where('binds',0)->select();
+                foreach ($orders as $kd_order) {
+                    $pv = Db::name('user_sign_gongxian')->where('mer_id', $kd_order->mer_id)->where('order_id', $kd_order->id)->value('pv');//拿到原来的pv值记录
+                    //商户锁客收益：PV的5%==14元X5%=0.7元 （加入到用户佣金，可以从用户佣金中提现，商户显示锁客收益总额）
+                    $suo_commission = bcmul($pv, '0.5', 2);
+                    if ($suo_commission >= 0.01 && $pv) {
+                        $mark = "用户获得商户锁客跨店收益" . $suo_commission . '佣金';
+                        $title = "商户跨店佣金";
+                        $source = 1;
+                        $commission_type = 3;
+                        $this->add_bill($title, $suo_commission, $merchant_user->uid, $mark, $commission_type, $kd_order->order_sn, $kd_order->id, $kd_order->mer_id, $source, 1);
+                    } else {
+                        Db::name('log')->insert(['data' => '订单号：' . $kd_order->order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，商户锁客跨店佣金低于0.01无法入库 特此记录！']);
+                    }
                 }
-        
-
-    
-
-                // $mer_uid = Db::name('merchant')->where('mer_id', $order->mer_id)->value('uid');
-                //商户每锁定一个顾客获得300积分
-                // $userRepository->sign_add($mer_uid, systemConfig('mer_score'), 1, '到店锁定一个顾客赠送积分', '', '', $order->id,1,'order_merchant');
-//                Db::name('user')->where('uid',$mer_uid)->inc('score', systemConfig('mer_score'))->update();
-//                $ins_data['uid'] = $mer_uid;
-//                $ins_data['reward_socre'] = systemConfig('mer_score');
-//                $ins_data['addtime'] = time();
-//                $ins_data['status'] = 1;
-//                $ins_data['order_id'] = $order->id;
-//                $ins_data['mark'] = '到店锁定一个顾客赠送积分';
-//                Db::name('user_sign_score')->insert($ins_data);
-
 
-                //环信im处理
-//                $this->hxim($user->uid,$order->mer_id);
+                // $mer_fanyongbili = merchantConfig($order->mer_id, 'base_commission');
+                // //如果商户返佣比例设置的是0怎查系统设设置的分佣比例
+                // if ($mer_fanyongbili == 0) {
+                //     $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
+                // }
+                // //如果系统设置的是0就不执行！
+                // if ($mer_fanyongbili == 0) {
+                //     Db::name('log')->insert(['data' => '订单号：' . $order->order_sn . ' 订单因商家、平台没有设置返佣比例无任何奖励特此记录！']);
+                //     return '';
+                // }
+                // $order_sn = $order->order_sn ?? '';
+                // $order_id = $order->order_id ?? '';
+                // //可分总佣金
+                // $divisible_commission = bcmul($order->money, bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
+                // $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
+
+                // //商户锁客收益：PV的5%==14元X5%=0.7元 （加入到用户佣金，可以从用户佣金中提现，商户显示锁客收益总额）
+                // $mer_data = Db::name('merchant')->where('mer_id', $order->mer_id)->field('uid,mer_id')->find();
+                // $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
+
+                // $suo_commission = bcmul($pv, '0.5', 2);
+                // if ($suo_commission >= 0.01) {
+                //     $mark = "用户获得商户锁客跨店收益" . $suo_commission . '佣金';
+                //     $title = "商户跨店佣金";
+                //     $source = 1;
+                //     $commission_type = 3;
+                //     $this->add_bill($title, $suo_commission, $merchant_user->uid, $mark, $commission_type, $order_sn, $order_id, $order->mer_id, $source, 1);
+                // } else {
+                //     Db::name('log')->insert(['data' => '订单号：' . $order->order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
+                // }
             }
 
             $userOfflineRechargeRepository->paySuccess($order->id, $order->out_trade_no, $user->uid, $order->mer_id, $order->money, $order->give_money, $order->pension, $order->available, $order->pay_user_id);

app/common/repositories/store/product/ProductAttrValueRepository.php

@@ -113,32 +113,29 @@ class ProductAttrValueRepository extends BaseRepository
             $address_id = explode(',',$address_code_list);
             log::info($address_id);
             $address_id = end($address_id);
-//            $address_id = $address_id[0];
         }
         $sku = [[
             'sku_id'=>$sku_id,
             'num'=>$num
         ]];
         //查询商品是否有货
-        $stock = GongApiRequest::stock($sku_id,$address_id,$num);
-        if($stock != '有货'){
-            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品无货']);
-            if($delivery){
-                return false;
-            }else{
-                return ['code'=>-1,'message'=>'此商品无货'];
-//                throw new AuthException('此商品无货');
-            }
-        }
+        // $stock = GongApiRequest::stock($sku_id,$address_id,$num);
+        // if($stock != '有货'){
+        //     // Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品无货']);
+        //     if($delivery){
+        //         return false;
+        //     }else{
+        //         return ['code'=>-1,'message'=>'此商品无货'];
+        //     }
+        // }
         //查询商品上下架
         $goods_status = GongApiRequest::goods_status($spu_id);
-        if(!isset($goods_status[0]['status']) || $goods_status[0]['status'] != 1){
+        if(!isset($goods_status['status']) || $goods_status['status'] != 1){
             Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品已下架'.json_encode($goods_status)]);
             if($delivery){
                 return false;
             }else{
                 return ['code'=>-1,'message'=>'此商品已下架'];
-//                throw new AuthException('此商品已下架');
             }
         }
         //查询库存
@@ -149,7 +146,6 @@ class ProductAttrValueRepository extends BaseRepository
                 return false;
             }else {
                 return ['code'=>-1,'message'=>'此商品规格无货'];
-//                throw new AuthException('此商品规格无货');
             }
         }
         //查询运费
@@ -158,8 +154,7 @@ class ProductAttrValueRepository extends BaseRepository
             if($delivery){
                 return false;
             }else {
-                return ['code'=>-1,'message'=>'此商品下架'];
-//                throw new AuthException('此商品下架');
+                return ['code'=>-1,'message'=>'此商品不支持该地区'];
             }
         }
         return true;

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -177,7 +177,7 @@ class UserOfflineRechargeRepository extends BaseRepository
 
 
                     //同步后返佣
-                    $userRepository = app()->make(OrderMerchantRepository::class);
+                    $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
                     $order_data = [
                         'order_sn' => $order->out_trade_no,
                         'order_id' => $order->id,
@@ -186,8 +186,15 @@ class UserOfflineRechargeRepository extends BaseRepository
                         'mer_id' => $order->mer_id
                     ];
                     $user = Db::name('user')->where('uid', $unionUser->uid)->find();
-                    $userRepository->feidacang_fenyong($user, $order_data, 0);
-                    $userRepository->feidacang_fenyong_mer($user, $order_data, 0);
+                    $OrderMerchantRepository->feidacang_fenyong($user, $order_data, 0);
+                    $OrderMerchantRepository->feidacang_fenyong_mer($user, $order_data, 0);
+
+                    //锁客
+                    $flag = 1;
+                    $order = (object)$order;
+                    $userRepository = app()->make(UserRepository::class);
+                    $user = $userRepository->getOne(['uid' => $unionUser->uid]);
+                    $userRepository->doBind($user, $order, $flag);
 
                     OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->update(['uid' => $unionUser->uid, 'binds' => 1]);
                 }

app/controller/admin/gong/Goods.php

@@ -319,7 +319,7 @@ class Goods extends BaseController
                     'stock'=>100,
                     'cost_price'=>$v['cost_price'],
                     'extension_one'=>5,
-                    'gong_sku_id'=>$v['sku_sn'],
+                    'gong_sku_id'=>$v['sku_id'],
                     'gong_mer_profit' => $v['profit'],
                     'gong_pension' => $v['yanglaojin'],
                     'gong_market_price' => $v['market_price'],
@@ -356,7 +356,7 @@ class Goods extends BaseController
                     'stock'=>100,
                     'cost_price'=>$v['cost_price'],
                     'extension_one'=>5,
-                    'gong_sku_id'=>$v['sku_sn'],
+                    'gong_sku_id'=>$v['sku_id'],
                     'gong_mer_profit' => $v['profit'],
                     'gong_pension' => $v['yanglaojin'],
                     'gong_market_price' => $v['market_price'],

app/controller/merchant/gong/Goods.php

@@ -315,11 +315,11 @@ class Goods extends BaseController
                     'cost'=>$v['cost_price'],
                     'ot_price'=>$v['retail_price'],
                     'price'=>$v['market_price'],
-                    'unique'=>$ProductRepository->setUnique($id,$v['sku_sn'],0),
+                    'unique'=>$ProductRepository->setUnique($id,$v['sku_id'],0),
                     'stock'=>100,
                     'cost_price'=>$v['cost_price'],
                     'extension_one'=>5,
-                    'gong_sku_id'=>$v['sku_sn'],
+                    'gong_sku_id'=>$v['sku_id'],
                     'gong_mer_profit' => $v['profit'],
                     'gong_pension' => $v['yanglaojin'],
                     'gong_market_price' => $v['market_price'],
@@ -352,11 +352,11 @@ class Goods extends BaseController
                     'cost'=>$v['cost_price'],
                     'ot_price'=>$v['retail_price'],
                     'price'=>$v['market_price'],
-                    'unique'=>$ProductRepository->setUnique($id,$v['sku_sn'],0),
+                    'unique'=>$ProductRepository->setUnique($id,$v['sku_id'],0),
                     'stock'=>100,
                     'cost_price'=>$v['cost_price'],
                     'extension_one'=>5,
-                    'gong_sku_id'=>$v['sku_sn'],
+                    'gong_sku_id'=>$v['sku_id'],
                     'gong_mer_profit' => $v['profit'],
                     'gong_pension' => $v['yanglaojin'],
                     'gong_market_price' => $v['market_price'],

app/traits/GongApiRequest.php

@@ -198,19 +198,22 @@ trait GongApiRequest
     }
 
     /**
-     * 查询商品上下架(未更改)
+     * 查询商品上下架
      * @param string $spu_id 商品spu_id
      * @return array|boolean
      * @author lin
      * @created 2022年5月19日11:46:54
      * */
     public static function goods_status($spu_id){
-        $url = '/api/goods/status';
+        $url = '/api_v2/Goods/getGoodsDetail';
         $body = [
             'access_token' => self::access_token(),
-            'spu_id' => $spu_id
+            'goods_id' => $spu_id,
         ];
         $res = self::curl_post(self::$path.$url,$body);
+        if ($res['error_code'] == 2001) {
+            return $res;
+        }
         if($res['error_code'] == 0){
             return $res['result'];
         }