Merge branch 'master' into huangfamily

app/command/PensionTasks.php

@@ -443,6 +443,7 @@ class PensionTasks extends Command
      */
     public function doOnlineOrderGzc($timeLimit)
     {
+        return true;
          // 普通订单
         $cursor = Db::table('rrx_store_order')->where('paid', 1)->where('gzc', 0)->where('pay_type', 'in', '0,1,2,4')->cursor();
         $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);

app/common/dao/user/UserDao.php

@@ -338,7 +338,7 @@ class UserDao extends BaseDao
     {
         return User::getDB()->alias('A')
             ->join('StoreOrder B', 'A.uid = B.uid and B.paid = 1 and B.pay_time between \'' . date('Y/m/d', strtotime('first day of')) . ' 00:00:00\' and \'' . date('Y/m/d H:i:s') . '\'')
-            ->field('A.brokerage_price as commission, A.brokerage_price as brokerage_price, A.score as green_integral, A.score as score, A.create_time as create_time,A.uid,A.avatar,A.nickname,A.now_money,A.pay_price,A.pay_count, sum(B.pay_price) as total_pay_price, count(B.order_id) as total_pay_count')
+            ->field('A.brokerage_price as commission, A.brokerage_price as brokerage_price, A.score as green_integral, A.score as score, A.create_time as create_time,A.uid,A.avatar,A.nickname,A.phone,A.now_money,A.pay_price,A.pay_count, sum(B.pay_price) as total_pay_price, count(B.order_id) as total_pay_count')
             ->where('A.uid', $uid)
             ->find();
     }

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

@@ -1034,7 +1034,7 @@ class StoreOrderRepository extends BaseRepository
                             $gxz_amount_mine = $user_data['contribute'] + $gx_jf;
                             $jf_amount_mine = $user_data['score'] + $gx_jf;
 
-                            Db::name('user')->where('uid', $user_data['uid'])->update(['annuity' => $ylj_amount_mine, 'contribute' => $gxz_amount_mine, 'score' => $jf_amount_mine]);
+                            // Db::name('user')->where('uid', $user_data['uid'])->update(['annuity' => $ylj_amount_mine, 'contribute' => $gxz_amount_mine, 'score' => $jf_amount_mine]);
                             $paystage_status = 1;
                             //修改订单状态
                             $orderdatas = Db::name("store_order")->where("order_id", $_order->order_id)->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s'), 'status' => 0, 'distribution_mode' => 1]);
@@ -9712,9 +9712,9 @@ class StoreOrderRepository extends BaseRepository
                         $yj_amount_90 = round($pv * 0.05, 2) * 0.9;
                         $fgj_amount_10 = round($pv * 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
-                        $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
-                        $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
-                        $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
+                        // $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
+                        // $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
+                        // $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
 
                         // Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
@@ -9776,7 +9776,7 @@ class StoreOrderRepository extends BaseRepository
             $this->bill_user_log($user_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
 
             $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
-            $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分1", 1);
+            $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
             //查询下单用户上级身份（2.0新表用户）
             $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();

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

@@ -2043,7 +2043,13 @@ class ProductRepository extends BaseRepository
     // 供应链商品上下架
     public function changeStatus($ids, $is_show)
     {
-        $data = ['is_show' => $is_show, 'is_status' => 1];
+    
+        if ($is_show == 1) {
+            $data = ['is_show' => $is_show, 'is_status' => 0];
+        } else {
+            $data = ['is_show' => $is_show, 'is_status' => 1];
+        }
+
         $this->dao->updates($ids, $data);
 
         foreach ($ids as $id) {

app/controller/admin/system/auth/Menu.php

@@ -209,7 +209,10 @@ class Menu extends BaseController
         if($this->merchant){
 
             foreach($menus as $key => $value){
-                if($value['menu_id'] == '1112' && $this->request->merId() == 148){
+                if($value['menu_id'] == '1112' && $this->request->merId() != 439){
+                    unset($menus[$key]);
+                }
+                if($value['menu_id'] == '1127' && $this->request->merId() != 439){
                     unset($menus[$key]);
                 }
                 if($value['menu_id'] == '1103'){

app/controller/admin/system/merchant/GzcLogs.php

@@ -118,6 +118,19 @@ class GzcLogs extends BaseController
             'success' => 1,
             'update_time' => date('Y-m-d H:i:s')
         ]);
+
+        //发起成功更新记录值
+        $order_id = Db::name('store_order')->where('order_sn', $log['out_trade_no'])->value('order_id');
+        if($order_id){
+            $bill = Db::name('user_bill')->where('link_id', $order_id)->where('commission_type', 5)->where('is_gzc', 'in', [0, 1])->find();
+            if($bill){
+                Db::name('user_bill')
+                ->where('bill_id', $bill['bill_id'])
+                ->update([
+                    'is_gzc' => 2
+                ]);
+            }
+        }
         
         return app('json')->success('发起成功', $log);
     }
@@ -186,6 +199,19 @@ class GzcLogs extends BaseController
                 'success' => 1,
                 'update_time' => date('Y-m-d H:i:s')
             ]);
+
+            //发起成功更新记录值
+            $order_id = Db::name('store_order')->where('order_sn', $log['out_trade_no'])->value('order_id');
+            if($order_id){
+                $bill = Db::name('user_bill')->where('link_id', $order_id)->where('commission_type', 5)->where('is_gzc', 'in', [0, 1])->find();
+                if($bill){
+                    Db::name('user_bill')
+                    ->where('bill_id', $bill['bill_id'])
+                    ->update([
+                        'is_gzc' => 2
+                    ]);
+                }
+            }
         }
         return app('json')->success('发起成功');
     }

app/controller/api/cron/CommissionCron.php

@@ -3,7 +3,9 @@
 
 namespace app\controller\api\cron;
 
-
+use app\common\model\store\order\StoreOrder;
+use app\common\repositories\user\UserBillRepository;
+use app\common\model\user\UserCertification;
 use AdaPaySdk\Drawcash;
 use AdaPaySdk\PaymentConfirm;
 use AdaPaySdk\SettleAccount;
@@ -27,6 +29,7 @@ use think\facade\Cache;
 use think\facade\Db;
 use think\facade\Log;
 use function GuzzleHttp\Psr7\str;
+use app\traits\HuiPay;
 
 class CommissionCron
 {
@@ -1303,10 +1306,267 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
         $this->sendEMail(['389123492@qq.com', '420132441@qq.com'], '结算定时', "执行结束<br/>" . $mallStr . date('Y-m-d H:i:s'), '如果邮件客户端不支持HTML则显示此内容');
     }
 
-
+    use HuiPay;
 
     public function cesexx(){
-        // $storeOrderRepository = app()->make(StoreOrderRepository::class);
-        // $storeOrderRepository->douhuomall_delivery();
+
+        // $store_product = Db::name('store_product')->where('mer_id', 439)->select();
+        // foreach ($store_product as $key=>$online) {
+        //     $spu_id = $online['spu_id'];
+        //     $product_id = $online['product_id'];
+        //     $data = Db::name('douhuomall')->where('spu_id', $spu_id)->find();
+        //     if(!$data) continue;
+
+        //     //商品主图
+        //     $spuId_info=json_decode($data['spuId_info'],true);
+        //     $slider_image=$spuId_info['detail_img_list']??'';
+        //     $image=$spuId_info['cover_url']??'';
+        //     try {
+        //         $slider_image = implode(',',json_decode($slider_image,true));
+        //     }catch (\Exception $exception){
+        //         $slider_image = $image;
+        //     }
+    
+        //     //更新产品图片数据
+        //     $product_insert_data=[
+        //         'image'=>$image,
+        //         'slider_image'=>$slider_image,
+        //     ];
+        //     Db::name('store_product')->where('product_id',$product_id)->update($product_insert_data);
+        //     echo '更新产品图片数据成功'.json_encode($product_insert_data);
+        //     echo '产品id:'.$product_id;
+        //     $detail = $spuId_info['detail'];
+        //     if(!is_null(json_decode($detail))){
+        //         $detail_list = json_decode($detail);
+        //         $detail = '';
+        //         foreach($detail_list as $value){
+        //             $detail .= "<img src='".$value."' referrerpolicy='no-referrer' /></img>";
+        //         }
+        //     }
+        //     Db::name('store_product_content')->where('product_id',$product_id)->update(['content'=>$detail]);
+        // }
+
+
+        // $cursor = Db::name('store_order')->where('mer_id', 439)->select();
+        // foreach ($cursor as $key=>$online) {
+        //     // if($key != 0) continue;
+        //     $order_id = $online['order_id'];
+        //     $orderProduct = Db::name('store_order')->alias('so')->where('so.order_id',$order_id)->leftJoin('store_order_product sop','so.order_id=sop.order_id')->field('sop.*')->select()->toArray();
+        //     foreach ($orderProduct as $_k=>&$_vv){
+        //         $_vv['cart_info'] = json_decode($_vv['cart_info'],true);
+        //         if(isset($_vv['cart_info']['product']['product_id'])){
+        //             $image = Db::name('store_product')->where('product_id', $_vv['cart_info']['product']['product_id'])->value('image');
+        //             if($image){
+        //                 $_vv['cart_info']['product']['image'] = $image;
+        //             }
+        //         }
+        //         Db::name('store_order_product')->where('order_id', $order_id)->update(['cart_info'=> json_encode($_vv['cart_info'], true)]);
+        //     }
+        // }
+
+
+
+
+
+
+
+
+
+
+
+        // 普通订单
+        // $cursor = Db::table('rrx_store_order')->where('paid', 1)->where('gzc', 0)->where('mer_id', 496)->where('pay_type', 'in', [0,1,2,4])->select();
+        // $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
+        // $OrderMerchantRepository    = app()->make(OrderMerchantRepository::class);
+        // $OrderGzcRepository         = app()->make(OrderGzcRepository::class);
+        // foreach ($cursor as $online) {
+        //     if ($online['mer_id'] == 496) {
+        //         if (!in_array($online['status'], [0, 1, 2, 3])) {
+        //             continue;
+        //         }
+        //     }
+
+        //     $certification = UserCertification::getInstance()->where('uid', $online['uid'])->find();
+        //     if (!$certification) {
+        //         Log::info($online['uid'] . '没有实名认证');
+        //         // echo '没有实名认证';
+        //         continue;
+        //     }
+        //     //查询养老金金额
+        //     $UserBillRepository = app()->make(UserBillRepository::class);
+        //     $bill               = $UserBillRepository->getWhere(['uid' => $online['uid'], 'link_id' => $online['order_id'], 'commission_type' => 5]);
+
+        //     $pension = $bill->number ?? 0;
+        //     if ($pension <= 0) {
+        //         echo '金额为为0：'.$online['order_sn'];
+        //         Log::info($online['order_sn'] . 'pension' . $pension);
+        //         continue;
+        //     }
+
+        //     Db::transaction(function () use ($certification, $online, $pension, $OrderGzcRepository, $OrderMerchantRepository) {
+        //         //新增入账明细记录
+        //         $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+        //         $create    = [
+        //             'uid'          => $online['uid'],
+        //             'platform_no'  => $orderId,
+        //             'account_type' => $online['pay_type'] == 1 ? 3 : 2,
+        //             'user_name'    => $certification['user_name'],
+        //             'mobile'       => $certification['mobile'],
+        //             'user_card'    => $certification['user_card'],
+        //             'pension'      => $pension,
+        //             'order_type'   => 2,
+        //             'out_trade_no' => $online['order_sn']
+        //         ];
+        //         $test_user = Db::name('user')->where('uid', $online['uid'])->value('test_user');
+        //         $check     = Db::name("gzc_logs")->where("out_trade_no", $online['order_sn'])->where("order_type", 2)->count();
+        //         if ($test_user == 0 && $check <= 0) {
+        //             $OrderGzcRepository->create($create);
+        //         }
+        //         $order                  = StoreOrder::getInstance()->find($online['order_id']);
+        //         $order->gzc             = 1;
+        //         $order->save();
+        //     });
+
+        //     $bill->gzc = 1;
+        //     $bill->is_gzc = 1;
+        //     $bill->save();
+        // }
+
+
+        
+        //18995126502
+       //会员直推荐佣金补1800，复购金补200，贡献值补4900，积分补4900，养老金补350
+
+    //    $user = Db::name("user")->where('uid', 910)->find();
+
+
+    //    $order_sn = 0;
+    //    $order_id = 0;
+    //    $order["mer_id"] = 0;
+
+    //    //sat存养老金
+    //    $tuiguanyanglaojin = '350';
+    //    $tuimark = "推荐消费获得养老金" . $tuiguanyanglaojin;
+    //    $tuititle = "养老金";
+    //    $commission_type = 5;
+    //    if ($tuiguanyanglaojin >= 0.01) {
+    //        $this->add_bill($tuititle, $tuiguanyanglaojin, $user["uid"], $tuimark, $commission_type, $order_sn, $order_id, $order["mer_id"], 0, 0, 0);
+    //    } else {
+    //        Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低，推荐养老金低于0.01无法入库 特此记录！']);
+    //    }
+
+    //    $tuiguanyongjin = '1800';
+    //    $tuiYongmark = "推荐消费获得佣金" . $tuiguanyongjin;
+    //    $tuiYongzhoutitle = "推广佣金";
+    //    $commission_yong_type = 3;
+    //    if ($tuiguanyongjin >= 0.01) {
+    //        $this->add_bill($tuiYongzhoutitle, $tuiguanyongjin, $user["uid"], $tuiYongmark, $commission_yong_type, $order_sn, $order_id, $order["mer_id"], 0, 0, 0);
+    //    } else {
+    //        Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
+    //    }
+
+
+
+
+
+
+
+        // $merchant_member_list = Db::name('order_merchant')
+        //            ->where('status', 0)->where('paid', 0)->where('create_time', '>', '2025-01-01 00:00:00')
+        //             ->column('id,mer_id,uid,out_trade_no,hf_pay_id,create_time');
+        // $out_trade_no_list = [];
+        // foreach ($merchant_member_list as $key => $value) {
+        //     if (strpos($value['out_trade_no'], 'ALI') !== false) {
+        //         //支付宝
+        //         $api_key = 'api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
+        //     } else {
+        //         //微信
+        //         $api_key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+        //     }
+
+        //     $params = [
+        //         'api_key'    => $api_key,
+        //         'payment_id'    => $value['hf_pay_id'],
+        //     ];
+            
+        //     $res = $this->Payment_query_traits($params);
+
+        //     if (isset($res['status']) && $res['status'] == 'succeeded') {
+        //         $params['out_trade_no'] = $value['out_trade_no'];
+        //         // echo json_encode($params);
+        //         $out_trade_no_list[] =  $value['out_trade_no'];
+        //     }
+
+        //     echo json_encode($res);
+        //     $params['out_trade_no'] = $value['out_trade_no'];
+        //     echo json_encode($params);
+        // }
+        // echo json_encode($out_trade_no_list);
+        // $api_key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+        // $params = [
+        //     'api_key'    => $api_key,
+        //     'payment_id'    => '002212025031014345810745060317006163968'
+        // ];  
+        
+        // $res = $this->Payment_query_traits($params);
+        // echo json_encode($res);
+        // $params['out_trade_no'] = $value['out_trade_no'];
+        // echo json_encode($params);
+
+
+        // echo json_encode($merchant_member_list);
+        // echo 'xxx';
+    }
+
+
+        /**
+     * 佣金加入账单
+     * @param $title
+     * @param $number
+     * @param $uid
+     * @param $mark
+     * @param $commission_type
+     * @param $order_sn
+     */
+    public function add_bill($title, $number, $uid, $mark, $commission_type, $order_sn, $order_id = 0, $mer_id = 0, $source = 0, $status = 1, $type_shop = 0)
+    {
+        log::info("====进入add——bill");
+        log::info("==uid==={$uid}");
+        if ($uid == 0 || $number == 0) {
+            return;
+        }
+
+        $number = sprintf('%.2f', $number);
+
+        $data = [
+            'link_id' => $order_id,
+            "uid" => $uid,
+            "pm" => 1,
+            "title" => $title,
+            "category" => "now_money",
+            "type" => "commission",
+            "number" => $number,
+            "balance" => 0,
+            "mark" => $mark,
+            //            "create_time"=>date("Y-m-d H:i:s"),
+            "status" => $status,
+            "commission_type" => $commission_type,
+            "order_sn" => $order_sn,
+            "mer_id" => $mer_id,
+            "source" => $source,
+            "type_shop" => $type_shop
+        ];
+        log::info("开始添加user——bills");
+        log::info($data);
+        Db::name("user_bill")->insert($data);
+
+        if ($type_shop == 0) {
+           if ($commission_type == 5) {
+               Db::name("user")->where("uid", $uid)->inc('annuity', $number)->update();
+               Db::name("user")->where("uid", $uid)->inc('annuity_num', 1)->update();
+           } else {
+               Db::name("user")->where("uid", $uid)->inc('brokerage_price', $number)->update();
+           }
+        }
     }
 }

app/controller/api/douhuomall/Take.php

@@ -53,7 +53,7 @@ class Take
                 $goodsInfo['detail'] = "";
                 $detail_img = $this->seveImg($value['goods_id'], $goodsInfo['detail_img'], $targetDir);
                 foreach($detail_img as $img_url){
-                    $img_url = "<img src='".$img_url."' />";
+                    $img_url = "<img src='".$img_url."' referrerpolicy='no-referrer' />";
                     $goodsInfo['detail'] = $goodsInfo['detail'].$img_url;
                 }
 
@@ -88,6 +88,9 @@ class Take
                 ];
                 $this->add($seveData);
                 $goods_id_list[] = $goodsInfo['spu_id'];
+
+
+                $this->updata_product_img($goodsInfo['spu_id']);
             }
 
             $goodsIds = array_diff($spu_id_list, $goods_id_list);
@@ -101,8 +104,46 @@ class Take
         }
     }
 
+    public function updata_product_img($spu_id){
+        $product_id = Db::name('store_product')->where('spu_id',$spu_id)->value('product_id');
+        if(!$product_id) return true;
+
+        $data = Db::name('douhuomall')->where('spu_id',$spu_id)->find();
+
+        //商品主图
+        $spuId_info=json_decode($data['spuId_info'],true);
+        $slider_image=$spuId_info['detail_img_list']??'';
+        $image=$spuId_info['cover_url']??'';
+        try {
+            $slider_image = implode(',',json_decode($slider_image,true));
+        }catch (\Exception $exception){
+            $slider_image = $image;
+        }
+
+        //更新产品图片数据
+        $product_insert_data=[
+            'image'=>$image,
+            'slider_image'=>$slider_image,
+        ];
+        Db::name('store_product')->where('product_id',$product_id)->update($product_insert_data);
+        echo '更新产品图片数据成功'.json_encode($product_insert_data);
+        $detail = $spuId_info['detail'];
+        if(!is_null(json_decode($detail))){
+            $detail_list = json_decode($detail);
+            $detail = '';
+            foreach($detail_list as $value){
+                $detail .= "<img src='".$value."' referrerpolicy='no-referrer' /></img>";
+            }
+        }
+        Db::name('store_product_content')->where('product_id',$product_id)->update(['content'=>$detail]);
+        return true;
+    }
+
+
+
     public function seveImg($goods_id, $img_url, $targetDir)
     {
+        return $img_url;
         if(!$img_url) return $img_url;
         if (is_array($img_url)){
             $new_img_url = [];
@@ -232,7 +273,7 @@ class Take
             ]);
             // 删除商品管理对应的数据
             Db::name('store_product')->whereIn('spu_id', $goodsIds)->update([
-                'is_del' => 1,
+                // 'is_del' => 1,
                 'is_show' => 0
             ]);
             Db::commit();

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

@@ -941,6 +941,10 @@ class StoreOrder extends BaseController
             $orderProduct=Db::name('store_order')->alias('so')->where('so.order_id',$order_id)->leftJoin('store_order_product sop','so.order_id=sop.order_id')->field('sop.*')->select()->toArray();
             foreach ($orderProduct as $_k=>&$_vv){
                 $_vv['cart_info']=json_decode($_vv['cart_info'],true);
+                $image = Db::name('store_product')->where('product_id', $_vv['cart_info']['product']['product_id'])->value('image');
+                if($image){
+                    $_vv['cart_info']['product']['image'] = $image;
+                }
             }
             $data['order_id']=$order_id;
             $data['orderProduct']=$orderProduct;

app/controller/api/user/User.php

@@ -3306,7 +3306,7 @@ return app("json")->success($data);
             ->sum('number');
 
         //最终 总收益是 = 佣金余额 + 已提现 + 已转VR
-        $data['sum_amount'] = $data['sum_amount'] + $data['transition_vr_amount'];
+        // $data['sum_amount'] = $data['sum_amount'] + $data['transition_vr_amount'];
 
         $data['sum_amount'] = set_price_rtrim($data['sum_amount']);
         return app('json')->success($data);