Merge remote-tracking branch 'origin/dev' into dev

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

@@ -3803,7 +3803,7 @@ class StoreOrderRepository extends BaseRepository
 
         $order_sn = $order["order_sn"];
         log::info("进入添加养老金{$order['order_sn']}");
-        $tongji = Db::name("user_bill")->where("order_sn", $order_sn)->count();
+        $tongji = Db::name("user_bill")->where("order_sn", $order_sn)->where('type_shop', $type_shop)->count();
         if ($tongji) {
             //第三方订单状态修改
             log::info("tongji");

app/common/repositories/user/UserThirdRepository.php

@@ -232,6 +232,7 @@ class UserThirdRepository extends BaseRepository
                 "table"=>$table
             ];
 
+            /** @var StoreOrderRepository $StoreOrderRepository */
             $StoreOrderRepository = app()->make(StoreOrderRepository::class);
 //            $StoreOrderRepository->yugu_rebate($order);
             log::info("===待进入养老金22222222222");

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

@@ -4,14 +4,15 @@ namespace app\controller\api\store\product;
 
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserThirdRepository;
+use app\model\common\JdOrderModel;
 use think\App;
-// use crmeb\basic\BaseController;
+use crmeb\basic\BaseController;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
 use think\facade\Log;
 
-class Jd
+class Jd extends BaseController
 {
     public $appid = '';
     public $key = '';
@@ -23,7 +24,7 @@ class Jd
     public function __construct(App $app)
     {
 
-        // parent::__construct($app);
+        parent::__construct($app);
         $this->appid = '4101490811';
         $this->key = 'a7c43c21f3e156d2fd41dfbe884b9f62592ceb03b9f199c0811c82e35be53c0580a2638a7af39e74';
         $this->appKey = 'e99703d01cbb6a2e48a8a34f19af9d87';
@@ -382,45 +383,45 @@ class Jd
         set_time_limit(0);
 
         $eliteIdList = [
-            // '1', //好券商品
-                        '2', //精选卖场
-            //             '10', //9.9包邮
-            //             '15', //京东配送
-            //             '22', //实时热销榜
-            // //            '23', //为你推荐
-            //             '24', //数码家电
-            //             '25', //超市
-            //             '26', //母婴玩具
-            //             '27', //家具日用
-            //             '28', //美妆穿搭
-            //             '30', //图书文具
-            //             '31', //今日必推
-            //             '32', //京东好物
-            //             '33', //京东秒杀
-            //             '34', //拼购商品
-            //             '40', //高收益榜
-            //             '41', //自营热卖榜
-            // //            '108', //秒杀进行中
-            //             '109', //新品首发
-            //             '110', //自营
-            //             '112', //京东爆品
-            //             '125', //首购商品
-            //             '129', //高佣榜单
-            // //            '130', //视频商品
-            // //            '153', //历史最低价商品榜
-            // //            '238', //新人价商品
-            // //            '315', //秒杀未开始
-            //             '341', //3C新品
-            //             '342', //智能新品
-            //             '343', //3C长尾商品
-            //             '345', //时尚新品
-            //             '346', //时尚爆品
-            // //            '1001', //选品库
-            // //            '515', //订单接龙商品
-            // //            '519', //官方活动
-            //             '12254', //超级补贴
-            //             '12318', //便宜包邮
-            //             '12339', //超市卡
+            '1', //好券商品
+            '2', //精选卖场
+            '10', //9.9包邮
+            '15', //京东配送
+            '22', //实时热销榜
+            //            '23', //为你推荐
+            '24', //数码家电
+            '25', //超市
+            '26', //母婴玩具
+            '27', //家具日用
+            '28', //美妆穿搭
+            '30', //图书文具
+            '31', //今日必推
+            '32', //京东好物
+            '33', //京东秒杀
+            '34', //拼购商品
+            '40', //高收益榜
+            '41', //自营热卖榜
+            //            '108', //秒杀进行中
+            '109', //新品首发
+            '110', //自营
+            '112', //京东爆品
+            '125', //首购商品
+            '129', //高佣榜单
+            //            '130', //视频商品
+            //            '153', //历史最低价商品榜
+            //            '238', //新人价商品
+            //            '315', //秒杀未开始
+            '341', //3C新品
+            '342', //智能新品
+            '343', //3C长尾商品
+            '345', //时尚新品
+            '346', //时尚爆品
+            //            '1001', //选品库
+            //            '515', //订单接龙商品
+            //            '519', //官方活动
+            '12254', //超级补贴
+            '12318', //便宜包邮
+            '12339', //超市卡
         ];
         foreach ($eliteIdList as $eliteId) {
             $page = 1;
@@ -519,33 +520,34 @@ class Jd
     /*订单获取(时间段,时间不能超过一小时)*/
     public function orderList()
     {
-        $time = $this->request->params([
-            'startTime',
-            'endTime'
-        ]);
+        // $time = $this->request->params([
+        //     'startTime',
+        //     'endTime'
+        // ]);
+        $time['startTime'] = request()->param('startTime', '');
+        $time['endTime'] = request()->param('endTime', '');
+
         //自定义时间  每20分钟执行一次查询前半小时的数据
         if (!$time['startTime'] && !$time['endTime']) {
             $time['startTime'] = date("Y-m-d H:i:s", strtotime("-200 minute"));
             $time['endTime'] = date('Y-m-d H:i:s');
         }
-//        var_dump($time);
         try {
             $orderLists = [];
             $page = 1;
-            $pageSize = 40;
+            $pageSize = 200;
             $apiName = 'jd.union.open.order.row.query';
             do {
                 $params = [
                     'orderReq' => [
-                        'pageNo'    => $page,
-                        'pageSize'  => $pageSize,
-                        'type'      => 3,//(1：下单时间，2：完成时间（购买用户确认收货时间），3：更新时间
-                        'startTime' => $time['startTime'],//格式2020-01-02 21:23:00
-                        'endTime'   => $time['endTime'] //格式2020-01-02 21:24:00
+                        'pageIndex' => $page,
+                        'pageSize' => $pageSize,
+                        'type' => 3,//(1：下单时间，2：完成时间（购买用户确认收货时间），3：更新时间
+                        'startTime' => '2025-08-05 19:00:00',// $time['startTime'],//格式2020-01-02 21:23:00
+                        'endTime' => '2025-08-05 19:59:59'// $time['endTime'] //格式2020-01-02 21:24:00
                     ],
                 ];
                 $result = $this->getUrlResult($apiName, $params);
-//                var_dump($result);
                 $result = json_decode($result, true);
                 $result = json_decode($result['jd_union_open_order_row_query_responce']['queryResult'], true);
                 $lists = $result['data'];
@@ -554,13 +556,11 @@ class Jd
                     $orderLists = array_merge($orderLists, $lists);
                 }
 
-//                var_dump($result);
                 $page++;
-            } while ($countList == $pageSize);
+            } while ($countList == $pageSize && $result['hasMore'] ?? false);
             if (!empty($orderLists)) {
                 //格式化从京东拉取的订单列表
                 $formatLists = $this->formatOrderList($orderLists);
-//                var_dump($formatLists);
                 //将京东订单列表中的订单进行处理
                 $this->operatePinOrder($formatLists);
                 return app("json")->success("京东订单写入成功");
@@ -576,8 +576,7 @@ class Jd
     //格式化从京东拉取的订单列表
     public function formatOrderList($orderLists)
     {
-//        $user = app()->make(UserThirdRepository::class);
-        $formatLists = [];
+        $formatList = [];
         foreach ($orderLists as $order) {
             switch ($order['validCode']) {
                 case 15://待付款订单
@@ -592,92 +591,127 @@ class Jd
                 default://失效订单
                     $billStatus = 2;
             }
-            if($order['validCode']==15){ //未支付的不处理
+            if ($order['validCode'] == 15) { //未支付的不处理
                 continue;
             }
             //通过订单关联
             $positionId = $order['positionId'];
-            $userId = $positionId - pow(11, 5);
-            //订单关联推广位ID
-//            $pid = $order['subUnionId'] ?: '';
-            // if (empty($pid)) continue;
-            //订单关联推广位ID
-//            $chanTag = $user->getDetail(['pid' => $order['subUnionId'], 'type' => 6], 'uid,pid');
-            //if(!$chanTag){continue;}
-            $formatLists[] = [
-                'uid'              => $userId,
-                'sku_id'           => $order['skuId'],
-                'jd_id'            => $order['id'],
-                'order_sn'         => $order['orderId'],                              //订单编号
-                'sku_num'          => $order['skuNum'],                               //购买商品的数量
-                'image_url'        => $order['goodsInfo']['imageUrl'] ?? '',
-                'sku_name'         => $order['skuName'],
-                //订单中sku的单件价格，单位为分
-                'price'            => $order['price'],
-                //未知,2.无效-拆单,3.无效-取消,4.无效-京东帮帮主订单,5.无效-账号异常,6.无效-赠品类目不返佣,7.无效-校园订单,
-                //8.无效-企业订单,9.无效-团购订单,11.无效-乡村推广员下单,13.无效-违规订单,14.无效-来源与备案网址不符,
-                //15.待付款,16.已付款,17.已完成（购买用户确认收货）,20.无效-此复购订单对应的首购订单无效,21.无效-云店订单',
-                'status'           => $order['validCode'],
-                //商家信息
-                'shop_id'          => $order['goodsInfo']['shopId'],
-                //订单生成时间
-                'create_time'      => $order['orderTime'] ? $order['orderTime'] : 0,  //下单时间
-                'finish_time'      => $order['finishTime'] ? $order['finishTime'] : 0,//完成时间
-                'modify_time'      => $order['modifyTime'] ? $order['modifyTime'] : 0,//更新时间
-                'sub_union_id'     => $order['subUnionId'],                           //订单关联推广位ID
-                //佣金比例
-                'commission_share' => $order['finalRate'],                            //最终分佣比例
-                //实际佣金
-                'commission'       => $order['estimateFee'],
-                'bill_status'      => $billStatus,        //平台是否结算
-                'type'             => 2
+            $userId = $positionId - pow(10, 5);
+            if ($userId <= 0) {//拉取的订单没有匹配到用户
+                continue;
+            }
+
+            //订单实际计算佣金的金额（订单完成时，会将误扣除的运费券金额更正，如订单完成后发生退款，此金额会更新）
+            $goodsInfo = $order['goodsInfo'] ?? [];
+            $createTime = strtotime($order['orderTime']);
+            //平台可以进行结算的时间戳=订单创建时间+系统设置的间隔时间
+            $billEndTime = $this->userThird->getSettleTime($createTime);
+
+            $address = Db::name('user_address')->field('code_list,village_id')->where('uid', $userId)->where('is_default', 1)->find();
+            $formatList[] = [
+                'uid' => $userId,
+                'commission' => $order['actualFee'] ?: $order['estimateFee'],//佣金
+                'commission_share' => $order['finalRate'],
+                'order_sn' => $order['orderId'],
+                'pay_money' => $order['actualCosPrice'] ?: $order['estimateCosPrice'],
+                'jd_id' => $order['id'],
+                'create_time' => $order['orderTime'],
+                'finish_time' => $order['finishTime'],//用户确认收货时间
+                'modify_time' => $order['modifyTime'],//更新时间
+                'sku_num' => $order['skuNum'],
+                'sku_id' => $order['itemId'] ?? '', // 目前京东官方不返回 skuId
+                'sku_name' => $order['skuName'],
+                'price' => $order['price'],//原价
+                'sub_union_id' => $order['positionId'],
+                'image_url' => $goodsInfo['imageUrl'] ?? '',
+                'shop_name' => $goodsInfo['shopName'] ?? '京东',
+                'shop_id' => $goodsInfo['shopId'] ?? 0,
+                'status' => $order['validCode'],//订单状态
+                'bill_status' => $billStatus,        //平台是否结算
+                'bill_end_time' => $billEndTime,
+                'user_address_ids' => !empty($address) ? $address['code_list'] . ',' . $address['village_id'] : '',
+                'type' => 1
             ];
         }
-        return $formatLists;
+        return $formatList;
     }
 
     //将拼多多订单列表中的订单写入第三方平台订单表
     public function operatePinOrder($orderLists)
     {
+        /** @var UserThirdRepository $orderThird */
         $orderThird = app()->make(UserThirdRepository::class);
+        $type_shop = 6;
         foreach ($orderLists as $k => $order) {
             if (empty($order)) continue;
             //判断数据库有无此订单
-            $orderVip = $orderThird->getOrderDetail("order_jd", ['order_sn' => $order['order_sn'], 'sub_union_id' => $order['sub_union_id']]);
-            if (!$orderVip) {
-                // 读取商品详情 拿到商品图
-                $third_party_goods_detail = Db::name('third_party_goods')->whereLike('json', '%' . $order['sku_id'] . '%')->find();
-                $third_party_goods_json_detail = json_decode($third_party_goods_detail['json'], true);
-                $order['image_url'] =  $third_party_goods_json_detail['thumb']??'';
-
-                $orderThird->createOrder('order_jd', $order, strtotime($order['create_time'])); //订单写入数据库
+            $localOrder = JdOrderModel::getInstance()->getOne(['order_sn' => $order['order_sn']]);
+            if (empty($localOrder)) {
+                //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
+                $localOrder = JdOrderModel::create($order);
                 //预估养老金
                 $orderThird->yuguOrder(
-                    $order['jd_id'],
-                    $order['commission'],
-                    $order['uid'],
-                    $order['order_sn'],
-                    6,
+                    $localOrder['order_jd_id'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    $type_shop,
                     'order_jd');
                 //预估积分
                 $orderThird->yuguJifen(
-                    $order['jd_id'],
-                    $order['commission'],
-                    $order['uid'],
-                    $order['order_sn'],
-                    6
+                    $localOrder['order_jd_id'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    $type_shop
                 );
             } else {
-                //更新
-                if ($orderVip['status'] != $order['status']) {
-                    $saveOrderPdd['status'] = $order['status'];
-                    if(isset($order['bill_status'])){
-                        $saveOrderPdd['bill_status'] = $order['bill_status'];
+                if($localOrder['status']!=$order['status']) {
+                    $localOrder->save($order);//更新订单信息
+                    if(!in_array($order['status'],[15,16,17])){
+                        //修改积分和贡献,yanglaojin值记录
+                        $orderThird->updateJilu(
+                            $localOrder['uid'],
+                            $localOrder['order_jd_id'],
+                            $type_shop);
                     }
-                    $orderThird->saveOrder("order_jd", ['order_jd_id' => $orderVip['order_jd_id']], $saveOrderPdd); //修改订单
                 }
             }
 
+            // $orderVip = $orderThird->getOrderDetail("order_jd", ['order_sn' => $order['order_sn'], 'sub_union_id' => $order['sub_union_id']]);
+            // if (!$orderVip) {
+            //     // 读取商品详情 拿到商品图
+            //     $third_party_goods_detail = Db::name('third_party_goods')->whereLike('json', '%' . $order['sku_id'] . '%')->find();
+            //     $third_party_goods_json_detail = json_decode($third_party_goods_detail['json'], true);
+            //     $order['image_url'] =  $third_party_goods_json_detail['thumb']??'';
+            //
+            //     $orderThird->createOrder('order_jd', $order, strtotime($order['create_time'])); //订单写入数据库
+            //     //预估养老金
+            //     $orderThird->yuguOrder(
+            //         $order['jd_id'],
+            //         $order['commission'],
+            //         $order['uid'],
+            //         $order['order_sn'],
+            //         6,
+            //         'order_jd');
+            //     //预估积分
+            //     $orderThird->yuguJifen(
+            //         $order['jd_id'],
+            //         $order['commission'],
+            //         $order['uid'],
+            //         $order['order_sn'],
+            //         6
+            //     );
+            // } else {
+            //     //更新
+            //     if ($orderVip['status'] != $order['status']) {
+            //         $saveOrderPdd['status'] = $order['status'];
+            //         if(isset($order['bill_status'])){
+            //             $saveOrderPdd['bill_status'] = $order['bill_status'];
+            //         }
+            //         $orderThird->saveOrder("order_jd", ['order_jd_id' => $orderVip['order_jd_id']], $saveOrderPdd); //修改订单
+            //     }
+            // }
         }
     }