Merge branch 'master' into huangfamily

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -153,6 +153,9 @@ class UserOfflineRechargeRepository extends BaseRepository
                     ]);
                     $user->annuity += $order->pension;
                     $user->annuity_num += 1;
+                    if (!$user->mer_id || !$user->locktime) {
+                        Db::name('user')->where('uid', $unionUser->uid)->update(['mer_id' => $order->mer_id, 'locktime' => date('Y-m-d H:i:s')]);
+                    }
                     $user->save();
 
                     //同步用户部分------------------------------------
@@ -184,6 +187,7 @@ class UserOfflineRechargeRepository extends BaseRepository
                     ];
                     $user = Db::name('user')->where('uid', $unionUser->uid)->find();
                     $userRepository->feidacang_fenyong($user, $order_data, 0);
+                    $userRepository->feidacang_fenyong_mer($user, $order_data, 0);
 
                     OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->update(['uid' => $unionUser->uid, 'binds' => 1]);
                 }

app/controller/api/cron/CommissionCron.php

@@ -1303,4 +1303,10 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
         $this->sendEMail(['389123492@qq.com', '420132441@qq.com'], '结算定时', "执行结束<br/>" . $mallStr . date('Y-m-d H:i:s'), '如果邮件客户端不支持HTML则显示此内容');
     }
 
+
+
+    public function cesexx(){
+        // $storeOrderRepository = app()->make(StoreOrderRepository::class);
+        // $storeOrderRepository->douhuomall_delivery();
+    }
 }

route/api.php

@@ -1256,6 +1256,7 @@ Route::group('api/', function () {
     Route::get('platform_income_detail_get', 'api.cron.CommissionCron/platform_income_detail_get');//插入平台收支明细
     Route::get('clear_platform_income_detail', 'api.cron.CommissionCron/clear_platform_income_detail');//删除平台收支明细
     Route::get('take', 'api.cron.CommissionCron/take');//插入平台收支明细
+    Route::get('cesexx', 'api.cron.CommissionCron/cesexx');
     Route::get('order/group_detail/:id', 'api.store.order.StoreOrder/group_detail');//订单详情
     Route::get('commission_cron_bonus', 'api.cron.CommissionCron/bonus');