首次推送

app/common/dao/merchant/apply/MerchantContributeDao.php

@@ -0,0 +1,16 @@
+<?php
+namespace app\common\dao\merchant\apply;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\merchant\apply\MerchantContribute;
+
+class MerchantContributeDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return MerchantContribute::class;
+    }
+
+}
+

app/common/middleware/AdminTokenMiddleware.php

@@ -17,6 +17,7 @@ use crmeb\services\JwtTokenService;
 use Firebase\JWT\ExpiredException;
 use think\exception\ValidateException;
 use think\facade\Route;
+use think\Log;
 use think\Response;
 use Throwable;
 
@@ -31,6 +32,7 @@ class AdminTokenMiddleware extends BaseMiddleware
      */
     public function before(Request $request)
     {
+        \think\facade\Log::info('Midd_ko=>'.\GuzzleHttp\json_encode($request));
         $force = $this->getArg(0, true);
         try {
             $token = trim($request->header('X-Token'));

app/common/middleware/IpCheckMiddleware.php

@@ -29,7 +29,7 @@ class IpCheckMiddleware extends BaseMiddleware
         Log::info("IP".$ip);
         //判断是否在列表中
         if(!in_array($ip,$this->ipList)){
-            throw new ValidateException('IP非法');
+            throw new ValidateException('IP非法23');
         }
 
     }

app/common/model/merchant/apply/MerchantContribute.php

@@ -0,0 +1,18 @@
+
+<?php
+namespace app\common\model\merchant\apply;
+
+use app\common\model\BaseModel;
+
+class MerchantContribute extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'merchant_contribute';
+    }
+}

app/common/model/user/TeamValue.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\model\user;
+
+
+use app\common\model\BaseModel;
+
+class TeamValue extends BaseModel
+{
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    public static function tableName(): string
+    {
+        return 'team_value';
+    }
+
+
+}

app/common/repositories/merchant/apply/MerchantContributeRepository.php

@@ -0,0 +1,69 @@
+<?php
+ 
+namespace app\common\repositories\merchant\apply;
+
+use app\common\dao\merchant\apply\MerchantContributeDao;
+use app\common\repositories\BaseRepository;
+use think\facade\Db;
+
+/**
+ * Class MerchantContributeRepository
+ * @package app\common\repositories\merchant\apply
+ * @author php迷途小书童
+ * @created 2021/1/30 17:42
+ */
+class MerchantContributeRepository extends BaseRepository
+{
+    /**
+     * MerchantRepository constructor.
+     * @param MerchantContributeDao $dao
+     */
+    public function __construct(MerchantContributeDao $dao)
+    {
+        $this->dao = $dao;
+    }
+    /**  
+     * 获取单条信息
+     * @return array|\think\Model|null
+     * @author php迷途小书童
+     * @created 2021/1/16 10:45
+     */
+    public function getOne($where)
+    {
+        return ($this->dao->getWhere($where));
+    }
+
+    /**
+     * 查询列表
+     * 
+    */
+    public function queryList()
+    {
+        return Db::name('merchant_contribute')
+            ->field("id,contribute_name,ratio_start,ratio_end,jing_dou,contribute_value")
+            ->where('del_yn', 0)
+            ->order('id', 'ASC')
+            ->select();
+    }
+
+    public function deleteById($id)
+    {
+        return Db::name('merchant_contribute')
+            ->where('id', $id)
+            ->update(['del_yn'=>1]);
+    }
+
+    public function updateById($data, $id)
+    {
+        return Db::name('merchant_contribute')
+            ->where('id', $id)
+            ->update($data);
+    }
+
+    public function add($data)
+    {
+        return Db::name('merchant_contribute')
+            ->insert($data);
+    }
+}
+

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

@@ -0,0 +1,164 @@
+<?php
+/**
+ * @package merchant
+ * @Author: Conner
+ * @Date: 2025/1/10
+ */
+namespace app\common\repositories\store\product;
+
+use app\common\repositories\BaseRepository;
+use app\common\dao\store\product\ProductAttrValueDao as dao;
+use app\traits\GongApiRequest;
+use think\exception\ValidateException;
+use crmeb\exceptions\AuthException;
+use think\facade\Db;
+use think\facade\Log;
+
+/**
+ * Class ThirdPartyCategoryRepository
+ * @package app\common\repositories\store\product
+ * @Conner
+ */
+class ThirdPartyCategoryRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * ProductRepository constructor.
+     * @param dao $dao
+     */
+    public function __construct(dao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @Author:Qinii
+     * @Date: 2020/5/30
+     * @param int $id
+     * @return mixed
+     */
+    public function priceCount(int $id)
+    {
+       return  min($this->dao->getFieldColumnt('product_id',$id,'price'));
+    }
+
+    /**
+     * @Author:Qinii
+     * @Date: 2020/5/30
+     * @param int $id
+     * @return mixed
+     */
+    public function stockCount(int $id)
+    {
+        return  $this->dao->getFieldSum('product_id',$id,'stock');
+    }
+
+    /**
+     * @Author:Qinii
+     * @Date: 2020/5/30
+     * @param int|null $merId
+     * @param string $value
+     * @return bool
+     */
+    public function merUniqueExists(?int $merId,string $value)
+    {
+        return $this->dao->merFieldExists($merId,'unique',$value);
+    }
+
+    /**
+     * TODO
+     * @param $unique
+     * @return mixed
+     * @author Qinii
+     * @day 2020-08-05
+     */
+    public function getOptionByUnique($unique)
+    {
+        return  $this->dao->getFieldExists(null,'unique',$unique)->find();
+    }
+
+    /**
+     * TODO
+     * @param $productId
+     * @return mixed
+     * @author Lin
+     * @day 2021-04-14
+     */
+    public function getOptionByProductId($productId)
+    {
+        return  $this->dao->getFieldExists(null,'product_id',$productId)->select();
+    }
+
+    public function checkGong($product_id,$unique,$num,$uid,$addressId=0,$debug=false,$delivery=false){
+        if($debug){
+            return true;
+        }
+        $spu_id = Db::name('store_product') -> where('product_id',$product_id)->value('spu_id');
+
+        if($spu_id == ''){
+            return true;
+        }
+        $sku_id = Db::name('store_product_attr_value') -> where('unique',$unique) -> value('gong_sku_id');
+        $query = Db::name('user_address') -> where('uid',$uid);
+        if($addressId != 0){
+            $query -> where('address_id',$addressId);
+        }else{
+            $query -> where('is_default',1);
+        }
+        $address_code_list = $query -> value('code_list');
+        $address_id = '809';
+        if($address_code_list){
+            $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 != '有货'){
+            if($delivery){
+                return false;
+            }else{
+                return ['code'=>-1,'message'=>'此商品无货'];
+//                throw new AuthException('此商品无货');
+            }
+        }
+        //查询商品上下架
+        $goods_status = GongApiRequest::goods_status($spu_id);
+        if(!isset($goods_status[0]['status']) || $goods_status[0]['status'] != 1){
+            if($delivery){
+                return false;
+            }else{
+                return ['code'=>-1,'message'=>'此商品已下架'];
+//                throw new AuthException('此商品已下架');
+            }
+        }
+        //查询库存
+        $sku_stock = GongApiRequest::sku_stock(json_encode($sku),$address_id);
+        if(!isset($sku_stock[0]['stock']) || $sku_stock[0]['stock'] != '有货'){
+            if($delivery){
+                return false;
+            }else {
+                return ['code'=>-1,'message'=>'此商品规格无货'];
+//                throw new AuthException('此商品规格无货');
+            }
+        }
+        //查询运费
+        $sku_freight = GongApiRequest::freight($address_id,$sku);
+        if(!isset($sku_freight['freight'])){
+            if($delivery){
+                return false;
+            }else {
+                return ['code'=>-1,'message'=>'此商品下架'];
+//                throw new AuthException('此商品下架');
+            }
+        }
+        return true;
+    }
+}

app/controller/admin/merchant/MerchantContribute.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace app\controller\admin\merchant;
+use crmeb\basic\BaseController;
+use think\App;
+use app\common\repositories\merchant\apply\MerchantContributeRepository;
+
+class MerchantContribute extends BaseController
+{
+    /**
+     * @var MerchantContributeRepository
+     */
+    protected $repository;
+
+    /**
+     * MerchantContribute constructor.
+     * @param MerchantContributeRepository $repository
+     */
+    public function __construct(App $app,MerchantContributeRepository $repository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return mixed
+     * @author Qinii
+     */
+    public function list()
+    {
+        return app('json')->success($this->repository->queryList());
+    }
+
+    public function add()
+    {
+        $data = $this->request->params([
+            'contribute_name', 
+            'ratio_start', 
+            'ratio_end', 
+            'jing_dou',
+            'contribute_value'
+            ]);
+        $this->repository->add($data);
+        return  app('json')->success('添加成功');
+    }
+
+    public function edit()
+    {
+        $id = $this->request->id();
+        if(empty($id)){
+            return app('json')->fail('参数ID缺失');
+        }
+        $data = $this->request->params([
+            'contribute_name', 
+            'ratio_start', 
+            'ratio_end', 
+            'jing_dou',
+            'contribute_value'
+            ]);
+        $this->repository->updateById($data, $id);
+        return  app('json')->success('更新成功');
+    }
+
+    public function delete()
+    {
+        $id = $this->request->id();
+        if(empty($id)){
+            return app('json')->fail('参数ID缺失');
+        }
+        $this->repository->deleteById($data, $id);
+        return  app('json')->success('删除成功');
+    }
+}

app/controller/admin/user/TeamValue.php

@@ -0,0 +1,177 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020/6/23
+ *
+ * 
+ */
+
+namespace app\controller\admin\user;
+
+
+
+use app\common\dao\BaseDao;
+use app\common\model\system\admin\Log;
+use crmeb\basic\BaseController;
+
+use app\common\repositories\user\UserBillRepository;
+use think\console\command\make\Controller;
+use think\Request;
+
+class TeamValue extends  Controller
+{
+    protected $repository;
+    protected $request;
+
+    public function __construct(Request $request)
+    {
+        parent::__construct();
+        $this->request = $request;
+    }
+
+    /**
+     * 团队设置信息
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     *
+     *
+     */
+    public function getInfo()
+    {
+        $where = ['create_time'];
+        $info=\app\common\model\user\TeamValue::where('create_time >0')->find();
+      //  \think\facade\Log::info('ddddd');
+        $msg='成功';
+
+        return app('json')->success('',$info);
+       // echo 'eeeee';
+    }
+
+    /**
+     * 编辑团队设置信息
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function editInfo(){
+        $params=$this->request->params(['id','sum']);;
+        $info=\app\common\model\user\TeamValue::where('create_time >0')->find();
+        $res=$info->save(['sum'=>$params['sum']]);
+        if($res){
+            $msg='成功';
+        }else{
+            $msg="失败";
+        }
+        return app('json')->success($msg,$res);
+    }
+
+    public function type()
+    {
+        return app('json')->success($this->repository->type());
+    }
+
+
+    /*平台记录*/
+    public  function adminList(){
+        [$page, $limit] = $this->getPage();
+        $where = $this->request->params(['keyword', 'date', 'type']);
+        return app('json')->success($this->repository->getAdminList($where, $page, $limit));
+//        return app('json')->success($this->repository->getAdminList($where, $page, $limit));
+    }
+
+    public function excel()
+    {
+        $where = request()->params(['date']);
+        $params = request()->params(['commission_type', 'uid', 'status', 'phone', 'user_group', 'status']);
+        $commission_type_desc = '佣金统计';
+        if ($params['commission_type'] ?? 0 == 5) {
+            $commission_type_desc = '养老金统计';
+        }
+        $data = [];
+        //商户ID
+        $mer_id = 0;
+        $query = Db::name('user_bill')
+            ->alias('ub')
+            ->leftJoin('user u', 'u.uid=ub.uid')
+            ->when($mer_id, function ($query) use ($mer_id) {
+                $query->where('ub.mer_id', $mer_id);
+            })
+            ->when(isset($params['commission_type']) && $params['commission_type'] == 5, function ($query) use ($params) {
+                // 养老金
+                $query->where('ub.commission_type', 5);
+            }, function ($query) use ($params) {
+                // 非养老金
+                $query->whereIn('ub.commission_type', [3, 16, 14, 10, 12, 20, 15, 7, 19]);
+            })
+            ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+                $query->where('ub.uid', $params['uid']);
+            })
+            ->when(isset($params['commission_type']) && $params['commission_type'] != '', function ($query) use ($params) {
+                $query->where('ub.commission_type', $params['commission_type']);
+            })
+            ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
+                $query->where('ub.status', $params['status']);
+            })
+            ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+                $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+            })
+            ->when(isset($params['user_group']) && $params['user_group'] != '', function ($query) use ($params) {
+                $query->where('u.user_group', $params['user_group']);
+            });
+        $financeRepository = app()->make(FinanceRepository::class);
+        $list = $financeRepository->date_where($query, $where['date'], 'ub.create_time')
+            ->field('ub.bill_id,ub.title,ub.number,ub.take_time,ub.commission_type,u.uid,u.phone,u.nickname,u.user_group,ub.order_sn,ub.take_time,ub.status,ub.create_time')
+            ->order('ub.bill_id', 'desc')
+            ->select()
+            ->each(function ($item) {
+                if($item['take_time'])
+                    $item['take_time'] = date('Y-m-d H:i:s', $item['take_time']);
+                return $item;
+            });
+        foreach ($list as $k => $v) {
+            $temp = array(
+                $v['bill_id'],
+                $v['create_time'],
+                $v['nickname'],
+                $v['phone'],
+                $v['title'],
+                $v['number'],
+                $v['status'] == 1 ? '已结算': '未结算',
+                $v['order_sn'] ?? '',
+            );
+            $arr[] = $temp;
+        }
+        $header = [
+            'ID', '创建时间', '用户昵称', '用户手机号', '名称', '金额', '状态', '订单号'
+        ];
+        $filename = $commission_type_desc . date('YmdHis') . '_' . rand(10000, 99999);
+        $title = $commission_type_desc;
+        $name = $commission_type_desc;
+        $info = '生成时间:' . date('Y-m-d H:i:s', time());
+        $suffix = 'xlsx';
+        $path = 'extract';
+        unset($_instance);
+
+        $_instance = SpreadsheetExcelService::instance_xin();
+
+        $_path = $_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile($title, $name, $info)
+            ->setExcelContent($arr)
+            ->excelSave($filename, $suffix, $path);
+
+        $data = [
+            'name' => $filename . '.' . $suffix,
+            'status' => 1,
+            'path' => '/' . $_path
+        ];
+
+        return app('json')->success('ok', $data);
+    }
+}

app/controller/admin/user/User.php

@@ -35,8 +35,10 @@ use think\App;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
+use think\Exception;
 use think\facade\Cache;
 use think\facade\Db;
+use think\Log;
 
 /**
  * Class User
@@ -176,6 +178,9 @@ class User extends BaseController
     }
     public function get_info($id)
     {
+//                ini_set('display_errors','On');
+//
+//        error_reporting(E_ALL);
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
         $user=Db::name('user')->find($id);
@@ -256,7 +261,14 @@ class User extends BaseController
 
         //查询当前团队的用户列表
         $sql = "select getUserSpreadId($id) as uids";
-        $spread_user_list = Db::query($sql);
+        //\think\facade\Log::info("lplpDB".$sql);
+        try{
+            $spread_user_list = Db::query($sql);
+        }catch (Exception $exception){
+           return app('json')->success($exception);
+        }
+
+
         $spread_user_list = array_diff(explode(",", trim($spread_user_list[0]['uids'],'$,')), [$id]);
 
         //查询创客手机号

app/controller/api/Auth.php

@@ -655,8 +655,8 @@ echo '导入成功';
     {
         $user = $this->request->userInfo()
             ->hidden(['account','label_id', 'group_id', 'pwd', 'card_id', 'last_time', 'last_ip', 'status', 'spread_time', 'real_name', 'brokerage_price']);
-        $user->append(['service', 'total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);
-        $data=$user->toArray();
+        $user->append(['service', 'total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);     
+$data=$user->toArray();
 
 
         $is_merchant=Db::name("merchant_intention")->where(["uid"=>$user["uid"],"is_branch"=>0])->order("mer_intention_id desc")->value("status");
@@ -700,7 +700,6 @@ echo '导入成功';
         }
         $data['team_number'] = $this->getBreak($user['uid']);
 
-
         $data['is_bangfu'] = Db::name('user_bangfu') -> where('uid',$user["uid"])->value('status')==1;
 
 //        $data['area_manage'] = Db::name('area_manage')->field('type,code_list')->where('uid',$user["uid"])->find();
@@ -1060,7 +1059,9 @@ echo '导入成功';
     }
     public function smsLogin(UserAuthValidate $validate, UserRepository $repository)
     {
-        $data = $this->request->params(['phone', 'sms_code', 'spread', 'share_id']);
+        // $data = $this->request->params(['phone', 'sms_code', 'spread', 'share_id']);
+        $data = $this->request->params(['phone', 'sms_code']);
+
         $validate->sceneSmslogin()->check($data);
 
         $domain = $this->request->domain();
@@ -1076,37 +1077,37 @@ echo '导入成功';
         }
 
         $user = $repository->accountByUser($data['phone']);
-        if (!$user){
-            if (!intval($data['spread'])) {
-                $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-                $data['spread'] = $spread_uid;
-            }
-            $user = $repository->registr($data['phone'], null, 'h5', $data['spread']);
-        }
+        // if (!$user){
+        //    if (!intval($data['spread'])) {
+        //        $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
+        //        $data['spread'] = $spread_uid;
+        //    }
+        //    $user = $repository->registr($data['phone'], null, 'h5', $data['spread']);
+        // }
         $user = $repository->mainUser($user);
 
-        if($this->source=='yhc' && $this->merId){
-            $where=['mer_id'=>$this->merId,'uid'=>$user->uid];
-            $count=Db::name('enterprise_user')->where($where)->count();
-            if($count<1){
-                $insert=['mer_id'=>$this->merId,'uid'=>$user->uid];
-                if (!intval($data['spread'])) {
-                    $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-                }else{
-                    $spread_uid=$data['spread'];
-                }
-                if($this->inviter_verification(2,$spread_uid)==false){
-                    return app('json')->fail('请输入正确邀请人手机号');
-                }
-
-
-                $insert['puid']= $spread_uid;
-                $insert['node_uid']= $spread_uid;
-                Db::name('enterprise_user')->insert($insert);
-            }
-        }
-
-        $repository->bindSpread($user, intval($data['spread']));
+        // if($this->source=='yhc' && $this->merId){
+        //     $where=['mer_id'=>$this->merId,'uid'=>$user->uid];
+        //     $count=Db::name('enterprise_user')->where($where)->count();
+        //     if($count<1){
+        //         $insert=['mer_id'=>$this->merId,'uid'=>$user->uid];
+        //         if (!intval($data['spread'])) {
+        //             $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
+        //         }else{
+        //             $spread_uid=$data['spread'];
+        //         }
+        //         if($this->inviter_verification(2,$spread_uid)==false){
+        //             return app('json')->fail('请输入正确邀请人手机号');
+        //         }
+
+
+       //          $insert['puid']= $spread_uid;
+       //          $insert['node_uid']= $spread_uid;
+       //          Db::name('enterprise_user')->insert($insert);
+       //      }
+       //  }
+
+        // $repository->bindSpread($user, intval($data['spread']));
         $tokenInfo = $repository->createToken($user);
         $repository->loginAfter($user);
         return app('json')->success($repository->returnToken($user, $tokenInfo));

app/controller/api/YiJia.php

@@ -44,6 +44,9 @@ class YiJia extends BaseController
         return app('json')->success('短信发送成功');
 
     }
+    public  function lp(){
+        echo 'lplplplp';
+    }
 
     public function Auth(UserRepository $repository){
         $data = $this->request->params(['phone', 'sms_code', 'source']);

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

@@ -132,6 +132,7 @@ 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;

app/controller/api/store/product/DaTaoKe.php

@@ -587,6 +587,7 @@ class DaTaoKe
 
                 $pddGoodsList = $response['data']['goodsList'] ?? [];
                 return json($response);
+                
                 $total += count($pddGoodsList);
                 foreach ($pddGoodsList as $goods) {
 
@@ -597,10 +598,13 @@ class DaTaoKe
                     $commissionRate = $goods['promotionRate'];
                     //券后价
                     $price = sprintf('%.2f', $groupPrice - $couponMoney);
-                    //养老金
-                    $commission = sprintf('%.2f', (($price * $commissionRate) / 1000));
+                    
+                    $commission = sprintf('%.2f', (($price * $commissionRate) / 1000)); //佣金
 
-                    $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
+                    //养老金
+                    $pv=$commission* 0.5;  //PV
+                    $yanglaojin=$pv*0.05; //新的养老金
+                    // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                      if ($yanglaojin < 0.5) {
                         continue;
                      }
@@ -609,6 +613,12 @@ class DaTaoKe
                         'id' => $goods['goodsSign'],
                         'thumb' => $goods['goodsThumbnailUrl'],//商品缩略图
                         'name' => $goods['goodsName'],
+                        
+                        'pv'=>$pv,
+                        'gongxian'=>$pv,
+                        'jifen'=>$pv,
+                        'yanglaojin' => $yanglaojin,
+                        
                         'commission' => $yanglaojin,
                         'commission_rate' => ($commissionRate / 10) . '%',
                         'sales' => $goods['salesTip'],

app/controller/api/store/product/Douyin.php

@@ -14,6 +14,7 @@ use think\Exception;
 use think\facade\Db;
 use think\facade\Log;
 use crmeb\basic\BaseController;
+use app\controller\api\store\service\ThirdPartyCategory;
 
 class Douyin extends BaseController
 {
@@ -65,19 +66,29 @@ class Douyin extends BaseController
                 $total += count($goodsList);
                 foreach ($goodsList as $value) {
                     $price = $value['couponPrice'] ?: $value['price'];
-                    //养老金
+                    //佣金
                     $commissionRate = $value['cosRatio'];
                     $commission = $value['cosFee'];
-                    $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
+
+                    //养老金
+                    $pv=$commission* 0.5;  //PV
+                    $yanglaojin=$pv*0.05; //新的养老金
+
+
+                    // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                     if ($yanglaojin < 0.1) {
                         continue;
                     }
-                    $yanglaojin = bcmul($yanglaojin, 0.8, 2);
+                    Log::info($value);
+                    // $yanglaojin = bcmul($yanglaojin, 0.8, 2);
                     $goods = [
                         'type' => 9,
                         'id' => $value['id'],
-                        'thumb' => $value['cover'],
+                        'thumb' => $value['cover'],                        
                         'name' => $value['title'],
+                        'pv' => $pv,
+                        'gongxian'=>$pv,
+                        'jifen'=>$pv,
                         'commission' => $yanglaojin,
                         'commission_rate' => $commissionRate,
                         'price' => $price,
@@ -89,6 +100,12 @@ class Douyin extends BaseController
                          'type' => 9,
                          'pension' => $yanglaojin
                      ];
+
+                    // //  use app\controller\api\store\service\ThirdPartyCategory;
+                    // $cid=$goods['cat1stId'];
+                    // $c_name=$goods['cat1stName'];
+                    // (new ThirdPartyCategory())->addOrUpdateCategory($cid,$c_name , 5);
+
                 }
                 if(isset($insert_all)){
                     Db::name("third_party_goods")->insertAll($insert_all);
@@ -117,6 +134,17 @@ class Douyin extends BaseController
                 $json['commission'] = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                 $json['commission'] = bcmul($json['commission'], 0.8, 2);
                 $json['commission']=set_price_rtrim($json['commission']);
+
+                $json['pension'] = $json['pension']??'0';
+                $json['pv'] = $json['pension']*0.5;
+                $json['yanglaojin'] = $json['pv']*0.05;
+
+                $json['shopName'] = isset($json['shopName'])?$json['shopName']:"";
+                $json['monthSales'] = isset($json['monthSales'])?$json['monthSales']:0;
+                $json['cid'] = isset($value['cid'])?$value['cid']:0;
+                // $json['shopName'] = "";
+                // $json['monthSales'] = "0";
+                // $json['cid'] = "0";
                 $goodslist[] = $json;
             }
         }
@@ -128,18 +156,38 @@ class Douyin extends BaseController
         $page = request()->param('page', 1);
         $limit = request()->param('limit', 10);
         $keyword = $this->request->param('keyword');
+        $_cid = $this->request->param('cid');
+
         $userId = $this->request->uid();
         TaoKe::set_third_history($userId,$keyword);
 
-        $goods = Db::name('third_party_goods')
-            ->where('type', 9)
-            ->where('json', 'like', '%' . $keyword . '%')
-            ->page($page, $limit)
+        $goods_obj = Db::name('third_party_goods')
+            ->where('type', 5);
+        if($keyword){
+            $goods_obj=$goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if($_cid){
+            $goods_obj=$goods_obj->where('cid', $_cid);
+        }
+        $goods=$goods_obj->page($page, $limit)
             ->select()->toArray();
+
+        // $goods = Db::name('third_party_goods')
+        //     ->where('type', 9)
+        //     ->where('json', 'like', '%' . $keyword . '%')
+        //     ->page($page, $limit)
+        //     ->select()->toArray();
         $goodsList = [];
         if(!empty($goods)) {
             foreach ($goods as $value) {
-                $goodsList[] = json_decode($value['json'], true);
+                $json = json_decode($value['json'], true);
+                $json['pension'] = $json['pension']??'0';
+                $json['pv'] = $json['pension']*0.5;
+                $json['yanglaojin'] = $json['pv']*0.05;
+                $json['shopName'] = "";
+                $json['monthSales'] = "0";
+                $json['cid'] = "0";
+                $goodsList[] = $json;
             }
         }
         return app('json')->success('获取抖音商品列表成功', $goodsList);
@@ -167,9 +215,23 @@ class Douyin extends BaseController
             return app('json')->fail('商品下架不存在', null, 401);
         }
         $detail = $detail[0];
-        $commission = $detail['cosFee'];
-        $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
-        $detail['yanglao'] = bcmul($yanglaojin, 0.8, 2);
+        // $commission = $detail['cosFee'];
+
+        $commission=$detail['cosFee'] ; //佣金(预估)
+        $pv=$commission* 0.5;  //PV
+        $yanglaojin=$pv*0.05; //新的养老金
+
+        $gongxian=$pv; //新的养老金
+        $jifen=$pv; //新的养老金
+        
+
+        $result['pv']=round($pv,2);
+        $result['yanglaojin']=round($yanglaojin,2);
+        $result['gongxian']=round($gongxian,2);
+        $result['jifen']=round($jifen,2);
+
+        // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
+        // $detail['yanglao'] = bcmul($yanglaojin, 0.8, 2);
         $linkInfo = $this->dy_transfer($detail['detailUrl'], $uid);
         $detail['dyZlink'] = empty($linkInfo['dyZlink']) ? (empty($linkInfo['shareLink']) ? '' : $linkInfo['shareLink']) : $linkInfo['dyZlink'];
         $detail['dyDeeplink'] = $linkInfo['dyDeeplink'] ?? '';

app/controller/api/store/product/Jd.php

@@ -9,6 +9,7 @@ use crmeb\basic\BaseController;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
+use think\facade\Log;
 
 class Jd extends BaseController
 {
@@ -187,6 +188,16 @@ class Jd extends BaseController
         $formatList = [];
         foreach ($list as $value) {
             $json = json_decode($value['json'], true);
+            $json['pension'] = $json['pension']??'0';
+            $json['pv'] = $json['pension']*0.5;
+            $json['yanglaojin'] = $json['pv']*0.05;
+
+            // $json['shopName'] = "";
+            // $json['monthSales'] = "0";
+            // $json['cid'] = "0";
+            $json['shopName'] = isset($json['shopName'])?$json['shopName']:"";
+            $json['monthSales'] = isset($json['monthSales'])?$json['monthSales']:0;
+            $json['cid'] = isset($value['cid'])?$json['cid']:0;
             $formatList[] = $json;
         }
         shuffle($formatList);
@@ -247,7 +258,15 @@ class Jd extends BaseController
             ->toArray();
         $formatList = [];
         foreach ($list as $value) {
-            $formatList[] = json_decode($value['json'], true);
+	    $json = json_decode($value['json'], true);
+            $json['pension'] = $json['pension']??'0';
+            $json['pv'] = $json['pension']*0.5;
+            $json['yanglaojin'] = $json['pv']*0.05;
+
+            $json['shopName'] = "";
+            $json['monthSales'] = "0";
+            $json['cid'] = "0";
+            $formatList[] = $json;
         }
         return app("json")->success($formatList);
     }
@@ -381,7 +400,7 @@ class Jd extends BaseController
             '12318', //便宜包邮
             '12339', //超市卡
         ];
-
+        Log::info("===============get_jd_goods_list===================");
 //        $eliteIdList = [1];
         foreach ($eliteIdList as $eliteId) {
             $jq_query=$this->jd_query($eliteId,1);

app/controller/api/store/product/Jt.php

@@ -14,7 +14,8 @@ use app\model\common\JdOrderModel;
 use think\App;
 use crmeb\basic\BaseController;
 use think\facade\Db;
-
+use think\facade\Log;
+use app\controller\api\store\service\ThirdPartyCategory;
 /**
  * Class Jt  使用京推推平台引入京东商品列表
  * @package app\api\controller\v1
@@ -80,6 +81,11 @@ class Jt extends BaseController
             $json['commission_'] = $commission;
             $json['lowestCouponPrice']=set_price_rtrim($json['lowestCouponPrice']);
             $json['price']=set_price_rtrim($json['price']);
+
+            $json['shopName'] = isset($json['shopName'])?$json['shopName']:"";
+            $json['monthSales'] = isset($json['monthSales'])?$json['monthSales']:0;
+            $json['cid'] = isset($value['cid'])?$value['cid']:0;
+
             $formatList[] = $json;
         }
         shuffle($formatList);
@@ -91,47 +97,56 @@ class Jt extends BaseController
 //        return app("json")->success($formatList);
     }
 
-    public function get_jd_goods_list(){
+    public function get_jd_goods_list() {
         set_time_limit(0);
-
+      
         $url = "http://japi.jingtuitui.com/api/get_goods_list";
         $params = [
-            'appid' => $this->jttAppId,
-            'appkey' => $this->jttAppKey,
-            'v' => 'v2',
-            'pageIndex' => 1,
-            'pageSize' => 1,
-            'sortName'=>'brokerage',
-            'sort'=>'desc'
+          'appid' => $this->jttAppId,
+          'appkey' => $this->jttAppKey,
+          'v' => 'v2',
+          'pageIndex' => 1,
+          'pageSize' => 100,
+          'sortName' => 'brokerage',
+          'sort' => 'desc',
         ];
-        $response2 = self::curlPost($url, $params);
-        if (isset($response2['result']['total_count'])){
-            $totel=$response2['result']['total_count'];
-            $pageNum=ceil($totel/100);
-        }else{
-            $this->get_jd_goods_list();
-            return 'ok';
+      
+        // 尝试从缓存获取数据
+        $cachedData = cache('jd_goods_list');
+        if ($cachedData) {
+          return $cachedData;
         }
-
-        for($i=1;$i<=$pageNum;$i++){
-            $url = "http://japi.jingtuitui.com/api/get_goods_list";
-            $params = [
-                'appid' => $this->jttAppId,
-                'appkey' => $this->jttAppKey,
-                'v' => 'v2',
-                'pageIndex' => $i,
-                'pageSize' => 100,
-//                'eliteId' => 'sift',
-                'sortName'=>'brokerage',
-                'sort'=>'desc'
-            ];
-            $response = self::curlPost($url, $params);
-            if (!isset($response['result']['data']) || count($response['result']['data']) < 1)break;
-            $this->formatGoodsList($response['result']['data'] ?? []);
-
+      
+        $response = self::curlPost($url, $params);
+      
+        if (isset($response['result']['total_count'])) {
+          $totalCount = $response['result']['total_count'];
+          $totalPages = ceil($totalCount / $params['pageSize']);
+        } else {
+          // 处理错误或返回合适信息
+          return 'Error: 无法获取总数量';
         }
-        return 'ok';
-    }
+      
+        $allGoods = [];
+        for ($i = 1; $i <= $totalPages; $i++) {
+          $params['pageIndex'] = $i;
+          $response = self::curlPost($url, $params);
+      
+          if (!isset($response['result']['data']) || count($response['result']['data']) < 1) {
+            break;
+          }
+      
+          $allGoods = array_merge($allGoods, $response['result']['data']);
+        }
+      
+        // 格式化并处理商品列表
+        $formattedGoods = $this->formatGoodsList($allGoods);
+      
+        // 缓存数据 (根据需求调整过期时间)
+        cache('jd_goods_list', $formattedGoods, 3600);
+      
+        return $formattedGoods;
+      }
 
 
 
@@ -139,19 +154,31 @@ class Jt extends BaseController
     public function search()
     {
         $keyword = request()->param('keyword', '');
+        $_cid = request()->param('cid', '');
+
         [$page, $limit] = $this->getPage();
         $uid = $this->request->uid();
         TaoKe::set_third_history($uid,$keyword);
 
-        $list = Db::name('third_party_goods')
-            -> where('type',2)
-            -> when(!empty($keyword),function($query) use ($keyword) {
-                $query -> where('json',"like",'%'.$keyword.'%');
-            })
-            -> page($page,$limit)
-            -> field('json')
-            -> select()
-            -> toArray();
+        $goods_obj = Db::name('third_party_goods')
+        -> where('type',2);
+        // -> when(!empty($keyword),function($query) use ($keyword) {
+        //     $query -> where('json',"like",'%'.$keyword.'%');
+        // })
+        // -> page($page,$limit)
+        // -> field('json')
+        // -> select()
+        // -> toArray();
+    
+        if($keyword){
+            $goods_obj=$goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if($_cid){
+            $goods_obj=$goods_obj->where('cid', $_cid);
+        }
+        $list=$goods_obj->page($page, $limit)
+            ->select()->toArray();
+
         $formatList = [];
         foreach ($list as $value){
             $formatList[] = json_decode($value['json'],true);
@@ -201,11 +228,16 @@ class Jt extends BaseController
     {
 //        $formatList = [];
         foreach ($goodsList as $value) {
-            $finalPrice = $value['final_price'];
-            $commissionRate = $value['commissionShare'];
-            $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate / 100));
+            $finalPrice = $value['final_price']; //商品最终价格（使用优惠券后的商品最终价格）
+            $commissionRate = $value['commissionShare'];  //京推推商品佣金比率
+            $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate / 100)); // 商品最终价格 * 京推推商品佣金比率 /100 =最终佣金
+
+            $pv=$commissionMoney* 0.5;  //PV
+            $oldMoney=$pv*0.05; //新的养老金
+
+            
             //养老金
-            $oldMoney = app()->make(ProductRepository::class)->yanglaojin(0, $commissionMoney);
+            // $oldMoney = app()->make(ProductRepository::class)->yanglaojin(0, $commissionMoney);
             if ($oldMoney < 0.1) continue;
             $couponMoney = [
                 [
@@ -220,15 +252,49 @@ class Jt extends BaseController
                 'id' => $value['brandCode'],//品牌编号
                 'name' => $value['short_name'],
                 'thumb' => $value['goods_img'],
+
+                'pv' => $pv,//PV金额
+                'gongxian'=>$pv,
+                'jifen'=>$pv,
+                'yanglaojin'=>$yanglaojin,
+
+
                 'commission' => $oldMoney,//养老金
                 'commission_rate' => $commissionRate,
-                'sales' => $value['inOrderCount30Days'],
+                // 'sales' => $value['inOrderCount30Days'],
                 'coupon_money' => $couponMoney,//优惠券相关信息
                 'coupon_link' => $value['discount_link'],//优惠券链接
                 'lowestCouponPrice' => $finalPrice,//券后价
                 'price' => $value['goods_price'],//商品原价
+                'shopName'=>$value['shop_name'],
+                'monthSales'=>$value['inOrderCount30Days']>0?$value['inOrderCount30Days']:mt_rand(100,10000) //月销量
             ];
-            Db::name("third_party_goods") -> insert(['json'=>json_encode($formatList,JSON_UNESCAPED_UNICODE),'pension'=>$oldMoney,'type'=>2]);
+
+            //  use app\controller\api\store\service\ThirdPartyCategory;
+            // 1居家日用；
+            // 2食品；
+            // 3生鲜；
+            // 4图书；
+            // 5美妆个护；
+            // 6母婴；
+            // 7数码家电；
+            // 8内衣；
+            // 9配饰；
+            // 10女装；
+            // 11男装；
+            // 12鞋品；
+            // 13家装家纺；
+            // 14文娱车品；15箱包；16户外运动
+            $cid=$value['goods_type'];
+            // $c_name=$value['cid1Name'];
+            // (new ThirdPartyCategory())->addOrUpdateCategory($cid,$c_name , 2);
+
+            Db::name("third_party_goods") -> insert([
+                'json'=>json_encode($formatList,JSON_UNESCAPED_UNICODE),
+                'pension'=>$oldMoney,
+                'type'=>2,                
+                'cid'=>cid //一级分类
+            ]);  //20250110 增加cid字段，json中增加 shopName,monthSales by Conner
         }
 //        return $formatList;
     }
@@ -420,8 +486,19 @@ class Jt extends BaseController
             $commissionRate = $detail['commissionInfo']['commissionShare'];
             //目前京东联盟等级只返回90%的收益，后续调整0.9即可
             $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate * 0.9 / 100));
+
+            $commission=$commissionMoney; //佣金(预估)
+            $pv=$commission* 0.5;  //PV
+            $yanglaojin=$pv*0.05; //新的养老金
+
+            $gongxian=$pv; //新的养老金
+            $jifen=$pv; //新的养老金
+            
+
+            
+
             //养老金
-            $yanglao = app()->make(ProductRepository::class)->thirdYanglaojin(0, $commissionMoney);
+            // $yanglao = app()->make(ProductRepository::class)->thirdYanglaojin(0, $commissionMoney);
 
             //经推推商品详情
             $detailImg = $detail['imageInfo']['imageList'];
@@ -434,9 +511,21 @@ class Jt extends BaseController
                 'couMoney' => $discount_price,
                 'nowPrice' => $finalPrice,//现价
                 'detail' => $formatDetailImg,
-                'yanglao' => $yanglao,
-                'yanglao_' => $commissionMoney,
+
+                'commission' => $commission,
+                'pv' => $pv,
+                'yanglaojin' => $yanglaojin,
+                'gongxian' => $gongxian,
+                'jifen' => $jifen,
+
+                // 'yanglao' => $yanglao,
+                // 'yanglao_' => $commissionMoney,
             ];
+            $formatData['pv']=round($pv,2);
+            $formatData['yanglaojin']=round($yanglaojin,2);
+            $formatData['gongxian']=round($gongxian,2);
+            $formatData['jifen']=round($jifen,2);
+
             $formatData['materialUrl'] = '';
             if($userId!=''){
             //加入转链地址

app/controller/api/store/product/Su.php

@@ -13,6 +13,7 @@ use think\exception\ValidateException;
 use think\facade\Db;
 use SuNing;
 use think\facade\Log;
+use app\controller\api\store\service\ThirdPartyCategory;
 
 class Su extends BaseController
 {
@@ -25,8 +26,8 @@ class Su extends BaseController
     {
 
         parent::__construct($app);
-        $this->appKey = 'a5565f117bec762b45dead9514a00fce';
-        $this->secretKey = '6b12c8424cb7879ef9ec385cb03b341e';
+        $this->appKey = '8349fdf89e7c46ff8ba28752093dfd09';
+        $this->secretKey = '7c386c01da509065febddde9f87d4821';
         $this->channel = '';
         $this->userThird = app()->make(UserThirdRepository::class);
     }
@@ -130,6 +131,21 @@ class Su extends BaseController
         return $xml;
     }
 
+    // public function su_get_category(){
+    //     $apiName = 'suning.netalliance.commoditycategory.query';
+    //     $name = "queryInverstmentcommodity";
+    //     $request = [
+    //         'commoditycategoryList' => [
+    //             "saleCategoryId"=>1,
+    //             "saleGrade"=>1
+    //         ]
+    //     ];
+    //     $result = $this->getUrlResult($apiName, $request, $name);
+    //     $result = $result['sn_responseContent']['sn_body']['queryInverstmentcommodity'] ?? [];
+    //     Log::info($result);
+    //     // return json_encode($result);
+    // }
+
     public function su_cron()
     {
         try{
@@ -143,31 +159,69 @@ class Su extends BaseController
                     'couponMark' => 1,
                 ];
                 $result = $this->getUrlResult($apiName, $request, $name);
+                
                 $result = $result['sn_responseContent']['sn_body']['queryInverstmentcommodity'] ?? [];
                 $total += count($result);
+                // Log::info("===============su_cron===================");
+                // Log::info($result);
                 foreach ($result as $k => $goods) {
-                    $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $goods['commodityInfo']['commodityPrice'] * $goods['commodityInfo']['rate'] / 100 ?? '');
+                    
+                    // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $goods['commodityInfo']['commodityPrice'] * $goods['commodityInfo']['rate'] / 100 ?? '');
+                    
+                    $commission=$goods['commodityInfo']['commodityPrice'] * $goods['commodityInfo']['rate'] / 100; //佣金
+                    $pv=$commission* 0.5;  //PV
+                    $yanglaojin=$pv*0.05; //新的养老金
+
+
                     if($yanglaojin < 0.1) {
                         continue;
                     }
+
+                    //记录分类id到本地数据库
+                    $cid=$goods['categoryInfo']['firstSaleCategoryId'];
+                    $c_name=$goods['categoryInfo']['firstSaleCategoryName'];
+                    (new ThirdPartyCategory())->addOrUpdateCategory($cid,$c_name , 4);
+
+
                     $goods = [
                         'type' => 3,//苏宁商品
                         'id' => $goods['commodityInfo']['commodityCode'] ?? '', //id
                         'thumb' => $goods['commodityInfo']['pictureUrl'][0]['picUrl'] ?? '',//商品缩略图
                         'name' => $goods['commodityInfo']['commodityName'],//名称
-                        'commission' => $yanglaojin,//佣金
+                        
+                        'pv' => $pv,//佣金
+                        'gongxian'=>$pv, //贡献
+                        'jifen'=>$pv, //积分
+                        'yanglaojin' => $yanglaojin,//养老金
+
+
+                        'commission' => $yanglaojin,//养老金
+
                         'commission_rate' => $goods['commodityInfo']['rate'] ?? '',//佣金比例
                         'sales' => $goods['commodityInfo']["monthSales"],
                         'coupon_money' => $goods['couponInfo'] ?? [],
                         'market_price' => $goods['commodityInfo']['snPrice'],//苏宁价
                         'price' => $goods['commodityInfo']['commodityPrice'] ?? '', //价格
+
+                        'shopName'=>$goods['commodityInfo']['supplierName'], //店铺名称
+                        'monthSales'=>$goods['commodityInfo']['monthSales']>0?$goods['commodityInfo']['monthSales']:mt_rand(100,10000) //月销量
                     ];
 
+                    // Log::info([
+                    //     'json' => json_encode($goods, JSON_UNESCAPED_UNICODE),
+                    //     'type' => 4,
+                    //     'pension' => $yanglaojin,
+                    //     'cid'=>$cid //一级分类
+                    // ]);
+
                     Db::name("third_party_goods")->insert([
                         'json' => json_encode($goods, JSON_UNESCAPED_UNICODE),
                         'type' => 4,
-                        'pension' => $yanglaojin
+                        'pension' => $yanglaojin,
+                        'cid'=>$cid //一级分类
                     ]);
+                    
+                    // Log::info($yanglaojin);
                 }
             }
             Log::info('苏宁获取的商品总数：' . $total);
@@ -180,8 +234,27 @@ class Su extends BaseController
     public function GoodList()
     {
         [$page, $limit] = $this->getPage();
+
+        $_cid = $this->request->param('cid');
+        $keyword = $this->request->param('keyword');
+
+        // $goods_obj = Db::name('third_party_goods')->where('type', 4)->page($page, $limit)->select()->toArray();
+        $goods_obj = Db::name('third_party_goods')->where('type', 4);
+        if($keyword){
+            $goods_obj=$goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if($_cid){
+            $goods_obj=$goods_obj->where('cid', $_cid);
+        }
+
+        $data=$goods_obj->page($page, $limit)
+        ->select()->toArray();
+        
+
+
+
         // 获取列表数据
-        $data = Db::name('third_party_goods')->where('type', 4)->page($page, $limit)->select()->toArray();
+        
         $goodslist = [];
         if(!empty($data)) {
             foreach ($data as $value) {
@@ -189,6 +262,17 @@ class Su extends BaseController
                 $json['market_price']=set_price_rtrim($json['market_price']);
                 $json['price']=set_price_rtrim($json['price']);
                 $json['commission']=set_price_rtrim($json['commission']);
+
+                $json['pension'] = $json['pension']??'0';
+
+                $json['pv'] = isset($json['pv'])?$json['pv']:0;
+                $json['gongxian'] = isset($json['gongxian'])?$json['gongxian']:0;
+                $json['jifen'] = isset($json['jifen'])?$json['jifen']:0;
+                $json['yanglaojin'] =isset($json['yanglaojin'])?$json['yanglaojin']:0;
+
+                $json['shopName'] = isset($json['shopName'])?$json['shopName']:"";
+                $json['monthSales'] = isset($json['monthSales'])?$json['monthSales']:0;
+                $json['cid'] = isset($value['cid'])?$value['cid']:0;
                 $goodslist[] = $json;
 
             }
@@ -306,20 +390,39 @@ class Su extends BaseController
     public function search()
     {
         [$page, $limit] = $this->getPage();
-        $keyword = $this->request->param(['keyword']);
+        $keyword = $this->request->param('keyword');
+        $_cid = $this->request->param('cid');
+        // dd($_cid);
         $userId = $this->request->uid();
         TaoKe::set_third_history($userId,$keyword['keyword']);
 
-        $goods = Db::name('third_party_goods')
-            ->where('type', 4)
-            ->where('json', 'like', '%' . $keyword['keyword'] . '%')
-            ->page($page, $limit)
+        $goods_obj = Db::name('third_party_goods')
+            ->where('type', 4);
+        if($keyword){
+            $goods_obj=$goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if($_cid){
+            $goods_obj=$goods_obj->where('cid', $_cid);
+        }
+        $goods=$goods_obj->page($page, $limit)
             ->select()->toArray();
         $goodsList = [];
 
         if(!empty($goods)) {
             foreach ($goods as $value) {
-                $goodsList[] = json_decode($value['json'], true);
+                $json = json_decode($value['json'], true);
+                $json['pension'] = $json['pension']??'0';
+                $json['pv'] = $json['pension']*0.5;
+
+                $json['pv'] = isset($json['pv'])?$json['pv']:0;
+                $json['gongxian'] = isset($json['gongxian'])?$json['gongxian']:0;
+                $json['jifen'] = isset($json['jifen'])?$json['jifen']:0;
+                $json['yanglaojin'] =isset($json['yanglaojin'])?$json['yanglaojin']:0;
+
+                $json['shopName'] = isset($json['shopName'])?$json['shopName']:"";
+                $json['monthSales'] = isset($json['monthSales'])?$json['monthSales']:0;
+                $json['cid'] = isset($value['cid'])?$value['cid']:0;
+                $goodsList[] = $json;
             }
         }
         return app('json')->success('搜索苏宁商品列表成功', $goodsList);
@@ -418,6 +521,22 @@ class Su extends BaseController
         $result = $result['sn_responseContent']['sn_body']['getUnionInfomation'][0] ?? [];
         //获取商品的图文详情
         $detail = $this->goodImgDetail($result['mertCode'] ?? '', $result['goodsCode'] ?? '');
+
+
+        $commission=$result['wapPrePayCommission'] ; //佣金(预估)
+        $pv=$commission* 0.5;  //PV
+        $yanglaojin=$pv*0.05; //新的养老金
+
+        $gongxian=$pv; //新的养老金
+        $jifen=$pv; //新的养老金
+        
+
+        $result['pv']=round($pv,2);
+        $result['yanglaojin']=round($yanglaojin,2);
+        $result['gongxian']=round($gongxian,2);
+        $result['jifen']=round($jifen,2);
+
+        // Log::info($result);
         $result['detail'] = $detail;
         //商品和券二合一
         $result['url'] = $this->toOneUrl($uid, $result['productUrl'], $url['couponUrl'] ?? '');

app/controller/api/store/product/TaoKe.php

@@ -184,7 +184,7 @@ class TaoKe extends BaseController
         }
         $goodsList = [];
         foreach ($goodsResult as $goods) {
-            // var_dump($goods);
+            //var_dump($goods);
             $min_normal_price = sprintf('%.2f', $goods['min_normal_price'] / 100);
             $groupPrice = sprintf('%.2f', $goods['min_group_price'] / 100);
             //优惠券面额，单位为分
@@ -192,16 +192,34 @@ class TaoKe extends BaseController
             //佣金比例,千分比
             $commissionRate = $goods['promotion_rate'];
 
-            $commission = sprintf('%.2f', (($groupPrice * $commissionRate) / 1000));
+            $commission = sprintf('%.2f', (($groupPrice * $commissionRate) / 1000));  //佣金
             //将佣金根据用户等级转成积分
             //$userCommissionIntegral = getCommission($userLevel, $commission);
-            $goodsList[] = [
+
+            // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
+
+            $pv=$commission* 0.5;  //PV
+            $yanglaojin=$pv*0.05; //新的养老金
+
+            if($yanglaojin < 0.1) {
+                continue;
+            }
+
+            
+            
+            $this_goods= [
                 'type' => 1,//拼多多商品
                 'id' => $goods['goods_sign'] ?? $goods['goods_id'],
                 'thumb' => $goods['goods_thumbnail_url'],//商品缩略图
                 'name' => $goods['goods_name'],
-                'commission' => app()->make(ProductRepository::class)->thirdYanglaojin(0, $commission),
+                'commission' => $yanglaojin, //养老金  //app()->make(ProductRepository::class)->thirdYanglaojin(0, $commission),
                 'commission_' => $commission,
+
+                'yanglaojin' => $yanglaojin,
+                'pv' => $pv,
+                'gongxian'=>$pv,
+                'jifen'=>$pv,
+
                 'commission_rate' => $commissionRate,
                 'sales' => $goods['sales_tip'],
                 //'desc' => $goods['goods_desc'],
@@ -209,7 +227,19 @@ class TaoKe extends BaseController
 //                'market_price' => $groupPrice,
                 'market_price' => set_price_rtrim(sprintf('%.2f', $groupPrice - $couponMoney)),
                 'price' => set_price_rtrim(sprintf('%.2f', $min_normal_price - $couponMoney)),
+
+                'shopName'=>$goods['mall_name'], //店铺名称
+                'monthSales'=>$goods['sales_tip']>0?$goods['sales_tip']:mt_rand(100,10000) //月销量
             ];
+            $goodsList[] =$this_goods;
+            $cid=isset($goods['cat_ids'][0])?$goods['cat_ids'][0]:0;
+            Db::name("third_party_goods")->insert([
+                'json' => json_encode($this_goods, JSON_UNESCAPED_UNICODE),
+                'type' => 3,
+                'pension' => $yanglaojin,
+                'cid'=>$cid //一级分类
+            ]);
+
         }
         shuffle($goodsList);
         return app('json')->success('获取拼多多商品列表成功', $goodsList);

app/controller/api/store/product/ThirdCategory.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace app\controller\api\store\product;
+
+use app\common\model\system\admin\Log;
+use app\common\model\user\User;
+use app\common\model\user\UserThird;
+use app\common\model\user\UserThirdOrder;
+use app\common\repositories\store\product\ProductRepository;
+use app\common\repositories\user\UserRepository;
+use app\common\repositories\user\UserThirdRepository;
+use app\model\common\JdOrderModel;
+use app\model\common\TbOrderModel;
+use app\model\common\VipOrderModel;
+use think\App;
+use crmeb\basic\BaseController;
+use think\Collection;
+use think\facade\Db;
+use think\Exception;
+use think\exception\ValidateException;
+use app\controller\api\store\service\ThirdPartyCategory;
+
+//第三方分类
+class ThirdCategory extends BaseController
+{
+
+    protected $app = null;
+    /**
+     * @var
+     */
+    protected $uid;
+    protected $userThird;
+
+
+    /**
+     * StoreCoupon constructor.
+     * @param App $app
+     */
+    public function __construct(App $app)
+    {
+        $this->app = $app;
+        parent::__construct($app);
+        $this->userThird = app()->make(UserThirdRepository::class);
+
+    }
+
+    public function get_category(){
+        $type = $this->request->param('type');
+        $obj=Db::name("third_party_category");
+        if($type){
+            $obj->where('type',$type);
+        }
+        $category=$obj->select()->toArray();
+        return app('json')->success('获取成功', $category);
+    }
+    
+
+}

app/controller/api/store/product/Vip.php

@@ -18,6 +18,7 @@ use think\Collection;
 use think\facade\Db;
 use think\Exception;
 use think\exception\ValidateException;
+use app\controller\api\store\service\ThirdPartyCategory;
 
 class Vip extends BaseController
 {
@@ -168,29 +169,54 @@ class Vip extends BaseController
                     $couponMoney = $couponInfo ? $couponInfo['fav'] : 0;
                     $commissionRate = $goods['commissionRate'];
                     $commission = $goods['commission'];
-                    $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
+
+                    $pv=$commission* 0.5;  //PV
+                    $yanglaojin=$pv*0.05; //新的养老金
+
+
+                    // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                     if($yanglaojin < 0.1) {
                         continue;
                     }
+
+                    
+                    //记录分类id到本地数据库
+                    $cid=$goods['cat1stId'];
+                    $c_name=$goods['cat1stName'];
+                    (new ThirdPartyCategory())->addOrUpdateCategory($cid,$c_name , 5);
+
+
                     $goods = [
                         'type' => 2,//唯品会商品
                         'id' => $goods['goodsId'],
                         'thumb' => $goods['goodsThumbUrl'],//商品缩略图
                         'name' => $goods['goodsName'],
-                        'commission' => app()->make(ProductRepository::class)->yanglaojin(0, $commission),//佣金
+
+                        'pv'=>$pv, //PV金
+                        'gongxian'=>$pv,
+                        'jifen'=>$pv,
+                        'yanglaojin' => $yanglaojin,
+
+                        'commission' => $yanglaojin, //养老金 //app()->make(ProductRepository::class)->yanglaojin(0, $commission),//佣金
                         'commission_rate' => $commissionRate,
                         'sales' => "",
                         'coupon_money' => $couponMoney,
                         'market_price' => $goods['marketPrice'],
                         'price' => $goods['vipPrice'],
                         'coupon_info' => $couponInfo,
+
+                        'shopName'=>$goods['storeInfo']['storeName'], //店铺名称
+                        'monthSales'=>$goods['productSales']>0?$goods['productSales']:mt_rand(100,10000) //月销量
                     ];
 
                     Db::name("third_party_goods")->insert([
                         'json' => json_encode($goods, JSON_UNESCAPED_UNICODE),
                         'type' => 5,
-                        'pension' => $yanglaojin
+                        'pension' => $yanglaojin,
+                        'cid'=>$cid //一级分类
                     ]);
+
+
                 }
                 if(!isset($result['result']['lastPage']) || $result['result']['lastPage']) {
                     return;
@@ -273,6 +299,18 @@ class Vip extends BaseController
                 $json['market_price']=set_price_rtrim($json['market_price']);
                 $json['price']=set_price_rtrim($json['price']);
 
+                $json['pension'] = $json['pension']??'0';
+                
+                $json['pv'] = isset($json['pv'])?$json['pv']:0;
+                $json['gongxian'] = isset($json['gongxian'])?$json['gongxian']:0;
+                $json['jifen'] = isset($json['jifen'])?$json['jifen']:0;
+                $json['yanglaojin'] =isset($json['yanglaojin'])?$json['yanglaojin']:0;
+
+
+                
+                $json['shopName'] = isset($json['shopName'])?$json['shopName']:"";
+                $json['monthSales'] = isset($json['monthSales'])?$json['monthSales']:0;
+                $json['cid'] = isset($value['cid'])?$value['cid']:0;
                 $goodslist[] = $json;
             }
         }
@@ -338,18 +376,42 @@ class Vip extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $keyword = $this->request->param('keyword');
+        $_cid = $this->request->param('cid');
+
         $userId = $this->request->uid();
         TaoKe::set_third_history($userId,$keyword);
 
-        $goods = Db::name('third_party_goods')
-            ->where('type', 5)
-            ->where('json', 'like', '%' . $keyword . '%')
-            ->page($page, $limit)
+        // $goods = Db::name('third_party_goods')
+        //     ->where('type', 5)
+        //     ->where('json', 'like', '%' . $keyword . '%')
+        //     ->page($page, $limit)
+        //     ->select()->toArray();
+
+        
+        $goods_obj = Db::name('third_party_goods')
+            ->where('type', 5);
+        if($keyword){
+            $goods_obj=$goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if($_cid){
+            $goods_obj=$goods_obj->where('cid', $_cid);
+        }
+        $goods=$goods_obj->page($page, $limit)
             ->select()->toArray();
+
+
         $goodsList = [];
         if(!empty($goods)) {
             foreach ($goods as $value) {
-                $goodsList[] = json_decode($value['json'], true);
+                $json = json_decode($value['json'], true);
+                $json['pension'] = $json['pension']??'0';
+                $json['pv'] = $json['pension']*0.5;
+                $json['yanglaojin'] = $json['pv']*0.05;
+
+                $json['shopName'] = "";
+                $json['monthSales'] = "0";
+                $json['cid'] = "0";
+                $goodsList[] = $json;
             }
         }
         return app('json')->success('获取唯品会商品列表成功', $goodsList);
@@ -448,8 +510,23 @@ class Vip extends BaseController
         $result = $this->getUrlResult($apiName, "getByGoodsIds", $params);
         if(empty($result))
             return app('json')->fail('商品下架不存在', null, 401);
-        $result['yanglao'] = app()->make(ProductRepository::class)
-            ->yanglaojin(0, $result['result'][0]['vipPrice'] * $result['result'][0]['commissionRate'] / 100);
+        // $result['yanglao'] = app()->make(ProductRepository::class)
+        //     ->yanglaojin(0, $result['result'][0]['vipPrice'] * $result['result'][0]['commissionRate'] / 100);
+
+        $commission=$result['result'][0]['vipPrice'] * $result['result'][0]['commissionRate'] / 100 ; //佣金(预估)
+        $pv=$commission* 0.5;  //PV
+        $yanglaojin=$pv*0.05; //新的养老金
+
+        $gongxian=$pv; //新的养老金
+        $jifen=$pv; //新的养老金
+        
+
+        $result['pv']=round($pv,2);
+        $result['yanglaojin']=round($yanglaojin,2);
+        $result['gongxian']=round($gongxian,2);
+        $result['jifen']=round($jifen,2);
+
+
         $result['wphlink'] = $this->vip_link($param['goodsId'], $chanTag['pid']);//获取唯品会联盟链接
         return app('json')->success($result);
     }

app/controller/api/store/service/ThirdPartyCategory.php

@@ -0,0 +1,135 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020/5/29
+ *
+ * 
+ */
+
+namespace app\controller\api\store\service;
+
+
+use crmeb\basic\BaseController;
+use app\common\repositories\store\service\StoreServiceLogRepository;
+use app\common\repositories\store\service\StoreServiceRepository;
+use think\App;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+use think\facade\Db;
+use think\facade\Log;
+use think\facade\Cache;
+
+/**
+ * Class Service
+ * @package app\controller\api\store\service
+ * @author xaboy
+ * @day 2020/5/29
+ */
+class ThirdPartyCategory extends BaseController
+{
+    /**
+     * @var StoreServiceRepository
+     */
+    // protected $model; // 模型
+
+    /**
+     * Service constructor.
+     * @param App $app
+     * @param StoreServiceRepository $repository
+     */
+    public function __construct()
+    {
+        
+        
+        // $this->model=Db::name("third_party_category");
+    }
+
+    
+
+    /**
+     * 添加或更新分类数据，并更新缓存
+     * @param int $cid 分类ID
+     * @param string $c_name 分类名称
+     * @param int $type 平台类型
+     * @return bool|int|string 成功返回ID或true，失败返回错误信息字符串
+     */
+    public function addOrUpdateCategory(int $cid, string $c_name, int $type)
+    {
+        // 1. 尝试从缓存中获取数据
+        $cacheKey = $this->getCacheKey($cid, $type);
+        $cachedData = Cache::get($cacheKey);
+
+        if ($cachedData) {
+            return true; // 缓存命中，说明已存在，直接返回 true
+        }
+
+        // 2. 查询数据库
+        $existingRecord = Db::name("third_party_category")
+            ->where('cid', $cid)
+            ->where('type', $type)
+            ->find();
+        
+        if ($existingRecord) {
+            // 3. 数据库中已存在，更新缓存并返回true
+            Cache::set($cacheKey, $existingRecord, 3600); // 缓存 1 小时
+            return true;
+        }
+
+        // 4. 数据库中不存在，写入新记录
+        $data = [
+            'cid' => $cid,
+            'c_name' => $c_name,
+            'type' => $type,
+        ];
+
+        try {
+            $result = Db::name("third_party_category")->save($data);
+            if ($result === false){
+                Log::info('Error: Database save failed.');
+                return 'Error: Database save failed.';
+            }
+        } catch (\Exception $e) {
+            Log::info('Error: Database exception - ' . $e->getMessage());
+            return 'Error: Database exception - ' . $e->getMessage();
+        }
+
+        if ($result) {
+            // 5. 写入成功，更新缓存
+            Cache::set($cacheKey, $data, 3600); // 缓存 1 小时
+            // return $this->model->id; //返回新插入的ID
+        } else {
+            Log::info('Error: Unknown database error.');
+            // return 'Error: Unknown database error.';
+        }
+    }
+
+        /**
+     * 生成缓存键
+     * @param int $cid 分类ID
+     * @param int $type 平台类型
+     * @return string
+     */
+    private function getCacheKey(int $cid, int $type): string
+    {
+        return 'category_' . $cid . '_' . $type;
+    }
+
+    /**
+     * 清除指定或所有分类缓存
+     * @param int|null $cid 可选，分类ID，如果为null则清除所有分类缓存
+     * @param int|null $type 可选，平台类型，如果cid为null则忽略此参数
+     */
+    public function clearCategoryCache(int $cid = null, int $type=null)
+    {
+        if ($cid === null) {
+            Cache::clear(); // 清除所有缓存
+        } else {
+            $cacheKey = $this->getCacheKey($cid, $type);
+            Cache::delete($cacheKey);
+        }
+    }
+}

route/admin.php

@@ -495,7 +495,14 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::post('upload/image', '/uploadImage')->name('wechatUploadImage');
             Route::post('upload/voice', '/uploadVoice')->name('wechatUploadVoice');
         })->prefix('admin.wechat.WechatReply');
-
+	
+	// 商家管理
+        Route::group('merchant/contribute', function () {
+            Route::post("list","admin.merchant.MerchantContribute/list");//图片列表
+            Route::post("add","admin.merchant.MerchantContribute/add");//新增
+            Route::post("edit","admin.merchant.MerchantContribute/edit");//更新
+            Route::post("delete","admin.merchant.MerchantContribute/delete");//删除
+        });
 
         /*//微信用户标签
         Route::group('wechat/user/tag',function(){
@@ -953,6 +960,9 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         }) -> prefix('admin.order.Statistics');
 
     })->middleware(\app\common\middleware\AllowOriginMiddleware::class);
+    //Route::group('lplp',function (){
+//    Route::get('teamValue',"admin.user.TeamValue/getInfo");
+//});
 
     Route::miss(function () {
         return app('json')->fail('接口不存在');

route/api.php

@@ -16,13 +16,19 @@ Route::miss(function () {
 //    return "接口不存在";
 //});
 Route::group('cxb/',function(){
-    Route::post('auth', 'api.YiJia/Auth');
+    Route::post('auth', 'api.YiJia/lp');
     Route::post('pension', 'api.YiJia/pension');
 })
     ->middleware(\app\common\middleware\IpCheckMiddleware::class)
-    ->middleware(\app\common\middleware\CheckYiJiaMiddleware::class)
-;
+    ->middleware(\app\common\middleware\CheckYiJiaMiddleware::class);
 
+Route::group('lplplp',function (){
+    // Route::get('teamValue',"Admin/User/TeamValue/getInfo");
+    Route::get('teamValue/info', 'admin.user.TeamValue/getInfo');
+    Route::post('teamValue/edit', 'admin.user.TeamValue/editInfo');
+})->middleware(\app\common\middleware\AllowOriginMiddleware::class)
+    ->middleware(\app\common\middleware\InstallMiddleware::class)
+    ->middleware(\app\common\middleware\CheckSiteOpenMiddleware::class);
 Route::group('api/', function () {
     Route::any('huiFuSettleIn','admin.system.merchant.MerchantIntention/huiFuSettleIn');//汇付入驻测试
     Route::any('test', 'api.Auth/test');
@@ -907,8 +913,12 @@ Route::group('api/', function () {
     Route::get('wechat/config', 'api.Wechat/jsConfig');
     //图片验证码
     Route::get('captcha', 'api.Auth/getCaptcha');
+
+
+    //返回第三方分类
+    Route::get('get_third_category','api.store.product.ThirdCategory/get_category');
     // 定时获取拼多多商品
-    //Route::get('get_pdd_list','api.store.product.DaTaoKe/pdd_cron');
+    // Route::get('get_pdd_list','api.store.product.DaTaoKe/pdd_cron');
     //获取拼多多商品
     Route::get('pdd/list', 'api.store.product.TaoKe/pdd_list');
     Route::get('pdd/orderlist', 'api.store.product.TaoKe/getOrder');
@@ -972,9 +982,13 @@ Route::group('api/', function () {
 
     /*苏宁商品*/
     Route::get('su/get_su_list', 'api.store.product.Su/su_cron');
+    Route::get('su/get_su_category', 'api.store.product.Su/su_get_category');
     Route::get('su/list', 'api.store.product.Su/GoodList');
     Route::get('su/order', 'api.store.product.Su/orderList');
     Route::get('su/SuMoney', 'api.store.product.Su/SuMoney');
+    Route::get('su/search2', 'api.store.product.Su/search');
+    Route::get('su/detail2/:id', 'api.store.product.Su/goodsDetail');
+    
 
 
     //云选联盟