Commit bda91135 authored by clone's avatar clone

1

parent d011bc95
......@@ -87,7 +87,7 @@ class OrderLogService
$redis_service = new RedisCacheService();
$agent_data = $redis_service->getRedisCache(2, $agent_id);
$store_id = $agent_data['store_id'];
if($store_id <= 0){
if ($store_id <= 0) {
return -3;
}
foreach ($collecting_bill as $collecting) {
......@@ -127,7 +127,7 @@ class OrderLogService
if ($pay_id > 0) {
$payLogService = new PayLogService();
$payLogService->addAdjustment($father_id, $pay_id, $money, $type, $agent_id,$store_id);
$payLogService->addAdjustment($father_id, $pay_id, $money, $type, $agent_id, $store_id);
}
$pushMarchIn = new PushMessageService();
......@@ -1136,6 +1136,7 @@ class OrderLogService
if (count($marchInData) > 0) {
foreach ($marchInData as $k => $v) {
$v["step_name"] = "march_in";
$v["user_id"] = $tree[$v["report_id"]]["user_id"];
$v["step"] = "进场【客户ID:" . $tree[$v["report_id"]]["user_id"] . "】";
$result[$sort++] = $v;
}
......@@ -1148,6 +1149,7 @@ class OrderLogService
if (count($payLogData) > 0) {
foreach ($payLogData as $k => $v) {
$v["step_name"] = "pay_log";
$v["user_id"] = $tree[$v["report_id"]]["user_id"];
$v["step"] = "收款【客户ID:" . $tree[$v["report_id"]]["user_id"] . "】";
$result[$sort++] = $v;
}
......@@ -1161,6 +1163,7 @@ class OrderLogService
if (count($refundData) > 0) {
foreach ($refundData as $k => $v) {
$v["step_name"] = "refund";
$v["user_id"] = $tree[$v["report_id"]]["user_id"];
$v["step"] = "退款【客户ID:" . $tree[$v["report_id"]]["user_id"] . "】";
$result[$sort++] = $v;
}
......@@ -1172,6 +1175,7 @@ class OrderLogService
if (count($bargainData) > 0) {
foreach ($bargainData as $k => $v) {
$v["step_name"] = "bargain";
$v["user_id"] = $tree[$v["report_id"]]["user_id"];
$v["step"] = "成交报告【客户ID:" . $tree[$v["report_id"]]["user_id"] . "】";
$result[$sort++] = $v;
}
......@@ -1470,7 +1474,7 @@ class OrderLogService
$vip = new VipService();//0:有权限 1:无权限
$vip_house = $vip->checkRule($agent_id, 'index/inspectionRecordAll/3');
if($vip_house == 1){
if ($vip_house == 1) {
$aService = new VerifyService();
$ids = $aService->getAgentsByAgentId($agent_id);
$params["ids"] = $ids;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment