Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 7c3aa760 by 朱继来
Options

Merge branch 'zjl_pay_type_20190701' into development

parents 8efb446f a48b36c8
Inline Side-by-side
Showing with 50 additions and 17 deletions
app/Http/Controllers/OrderController.php
......@@ -481,11 +481,12 @@ Class OrderController extends Controller
$page->setConfig('theme', '%FIRST% %UP_PAGE% %LINK_PAGE% %DOWN_PAGE% %END% %HEADER%');
$show = $page->show();
$info['condition'] = $info['map'];
$info['sale_list'] = isset($sale_list) ? $sale_list : '';
$info['list'] = $response['data']['data'];
$info['count'] = $response['data']['count'];
$info['page'] = $show;
$info['condition'] = $info['map'];
$info['sale_list'] = isset($sale_list) ? $sale_list : '';
$info['list'] = $response['data']['data'];
$info['count'] = $response['data']['count'];
$info['page'] = $show;
$info['credit'] = isset($response['data']['credit']) ? $response['data']['credit'] : ''; // 自营判断是否为账期会员
return $info;
}
......@@ -764,7 +765,7 @@ Class OrderController extends Controller
"kefu_remark" => $request->input('kefu_remark', ''), // 客服备注
"freight_fee" => $request->input('freight_fee', 0), // 运费
];
// dd(curlApi($url, $resData, "POST"));
$temp = json_decode(curlApi($url, $resData, "POST"), true);
return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
......
app/Model/OrderModel.php
......@@ -175,8 +175,9 @@ class OrderModel extends Model
}
})
->where(function ($query) use ($map) {
// 线上订单
if (isset($map['online_order'])) {
if ($map['order_goods_type'] == 2) { // 自营获取线上、京东、象牙宝订单
$query->whereIn('o.order_type', [1, 3, 4]);
} else if (isset($map['online_order'])) { // 线上订单
$query->where('o.order_type', '=', $map['online_order']);
}
})
......
public/js/order.js
......@@ -104,12 +104,12 @@
}
} else { // 自营
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !test_order.is(':checked')) {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type) {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
......@@ -1252,13 +1252,16 @@
// }
// 判断付款类型
if (order_pay_type == 1) {
if (order_pay_type == 1 || order_pay_type == 4) { // 全款和货到猎芯付款
$('.order_all_pay').attr('checked', true);
$('.order_advance_pay').parent('label').show();
} else if (order_pay_type == 2) {
} else if (order_pay_type == 2) { // 预付款
$('.order_advance_pay').attr('checked', true);
$('.order_advance_pay').parent('label').show();
$('.show-advance-pay').show(); // 定金模块
} else if (order_pay_type == 3) { // 账期
$('.order_account_period').attr('checked', true);
$('.show-pay-time').hide();
}
// 选择付款类型
......
resources/views/detail/changeOrder.blade.php
......@@ -75,6 +75,16 @@
</table>
<hr/>
@else
<table class="table table-bordered table-hover check-table">
<tr>
<td class="check-table-title" width="20%">付款类型：</td>
<td class="check-select">
<label><input class="order_all_pay" type="radio" name="order_pay_type" value="1">全额付款</label>
<label><input class="order_account_period" type="radio" name="order_pay_type" value="3">账期</label>
</td>
</tr>
</table>
@endif
<!-- 调价 -->
......
resources/views/selfOrder/content.blade.php
......@@ -48,7 +48,16 @@
</select>
</dd>
</dl>
<dl>
<dt>付款类型：</dt>
<dd>
<select id="order_pay_type" name="order_pay_type" class="form-control order_pay_type selectpicker" title="全部">
<option value="">全部</option>
<option value="1">全款</option>
<option value="3">账期</option>
</select>
</dd>
</dl>
<dl>
<dt>销售类型：</dt>
<dd>
......@@ -207,6 +216,7 @@
<th class="pl30">订单编号</th>
<th class="pl30">应付金额</th>
<th class="pl30">订单状态</th>
<th class="pl30">付款类型</th>
<th class="pl30">销售类型</th>
<th class="pl30">支付方式</th>
<th class="pl30">客服</th>
......@@ -219,13 +229,18 @@
@if (empty($list))
<tr>
<td class="text-center" colspan="10">没有查询到相关记录~</td>
<td class="text-center" colspan="12">没有查询到相关记录~</td>
</tr>
@else
<tbody>
@foreach ($list as $v)
<tr>
<td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td>
<td class="show-list">
<?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?>
@if (isset($credit[$v['user_id']]) && $credit[$v['user_id']])
<span>(账期)</span>
@endif
</td>
<td class="show-list">{{$v['order_sn']}}</td>
<td class="show-list">
<?php
......@@ -249,6 +264,8 @@
}
?>
</td>
<td class="show-list"> {{ Config('params.order_pay_type')[$v['order_pay_type']] }} </td>
<td class="show-list">{{$v['sale_type'] == 1 ? '现卖' : '预售'}}</td>
<td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td>
......@@ -310,7 +327,7 @@
<!-- 点击展示内容 -->
<tr class="show-other-content">
<td colspan="11">
<td colspan="12">
<table class="table table-hover table-bordered">
<tr>
<td class="table-list-title">公司名称</td>
......@@ -425,7 +442,8 @@
$('.order_source_pf').selectpicker('val', order_source_pf.split(',')).trigger("change");
$('#order_invoice_status').selectpicker('val', order_invoice_status);
$('#order_send').selectpicker('val', order_send);
$('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
// $('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
$('.order_pay_type').selectpicker('val', order_pay_type);
$('.is_new').selectpicker('val', is_new.split(',')).trigger("change");
$('.business_type').selectpicker('val', business_type.split(',')).trigger("change");
......
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 sign in to comment