Merge branch 'master' of https://git.bjtdba.com/shop/php

app/command/CommercialAreaOrderIndependentAccount.php

@@ -44,36 +44,31 @@ class CommercialAreaOrderIndependentAccount extends Command
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
 
-        $time = time();
         // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
         $status = [2, 3];
         // 已支付、未结算
-        $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0];
+        $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0, 'is_settlement' => 1];
         // 普通订单 @todo 排除 特殊商户{$excludeMerId}：精彩生活区、会员区、复购区
         $cursor = Db::table('rrx_store_order')->where($where)->where('pay_type', 'in', '1,2,4')->whereIn('status', $status)
             ->whereNotIn('mer_id', $excludeMerId)->cursor();
         foreach ($cursor as $key => $value) {
-            $settlement_period_time = strtotime($value['create_time']) + $timeLimit * 24 * 3600;
-            // @todo 下单后第{$timeLimit}天后可分账
-            if ($settlement_period_time >= $time) {
-                if (!isset($merchants[$value['mer_id']])) {
-                    $merchants[$value['mer_id']] = Db::name('merchant')->where('mer_id', $value['mer_id'])->find();
-                }
-                $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
-                // @todo 分账账号 496：表示{会员专区}账户；商贸区分账如下：成本分账到商户，利润分账到{会员专区}账户
-                $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
+            if (!isset($merchants[$value['mer_id']])) {
+                $merchants[$value['mer_id']] = Db::name('merchant')->where('mer_id', $value['mer_id'])->find();
+            }
+            $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
+            // @todo 分账账号 496：表示{会员专区}账户；商贸区分账如下：成本分账到商户，利润分账到{会员专区}账户
+            $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
 
-                // @todo 预分账处理
-                $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
-                    $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_member_id'], $independentAccount['hf_platform_member_id'], $value['cost'], $value['con_pri']
-                );
-                if ($isSuccessed) {
-                    Db::name("log")->insert(array('data' => '商贸区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));//日志记录
+            // @todo 预分账处理
+            $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
+                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_member_id'], $independentAccount['hf_platform_member_id'], $value['cost'], $value['con_pri']
+            );
+            if ($isSuccessed) {
+                Db::name("log")->insert(array('data' => '商贸区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));// 日志记录
 
-                    $order = StoreOrder::getInstance()->where('order_id', $value['order_id'])->find();
-                    $order->is_independentaccount = 1;
-                    $order->save();
-                }
+                $order = StoreOrder::getInstance()->where('order_id', $value['order_id'])->find();
+                $order->is_independentaccount = 1;
+                $order->save();
             }
         }
     }

app/command/GreatLifeOrderIndependentAccount.php

@@ -3,19 +3,11 @@
 namespace app\command;
 
 use app\common\model\store\order\StoreOrder;
-use app\common\model\user\UserCertification;
-use app\common\repositories\merchant\order\OrderGzcRepository;
-use app\common\repositories\merchant\order\OrderMerchantRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
-use app\common\repositories\store\order\StoreOrderStatusRepository;
-use app\common\repositories\user\UserBillRepository;
-use app\common\repositories\user\UserRepository;
-use Carbon\Carbon;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
 use think\facade\Db;
-use think\facade\Log;
 
 class GreatLifeOrderIndependentAccount extends Command
 {
@@ -49,9 +41,8 @@ class GreatLifeOrderIndependentAccount extends Command
         // 商户信息
         $merchants = [];
 
-        $time = time();
         // 已支付、未结算
-        $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0];
+        $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0, 'is_settlement' => 1];
         // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
         $status = [2, 3];
         // 普通订单
@@ -62,30 +53,27 @@ class GreatLifeOrderIndependentAccount extends Command
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
 
         foreach ($cursor as $key => $value) {
-            $settlement_period_time = strtotime($value['create_time']) + $timeLimit * 24 * 3600;
-            // @todo 下单后第{$timeLimit}天后可分账
-            if ($settlement_period_time >= $time) {
-                if (!isset($merchants[$value['mer_id']])) {
-                    $merchants[$value['mer_id']] = Db::name('merchant')->where('mer_id', $value['mer_id'])->find();
-                }
-                $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
+            if (!isset($merchants[$value['mer_id']])) {
+                $merchants[$value['mer_id']] = Db::name('merchant')->where('mer_id', $value['mer_id'])->find();
+            }
+            $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
 
-                // 分账账号 496：表示{会员专区}账户，精彩生活区分账到{会员专区}账户
-                $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
+            // 分账账号 496：表示{会员专区}账户，精彩生活区分账到{会员专区}账户
+            $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
 
-                // @todo 预分账处理 496：表示{会员专区}账户，精彩生活区分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
-                $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
-                    $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['pay_price'], 0
-                );
-                if ($isSuccessed) {
-                    Db::name("log")->insert(array('data' => '精彩生活区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));//日志记录
+            // @todo 预分账处理 496：表示{会员专区}账户，精彩生活区分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
+            $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
+                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['pay_price'], 0
+            );
+            if ($isSuccessed) {
+                Db::name("log")->insert(array('data' => '精彩生活区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));// 日志记录
 
-                    $order = StoreOrder::getInstance()->where('order_id', $value['order_id'])->find();
-                    $order->is_independentaccount = 1;
-                    $order->save();
-                }
+                $order = StoreOrder::getInstance()->where('order_id', $value['order_id'])->find();
+                $order->is_independentaccount = 1;
+                $order->save();
             }
         }
+
     }
 
 }

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

@@ -916,6 +916,30 @@ class StoreOrderRepository extends BaseRepository
 
                             }
 
+                            // 记录日志
+                            Db::name("user_sign_vr")->insert([
+                                'uid' => $uid,
+                                'number' => $array_fzone_paytype['price'],
+                                'mark' => "购买商品消费VR",
+                                'desc' => "VR",
+                                'order_type' => 0,
+                                'order_id' => $_order->order_id,
+                                'surplus' => $vrpri,
+                                'type' => 2,
+                                'addtime' => time()
+                            ]);
+                            Db::name('user_sign_score')->insert([
+                                'uid' => $uid,
+                                'reward_socre' => $array_fzone_paytype['other'],
+                                'addtime' => time(),
+                                'status' => 1,
+                                'order_type' => 0,
+                                'order_id' => $_order->order_id,
+                                'mark' => '购买商品消费积分',
+                                'desc' => '',
+                                'surplus' => $pricepri,
+                                'pm' => 2
+                            ]);
 
                         } else if (!empty($array_fzone_paytype['type'] == 'b2')) {
                             //精彩生活现金+积分
@@ -929,14 +953,26 @@ class StoreOrderRepository extends BaseRepository
                             //     // //修改订单状态
                             //     $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,'douhuomall'=>1,'douhuomall_status'=>9]);
                             //     Db::name("store_group_order")->where("group_order_id",  $groupOrder->group_order_id)->update(['pay_price'=> $array_fzone_paytype['price']]);
-
                             //     $paystage_status = 1;
-
                             // }else{
                             //     $groupOrder['er'] = 1;
                             //     $groupOrder['er1'] = "支付失败，积分不足";
                             // }
 
+                            $pricepri = $userdatas['score'] - $array_fzone_paytype['other'];
+                            Db::name('user_sign_score')->insert([
+                                'uid' => $uid,
+                                'reward_socre' => $array_fzone_paytype['other'],
+                                'addtime' => time(),
+                                'status' => 1,
+                                'order_type' => 0,
+                                'order_id' => $_order->order_id,
+                                'mark' => '购买商品消费积分',
+                                'desc' => '',
+                                'surplus' => $pricepri,
+                                'pm' => 2
+                            ]);
+
 
                         } else if (!empty($array_fzone_paytype['type'] == 'b3')) {
                             //精彩生活区 || 商贸区 VR+京豆
@@ -960,9 +996,45 @@ class StoreOrderRepository extends BaseRepository
 
                             }
 
-                        } else if (!empty($array_fzone_paytype['type'] == 'b4')) {
-                            //精彩生活区 VR+京豆
+                            Db::name("user_sign_vr")->insert([
+                                'uid' => $uid,
+                                'number' => $array_fzone_paytype['price'],
+                                'mark' => "购买商品消费VR",
+                                'desc' => "VR",
+                                'order_type' => 0,
+                                'order_id' => $_order->order_id,
+                                'surplus' => $vrpri,
+                                'type' => 2,
+                                'addtime' => time()
+                            ]);
+                            Db::name('user_sign_jingdou')->insert([
+                                'uid' => $uid,
+                                'number' => $array_fzone_paytype['other'],
+                                'status' => 1,
+                                'mark' => '购买商品消费京豆',
+                                'addtime' => time(),
+                                'surplus' => $pricepri,
+                                'settlement_time' => date('Y-m-d H:i:s'),
+                                'type' => 2,
+                                'order_type' => 0,
+                                'order_id' => $_order->order_id
+                            ]);
 
+                        } else if (!empty($array_fzone_paytype['type'] == 'b4')) {
+                            // 精彩生活区 现金+京豆
+                            $pricepri = $userdatas['jingdou'] - $array_fzone_paytype['other'];
+                            Db::name('user_sign_jingdou')->insert([
+                                'uid' => $uid,
+                                'number' => $array_fzone_paytype['other'],
+                                'status' => 1,
+                                'mark' => '购买商品消费京豆',
+                                'addtime' => time(),
+                                'surplus' => $pricepri,
+                                'settlement_time' => date('Y-m-d H:i:s'),
+                                'type' => 2,
+                                'order_type' => 0,
+                                'order_id' => $_order->order_id
+                            ]);
 
 //                            $groupOrder['er'] = 1;
 //                            $groupOrder['er1'] = "开发中升级中！";
@@ -985,9 +1057,9 @@ class StoreOrderRepository extends BaseRepository
                                 $log_data = [
                                     'uid' => $uid,
                                     'number' => $array_fzone_paytype['price'],
-                                    'mark' => "购买精彩区商品消费VR:" . $array_fzone_paytype['price'],
+                                    'mark' => "购买商品消费VR",
                                     'desc' => "VR",
-                                    'order_id' => 0,
+                                    'order_id' => $_order->order_id,
                                     'surplus' => $vrpri,
                                     'order_type' => 0,
                                     'type' => 2,
@@ -1061,7 +1133,7 @@ class StoreOrderRepository extends BaseRepository
                                 'number' => $array_fzone_paytype['price'],
                                 'mark' => "购买会员专区商品消费VR:" . $array_fzone_paytype['price'],
                                 'desc' => "VR",
-                                'order_id' => 0,
+                                'order_id' => $_order->order_id,
                                 'surplus' => $vrpri,
                                 'order_type' => 0,
                                 'type' => 2,
@@ -1088,9 +1160,9 @@ class StoreOrderRepository extends BaseRepository
                                         $log_data = [
                                             'uid' => $uid,
                                             'number' => $array_fzone_paytype['other'],
-                                            'mark' => "购买会员专区商品消费VR:" . $array_fzone_paytype['other'],
+                                            'mark' => "购买商品消费VR",
                                             'desc' => "VR",
-                                            'order_id' => 0,
+                                            'order_id' => $_order->order_id,
                                             'surplus' => $total_vr,
                                             'order_type' => 0,
                                             'type' => 2,