选品删除&分润比例默认&选品图片调整

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

@@ -1290,7 +1290,13 @@ class OrderMerchantRepository extends BaseRepository
         $mer_fanyongbili = merchantConfig($order['mer_id'], 'base_commission');
         //如果商户返佣比例设置的是0怎查系统设设置的分佣比例
         if ($mer_fanyongbili == 0) {
-            $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
+            Db::name('system_config_value')->insert([
+                'config_key'  => 'base_commission',
+                'value'       => (int)5,
+                'mer_id'      => $order['mer_id'],
+            ]);
+            $mer_fanyongbili = 5;
+            // $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
         }
         //如果系统设置的是0就不执行！
         if ($mer_fanyongbili == 0) {
@@ -1455,6 +1461,105 @@ class OrderMerchantRepository extends BaseRepository
 
 
 
+    //商户二维码收款返佣-补发推荐人
+    public function feidacang_fenyong_bufa($user, $order, $pay_status)
+    {
+        $userRepository = app()->make(UserRepository::class);
+        if ($pay_status == 1) {
+            return '';
+        }
+        $top_data = Db::name('user')->where('uid', $order['uid'])->field('spread_uid,mer_id')->find();
+        $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['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
+        $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
+
+        /**
+         * 各自的比例开始
+         */
+        //用户养老金比例30%
+        $yonghu_bili = '0.3';
+        //用户红包比例
+        $yonghu_hongbao = '0.45';
+        //用户推荐人养老金比例
+        $yonghu_bili_tuijian = '0.05';
+        //用户推荐人，消费者的推荐人佣金
+        $yonghu_tuijian = $this->getUserGroupRate($user['user_group']);
+        //用户推荐人，消费者的推荐人复购金
+        $yonghu_fugou = '0.1';
+        /**
+         * 各自的比例结束
+         */
+
+        // 用户推荐人---------------------------------------------------------------------------------------------------------------
+
+        //用户推荐人可拿的养老金
+        $user_yanglaojin = bcmul($pv, $yonghu_bili_tuijian, 2);
+        if ($user_yanglaojin >= 0.01) {
+            $mark = "推荐人扫码消费获得养老金" . $user_yanglaojin;
+            $title = "养老金";
+            $source = 1;
+            $commission_type = 5;
+            $this->add_bill($title, $user_yanglaojin, $top_data["spread_uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], $source, 1);
+        } else {
+            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
+        }
+
+        //用户推荐人佣金
+        $tuijian_yongjin = bcmul($pv, $yonghu_tuijian, 2);
+        $tuijian_yongjin_90 = bcmul($tuijian_yongjin, '0.9', 2);
+        if ($tuijian_yongjin_90 >= 0.01) {
+            $mark = "推荐人扫码消费获得" . $tuijian_yongjin_90 . '佣金';
+            $title = "佣金";
+            $source = 1;
+            $commission_type = 3;
+            $this->add_bill($title, $tuijian_yongjin_90, $top_data["spread_uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], $source, 1);
+        } else {
+            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
+        }
+
+        //用户推荐人获得复购金佣金百分之10
+        $tuijian_fugou = bcmul($tuijian_yongjin, $yonghu_fugou, 2);
+        if ($tuijian_fugou >= 0.01) {
+            $bill = [
+                'uid'=>$top_data["spread_uid"],
+                'number'=>$tuijian_fugou,//数量
+                'status'=>1,//复购金状态1-有效 0-失效 -1待确认
+                'mark'=>"推荐人扫码消费赠送" . $tuijian_fugou . '复购金',//备注
+                'order_id'=>$order_id,//订单id
+                'surplus'=>0,//剩余
+                'order_type'=>0,//关联订单ID
+                'type'=>1,//复购金类型 :1赠送，2消耗
+                'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
+                'addtime'=>time(),
+            ];
+            Db::name('user_sign_fugou')->insert($bill);
+            $user_fugou = Db::name('user')->where('uid', $top_data["spread_uid"])->value('fugou');
+            $user_fugou = bcadd($user_fugou, (float)$tuijian_fugou,2);
+            Db::name('user')->where('uid', $top_data["spread_uid"])->update(['fugou'=>$user_fugou]);
+        } else {
+            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的复购金比例较低，复购金低于0.01无法入库 特此记录！']);
+        }
+    }
+
+
+
+
+
+
+
+
 
 
     //商户二维码收款商家返佣

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

@@ -2030,6 +2030,14 @@ class ProductRepository extends BaseRepository
         return true;
     }
 
+    // 供应链商品删除
+    public function changeDelete($ids)
+    {
+        $data = ['is_show' => 0, 'is_del' =>1];
+        $this->dao->update($ids, $data);
+    }
+
+
     // 供应链商品上下架
     public function changeStatus($ids, $is_show)
     {

app/controller/api/douhuomall/Take.php

@@ -60,6 +60,7 @@ class Take
                 //sku信息处理
                 $skuInfo = $goodsInfo['sku_list'];
                 foreach ($skuInfo as $k=>$v) {
+                    $skuInfo[$k]['img_url'] = $this->seveImg($value['goods_id'], $v['main_img'], $targetDir);//规格图片
                     $skuInfo[$k]['cost_price'] = bcadd($v['plat_price'], bcmul($v['plat_price'], 0.03, 2),2);//成本价格 原来进价的基础上加百分之3
                     $skuInfo[$k]['market_price'] = bcadd($skuInfo[$k]['cost_price'], bcmul($skuInfo[$k]['cost_price'], 0.2, 2),2);//销售价格  售价在成本价格的基础上加百分20
                     $skuInfo[$k]['profit'] = bcdiv($skuInfo[$k]['market_price'], $skuInfo[$k]['cost_price'], 2);
@@ -101,6 +102,7 @@ class Take
 
     public function seveImg($goods_id, $img_url, $targetDir)
     {
+        if(!$img_url) return $img_url;
         if (is_array($img_url)){
             $new_img_url = [];
             foreach ($img_url as $value) {

app/controller/merchant/store/product/Product.php

@@ -86,6 +86,14 @@ class Product extends BaseController
         return app('json')->success("修改成功");
     }
 
+
+    // 供应链商品删除
+    public function deleteXp($id) {
+        if (empty($id)) return app('json')->fail('请选择商品');
+        $this->repository->changeDelete($id,);
+        return app('json')->success('删除成功');
+    }
+
     // 供应链商品上下架
     public function changeShow() {
         $is_show = $this->request->param('is_show', 0);

app/controller/merchant/system/Merchant.php

@@ -220,8 +220,9 @@ class Merchant extends BaseController
         $merId = $this->request->merId();
         $data = Db::name('system_config_value')->where('config_key', $name)->where('mer_id', $merId)->value('value');
         if (!$data){
-            if ($name == 'shop_bonus_setting') {
-                return app('json')->success(['yanglao_rate' => 0, 'shop_bonus_rate' => 0]);
+            if ($name == 'base_commission') {
+                return app('json')->success(0);
+                // return app('json')->success(['yanglao_rate' => 0, 'shop_bonus_rate' => 0]);
             } else {
                 return app('json')->fail('配置不存在');
             }
@@ -246,16 +247,19 @@ class Merchant extends BaseController
         $value = input('value');
         if (!$name || !$value) return app('json')->fail('保存失败');
 
+        switch ($name){
+            case 'base_commission':
+                if ((int)$value < 5) {
+                    return app('json')->fail('商户让利比例最低5%');
+                }
+                if ((int)$value > 100) {
+                    return app('json')->fail('商户让利比例最高100%');
+                }
+                break;
+        }
 
         /** @var ConfigClassifyRepository $make */
         if (!in_array($name, ['base_commission'])) {
-            switch ($name){
-                case 'base_commission':
-                    if ((int)$value < 30) {
-                        return app('json')->fail('商户让利比例最低10%');
-                    }
-                    break;
-            }
             return app('json')->fail('只支持修改base_commission');
         }
         if(Db::name('system_config_value')->where('config_key', $name)->where('mer_id', $merId)->find()){

route/merchant.php

@@ -387,6 +387,7 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
             Route::get('gong_lst', '/gongProductLst')->name('gongStoreProductLst');
             Route::get('gong_lst_filter', '/getGongStatusFilter')->name('gongStoreProductLstFilter');
             Route::post('edit_price/:id', '/editPrice')->name('gongStoreProductEdit');
+            Route::post('delete_xp/:id', '/deleteXp')->name('gongStoreProductEdit');
             Route::post('change_show', '/changeShow')->name('gongStoreProductChangeShow');
         })->prefix('merchant.store.product.Product');