hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

删除无用的注释和文件

Browse Source
This commit is contained in:
hawind
2021-03-02 01:08:44 +08:00
parent 8f5b66bb92
commit 89bab045dd
147 changed files with 214 additions and 9816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Customer/Controllers/AuthController.php
-48
View File
@@ -1,48 +0,0 @@
<?php namespace Gdoo\Customer\Controllers;
use Auth;
use Session;
use Request;
use Gdoo\User\Models\User;
use Gdoo\Index\Controllers\Controller;
class AuthController extends Controller
{
/**
* 经销商业务员登录专用接口
*/
public function salemanAction()
{
if (Request::method() == 'POST') {
$gets = Request::all();
if (empty($gets['username'])) {
return $this->json('客户代码不能为空。');
}
$user = User::where('username', $gets['username'])
->where('status', 1)
->where('group_id', 2)->first();
if ($user->id > 0) {
Auth::login($user, true);
Session::put('auth_totp', true);
return $this->json('登录成功。', true);
} else {
return $this->json('登录失败，客户代码无效。');
}
}
return $this->json('登录失败。');
}
public function json($data, $status = false, $type = 'primary')
{
$json = [];
$json['status'] = $status;
$json['state'] = $status;
$json['info'] = $type;
$json['data'] = $data;
return response()->json($json);
}
}
app/Gdoo/Customer/Controllers/ComplaintController.php
-10
View File
@@ -16,9 +16,6 @@ class ComplaintController extends WorkflowController
{
public $permission = ['dialog'];
/**
* 订单列表
*/
public function indexAction()
{
// 客户权限
@@ -84,7 +81,6 @@ class ComplaintController extends WorkflowController
]);
}
// 新建促销
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -107,27 +103,21 @@ class ComplaintController extends WorkflowController
return $this->display(['form' => $form], $tpl);
}
// 编辑促销
public function editAction()
{
return $this->createAction();
}
// 显示促销
public function showAction()
{
return $this->createAction('show');
}
// 显示促销
public function printAction()
{
return $this->createAction('print');
}
/**
* 订单删除
*/
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Customer/Controllers/ContactController.php
+2 -9
View File
@@ -76,7 +76,6 @@ class ContactController extends DefaultController
]);
}
// 新建客户联系人
public function createAction($action = 'edit')
{
$id = (int)Request::get('id');
@@ -86,19 +85,16 @@ class ContactController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction();
}
// 显示客户联系人
public function showAction()
{
return $this->createAction('show');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
@@ -107,13 +103,10 @@ class ContactController extends DefaultController
}
}
/**
* 弹出层信息
*/
public function dialogAction()
{
$header = Grid::header([
'code' => 'customer_contact',
'code' => 'customer_contact',
]);
$search = $header['search_form'];
$query = $search['query'];
@@ -131,7 +124,7 @@ class ContactController extends DefaultController
}
}
// 客户圈权限
// 销售组权限
$region = regionCustomer();
if ($region['authorise']) {
foreach ($region['whereIn'] as $key => $where) {
app/Gdoo/Customer/Controllers/CustomerApplyController.php
-5
View File
@@ -93,7 +93,6 @@ class CustomerApplyController extends WorkflowController
]);
}
// 新建客户联系人
public function createAction($action = 'create')
{
$id = (int)Request::get('id');
@@ -112,25 +111,21 @@ class CustomerApplyController extends WorkflowController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction('edit');
}
// 审核
public function auditAction()
{
return $this->createAction('audit');
}
// 显示客户联系人
public function showAction()
{
return $this->createAction('show');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Customer/Controllers/CustomerClassController.php
-1
View File
@@ -101,7 +101,6 @@ class CustomerClassController extends DefaultController
$model->search($where);
}
}
// $model->where('end', 1);
$rows = $model->get();
return response()->json(['data' => $rows]);
}
app/Gdoo/Customer/Controllers/CustomerController.php
-9
View File
@@ -104,7 +104,6 @@ class CustomerController extends DefaultController
]);
}
// 新建客户联系人
public function createAction($action = 'create')
{
$id = (int)Request::get('id');
@@ -129,13 +128,11 @@ class CustomerController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction('edit');
}
// 批量编辑
public function batchEditAction()
{
$gets = Request::all();
@@ -156,7 +153,6 @@ class CustomerController extends DefaultController
]);
}
// 销售产品价格
public function priceEditAction()
{
$gets = Request::all();
@@ -195,7 +191,6 @@ class CustomerController extends DefaultController
]);
}
// 显示客户联系人
public function showAction()
{
return $this->createAction('show');
@@ -211,7 +206,6 @@ class CustomerController extends DefaultController
return $this->render(['tips' => $tips], 'layouts.import');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
@@ -220,9 +214,6 @@ class CustomerController extends DefaultController
}
}
/**
* 弹出层信息
*/
public function dialogAction()
{
$search = search_form(
app/Gdoo/Customer/Controllers/DeliveryAddressController.php
-7
View File
@@ -75,7 +75,6 @@ class DeliveryAddressController extends DefaultController
]);
}
// 新建客户联系人
public function createAction($action = 'edit')
{
$id = (int)Request::get('id');
@@ -85,19 +84,16 @@ class DeliveryAddressController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction();
}
// 显示客户联系人
public function showAction()
{
return $this->createAction('show');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
@@ -106,9 +102,6 @@ class DeliveryAddressController extends DefaultController
}
}
/**
* 弹出层信息
*/
public function dialogAction()
{
$header = Grid::header([
app/Gdoo/Customer/Controllers/PriceController.php
-7
View File
@@ -86,7 +86,6 @@ class PriceController extends DefaultController
]);
}
// 新建促销
public function createAction($action = 'edit')
{
$id = (int)Request::get('id');
@@ -96,19 +95,16 @@ class PriceController extends DefaultController
], 'create');
}
// 编辑促销
public function editAction()
{
return $this->createAction();
}
// 显示促销
public function showAction()
{
return $this->createAction('edit');
}
// 客户价格列表
public function listAction()
{
$gets = Request::all();
@@ -135,7 +131,6 @@ class PriceController extends DefaultController
return $this->json($rows, true);
}
// 参考客户价格
public function referCustomerAction()
{
$search = search_form(
@@ -186,7 +181,6 @@ class PriceController extends DefaultController
]);
}
// 数据导入
public function importAction()
{
if (Request::method() == 'POST') {
@@ -196,7 +190,6 @@ class PriceController extends DefaultController
return $this->render(['tips' => $tips], 'layouts.import');
}
// 删除促销
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Customer/Controllers/ReconcileController.php
-210
View File
@@ -1,210 +0,0 @@
<?php namespace Gdoo\Customer\Controllers;
use DB;
use Request;
use Validator;
use Gdoo\User\Models\User;
use Gdoo\Customer\Models\Customer;
use Gdoo\Customer\Models\CustomerType;
use Gdoo\Index\Models\Region;
use Gdoo\Index\Controllers\DefaultController;
class ReconcileController extends DefaultController
{
public $permission = [];
// 单客户查询对账数据
public function queryAction()
{
$search = search_form([
'customer' => '',
'start_at' => '',
'end_at' => '',
], []);
$query = $search['query'];
if ($query['customer']) {
$customer = DB::table('customer')
->leftJoin('user', 'customer.user_id', '=', 'user.id')
->where('customer.id', $query['customer'])
->first();
$ch = curl_init(env('YONYOU_URL').'/yonyou.php?do=ar&start_at='.$query['start_at'].'&end_at='.$query['end_at'].'&customer_code='.$customer['username']);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$res = curl_exec($ch);
curl_close($ch);
$data = json_decode($res, true);
$lists = [];
foreach ($data as $row) {
$cDwCode = $row['cDwCode'];
$lists[$cDwCode][] = $row;
}
$res = [];
$total_start = $total_end = 0;
foreach ($lists as $code => $rows) {
$ye = 0;
foreach ($rows as $i => $row) {
$ye = $ye + $row['ye'];
$ye = $ye + $row['jf'] - $row['df'];
if($row['iYear'] && $row['iMonth'] && $row['iDay']) {
$date = date('Y-m-d', strtotime($row['iYear'].'-'.$row['iMonth'].'-'.$row['iDay']));
$jf = number_format($row['jf'], 2);
$df = number_format($row['df'], 2);
$res[] = [
'code' => $code,
'date' => $date,
'jmoney' => $jf,
'dmoney' => $df,
'balance' => number_format($ye, 2),
'ccusname' => $row['ccusname'],
'digest' => $row['cDigest'],
'ddh' => $row['ddh'],
'zp' => number_format($row['zp'], 2),
];
} else {
$res[] = [
'balance' => number_format($row['ye'], 2),
'ccusname' => $row['ccusname'],
'code' => $code,
'digest' => $row['cDigest'],
];
$total_start += $row['ye'];
}
}
$res[] = [
'balance' => number_format($ye, 2),
'ccusname' => $rows[0]['ccusname'],
'code' => $code,
'digest' => '期末余额'
];
$total_end += $ye;
}
array_unshift($res, [
'balance' => number_format($total_start, 2),
'digest' => '总期初余额',
'ccusname' => '总期初合计',
]);
$res[] = [
'balance' => number_format($total_end, 2),
'digest' => '总期末余额',
'ccusname' => '总期末合计',
];
if (Request::method() == 'POST') {
return response()->json($res);
}
}
return $this->display();
}
// 生成对账单
public function createAction()
{
set_time_limit(0);
if (Request::method() == 'POST') {
$gets = Request::all();
$rules = [
'start_at' => 'required|date',
'end_at' => 'required|date',
];
$v = Validator::make($gets, $rules, [], ['start_at' => '开始日期', 'end_at' => '结束日期']);
if ($v->fails()) {
return $this->json($v->errors()->all());
}
/** 数据同步 **/
$ch = curl_init(env('YONYOU_URL').'/yonyou.php?do=ar&start_at='.$gets['start_at'].'&end_at='.$gets['end_at']);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$res = curl_exec($ch);
curl_close($ch);
$res = json_decode($res, true);
// 获取客户数据
$customers = DB::table('user')
->leftJoin('customer', 'customer.user_id', '=', 'user.id')
->where('group_id', 2)
->pluck('customer.id', 'user.username');
$rows = [];
foreach ($res['data'] as $row) {
if ($row['code']) {
$rows[$row['code']][] = $row;
/*
if(empty($customers[$row['code']])) {
return $this->json('订单系统不存在此客户代码: ['.$row['code'].']');
}
*/
}
}
// 总余额
$yes = $res['ye'];
foreach ($rows as $code => $row) {
$account_id = DB::table('customer_account')->insertGetId([
'sn' => date('Ymd').$code,
'date' => date('Ymd'),
'code' => $code,
'customer_id' => (int)$customers[$code],
'start_at' => $gets['start_at'],
'end_at' => $gets['end_at'],
]);
// 单客户余额
$ye = $yes[$row['zcode']] > 0 ? $yes[$row['zcode']] : 0.00;
// 写入余额数据
DB::table('customer_account_data')->insert([
'code' => $code,
'account_id' => $account_id,
'balance' => $ye,
'digest' => '期初余额小计',
]);
foreach ($row as $i => $cell) {
$ye = $ye + $cell['jf'] - $cell['df'];
$data = [
'account_id' => $account_id,
'sn' => date('Ymd').$i,
'date' => $cell['date'],
'ycode' => $cell['ycode'],
'zcode' => $cell['zcode'],
'code' => $cell['code'],
'jmoney' => $cell['jf'],
'dmoney' => $cell['df'],
'balance' => $ye,
'digest' => $cell['digest'],
];
DB::table('customer_account_data')->insert($data);
}
DB::table('customer_account_data')->insert([
'code' => $code,
'account_id' => $account_id,
'balance' => $ye,
'digest' => '期木余额小计',
]);
// 更新余额
DB::table('customer_account')->where('id', $account_id)->update([
'balance' => $ye,
]);
}
return $this->json('reload', true);
}
return $this->render();
}
}
app/Gdoo/Customer/Controllers/RegionController.php
-3
View File
@@ -79,7 +79,6 @@ class RegionController extends DefaultController
]);
}
// 新建客户联系人
public function createAction()
{
$id = (int)Request::get('id');
@@ -97,7 +96,6 @@ class RegionController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction();
@@ -149,7 +147,6 @@ class RegionController extends DefaultController
]);
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Customer/Controllers/RegionTaskController.php
-4
View File
@@ -91,7 +91,6 @@ class RegionTaskController extends AuditController
]);
}
// 新建客户联系人
public function createAction($action = 'create')
{
$id = (int)Request::get('id');
@@ -112,13 +111,11 @@ class RegionTaskController extends AuditController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction('edit');
}
// 显示客户联系人
public function showAction()
{
return $this->createAction('show');
@@ -303,7 +300,6 @@ class RegionTaskController extends AuditController
]);
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Customer/Controllers/TaskController.php
-4
View File
@@ -81,7 +81,6 @@ class TaskController extends AuditController
]);
}
// 新建客户联系人
public function createAction($action = 'create')
{
$id = (int)Request::get('id');
@@ -101,13 +100,11 @@ class TaskController extends AuditController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction('edit');
}
// 显示客户联系人
public function showAction()
{
return $this->createAction('show');
@@ -367,7 +364,6 @@ class TaskController extends AuditController
return view('importExcel');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Customer/Controllers/TaxController.php
+1 -5
View File
@@ -83,7 +83,6 @@ class TaxController extends AuditController
]);
}
// 新建客户联系人
public function createAction($action = 'edit')
{
$id = (int)Request::get('id');
@@ -93,13 +92,11 @@ class TaxController extends AuditController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction('edit');
}
// 创建客户联系人
public function showAction()
{
return $this->createAction('show');
@@ -168,8 +165,7 @@ class TaxController extends AuditController
'header' => $header
]);
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Customer/Controllers/TokenController.php
-65
View File
@@ -1,65 +0,0 @@
<?php namespace Gdoo\Customer\Controllers;
use Auth;
use Session;
use Request;
use Gdoo\User\Models\UserAsset;
use Gdoo\User\Models\User;
use Gdoo\Customer\Models\Customer;
use Gdoo\Customer\Models\Contact;
use Gdoo\User\Controllers\TokenController as Controller;
use Gdoo\User\Services\UserAssetService;
class TokenController extends Controller
{
public function salesmanAction()
{
if (Request::isJson()) {
$gets = json_decode(Request::getContent(), true);
} else {
$gets = Request::all();
}
$username = trim($gets['username']);
$password = trim($gets['password']);
if ($username == '') {
return response()->json(['message'=>'客户代码不能为空。']);
}
if ($password == '') {
return response()->json(['message'=>'联系人手机不能为空。']);
}
// 获取登录用户
$user = User::where('username', $username)
->where('group_id', 2)
->where('status', 1)
->first();
if ($user) {
// 获取客户档案
$customer = Customer::where('user_id', $user->id)->first();
// 登录的客户业务员信息
$contact = Contact::leftJoin('user', 'user.id', '=', 'customer_contact.user_id')
->where('customer_contact.customer_id', $customer->id)
->where('user.phone', $password)
->first(['user.*', 'customer_contact.id as contact_id']);
if ($contact) {
$assets = UserAssetService::getRoleAssets($user->role_id);
return response()->json([
'token' => $this->createToken($user->id),
'contact_id' => $contact->contact_id,
'access' => $assets,
]);
} else {
return response()->json(['message'=>'客户代码或联系人手机错误。']);
}
}
return response()->json(['message'=>'客户代码或联系人手机错误。']);
}
}
app/Gdoo/Customer/Controllers/TypeController.php
-3
View File
@@ -69,7 +69,6 @@ class TypeController extends DefaultController
]);
}
// 新建客户联系人
public function createAction()
{
$id = (int)Request::get('id');
@@ -79,7 +78,6 @@ class TypeController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction();
@@ -107,7 +105,6 @@ class TypeController extends DefaultController
]);
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Customer/views/reconcile/query.blade.php
-129
View File
@@ -1,129 +0,0 @@
<div class="panel">
<div class="wrapper-sm">
<form class="form-inline" method="post" id="query-form" name="query-form">
<div class="form-inline">
<div class="row">
<?php $m = date('Y-m-01'); ?>
<div class="form-group">
<div class="col-sm-12">
<label class="control-label">对账客户</label>
{{App\Support\Dialog::user('customer', 'customer', '', 0, 0, 135)}}
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<label class="control-label">开始日期</label>
<input class="form-control input-sm" data-toggle="date" type="text" name="start_at" id="start_at" placeholder="开始日期" value="{{$m}}">
</div>
</div>
<div class="form-group m-b-xs">
<div class="col-sm-12">
<label class="control-label">开始日期</label>
<input class="form-control input-sm" data-toggle="date" type="text" id="end_at" placeholder="开始日期" name="end_at" value="{{date('Y-m-d', strtotime("$m +1 month -1 day"))}}">
<div class="visible-xs-block m-t"></div>
<span class="hidden-xs">&nbsp;</span>
<a href="javascript:formQuery();" class="btn btn-sm btn-info"><i class="icon icon-search"></i> 查询</a>
</div>
</div>
</div>
</div>
</form>
</div>
<div class="list-jqgrid">
<table id="account-single"></table>
</div>
</div>
<script>
var $table = null;
var params = {};
(function($) {
$table = $("#account-single");
var model = [
{name: "ccusname", hidden: true, index: 'ccusname', label: '客户名称', width: 100, align: 'center'},
{name: "date", index: 'date', label: '单据日期', width: 100, align: 'center'},
{name: "ddh", index: 'ddh', label: '订单号', width: 120, align: 'left'},
{name: "digest", index: 'digest', label: '摘要', width: 220, align: 'left'},
{name: "zp", index: 'zp', label: '赠品金额', width: 180, align: 'right'},
{name: "jmoney", index: 'jmoney', label: '本期应收金额', width: 180, align: 'right'},
{name: "dmoney", index: 'dmoney', label: '本期收回金额', width: 180, align: 'right'},
{name: "balance", index: 'balance', label: '余额', width: 180, align: 'right'}
];
$table.jqGrid({
caption: '',
datatype: 'json',
mtype: 'POST',
url: app.url('customer/account/query'),
colModel: model,
rowNum: 1000,
multiselect: false,
viewrecords: true,
rownumbers: true,
height: getPanelHeight(),
footerrow: false,
postData: params,
grouping:true,
groupingView : {
groupField : ['ccusname'],//分组属性
groupColumnShow : [false,false],//是否显示分组列
groupText : ['<b>{0}</b>'],//表头显示数据(每组中包含的数据量)
groupCollapse :false,//加载数据时是否只显示分组的组信息
groupSummary : [false,false],//是否显示汇总 如果为true需要在colModel中进行配置summaryType:'max',summaryTpl:'<b>Max: {0}</b>'
groupDataSorted : false,//分组中的数据是否排序
groupOrder:['desc','desc'] , //分组后组的排列顺序
//showSummaryOnHide: true//是否在分组底部显示汇总信息并且当收起表格时是否隐藏下面的分组
},
gridComplete: function() {
$(this).jqGrid('setColsWidth');
},
loadComplete: function(res) {
var me = $(this);
me.jqGrid('initPagination', res);
}
});
})(jQuery);
function formQuery()
{
var query_form = $('#query-form');
var query = query_form.serializeArray();
for (var i = 0; i < query.length; i++) {
params[query[i].name] = query[i].value;
}
$table.jqGrid('setGridParam', {
postData: params,
page: 1
}).trigger('reloadGrid');
}
function getPanelHeight() {
var list = $('.list-jqgrid').position();
return top.iframeHeight - list.top - 45;
}
// 框架页面改变大小时会调用此方法
function iframeResize() {
// 框架改变大小时设置Panel高度
$table.jqGrid('setPanelHeight', getPanelHeight());
// resize jqgrid大小
$table.jqGrid('resizeGrid');
}
</script>