Skip to content

朱继来 / 后台订单管理

Go to a project
Commit c56dd8ca by 朱继来
Options

Merge branch 'zjl_adjust_20181008' into development

parents 76fc29a2 54bf524d
Expand all
Inline Side-by-side
Showing with 63 additions and 21 deletions
app/Http/Controllers/AddOrderController.php
......@@ -394,17 +394,20 @@ Class AddOrderController extends Controller
}
}
// 获取自营运费
public function getExpressFee(Request $request)
// 确认订单信息
public function confirm(Request $request)
{
if ($request->isMethod('post')) {
$data['uid'] = $request->input('uid');
$data['address_id'] = $request->input('address_id');
$data['uid'] = $request->input('uid', 0);
$data['address_id'] = $request->input('address_id', 0);
$data['cart_id'] = $request->input('cart_ids', '');
$data['user_coupon_id'] = $request->input('user_coupon_id', 0);
$data['type'] = $request->input('goods_type');
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$url = Config('website.api_domain').'cart/getExpressFeeByOrder';
$url = Config('website.api_domain').'cart/confirm';
$response = json_decode(curlApi($url, $data), true);
......@@ -425,6 +428,7 @@ Class AddOrderController extends Controller
$data['address_id'] = $request->input('address_id');
$data['cart_id'] = implode(',', $request->input('cart_ids'));
$data['type'] = $request->input('type');
$data['remark'] = $request->input('remark');
if ($data['type'] == 3) { // 自营线下订单
$data['address_name'] = $request->input('address_name');
......@@ -437,7 +441,8 @@ Class AddOrderController extends Controller
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$url = Config('website.api_domain').'order/createByOrderSystem';
// $url = Config('website.api_domain').'order/createByOrderSystem';
$url = Config('website.api_domain').'order/create';
$response = json_decode(curlApi($url, $data), true);
......
app/Http/Controllers/OrderController.php
......@@ -361,8 +361,8 @@ Class OrderController extends Controller
{
$info = $this->getOrderInfo($request, 1);
// 若为京东自营角色，则跳转到自营列表
if ($info['role'] == 6) {
// 若为京东自营、自营客服角色，则跳转到自营列表
if (in_array($info['role'], [6, 7])) {
return redirect('self_order');
}
......@@ -611,6 +611,7 @@ Class OrderController extends Controller
array('brand_name', '制造商'),
array('goods_number', '数量'),
array('goods_price', '单价'),
array('single_pre_price', '均摊后单价'),
array('goods_amount', '商品小计'),
array('goods_sum', '商品总额'),
array('shipping_fee', '运费'),
......@@ -771,7 +772,7 @@ Class OrderController extends Controller
})
->where('it.status', '<>', -1)
->where('o.order_goods_type', '=', $map['order_goods_type'])
->select('it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.brand_name', 'o.order_id', 'o.order_sn', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'a.consignee', 's.status as shipping_status', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'c.com_name', 'oe.send_remark')
->select('it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.single_pre_price', 'it.brand_name', 'o.order_id', 'o.order_sn', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'a.consignee', 's.status as shipping_status', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'c.com_name', 'oe.send_remark')
->groupBy('it.rec_id')
->orderBy('o.create_time', 'DESC')
->get();
......@@ -865,6 +866,7 @@ Class OrderController extends Controller
$tmp[$i]['goods_name'] = $order[$i]->order_goods_type == 1 ? $order[$i]->goods_name : getGoodsName($order[$i]->goods_id);
$tmp[$i]['goods_number'] = $order[$i]->goods_number;
$tmp[$i]['goods_price'] = $order[$i]->goods_price;
$tmp[$i]['single_pre_price'] = $order[$i]->single_pre_price;
$tmp[$i]['goods_amount'] = $order[$i]->goods_number*$order[$i]->goods_price;
$tmp[$i]['brand_name'] = $order[$i]->brand_name;
......
app/Http/Controllers/PermController.php
......@@ -55,6 +55,8 @@
return 5;
} else if ($department->name == '京东自营') {
return 6;
} else if ($department->name == '自营客服') {
return 7;
} else {
return 0;
}
......
app/Http/routes.php
......@@ -87,7 +87,7 @@ Route::group(['middleware' => 'web'], function () {
Route::post('/ajax/getCoupon', 'AddOrderController@getCoupon');
Route::get('/add_online', 'AddOrderController@addOnline');
Route::post('/ajax/getExpressFee', 'AddOrderController@getExpressFee');
Route::post('/ajax/confirm', 'AddOrderController@confirm');
Route::get('/add_offline', 'AddOrderController@addOffline');
Route::post('/ajax/getSku', 'AddOrderController@getSku');
......
public/css/detail.css
......@@ -147,6 +147,15 @@ li {
text-align: right;
display: none;
}
#remark {
border-radius: 4px;
padding: 5px;
resize: none;
margin-bottom: 10px;
}
.preferential_price{ /* 优惠金额 */
display: none;
}
/*提交订单成功页面*/
.section-1, .section-3{
......
resources/views/addOffline/content.blade.php
......@@ -201,6 +201,7 @@
<!-- 订单金额 -->
<div class="amount-section">
<textarea name="remark" id="remark" cols="30" rows="3" placeholder="填写订单备注信息"></textarea>
<p>应付金额：<span class="text-danger order_amount"></span></p>
</div>
</div>
......
resources/views/addOnline/content.blade.php
......@@ -352,10 +352,6 @@
</div>
<div class="ibox-content">
<input type="hidden" class="currency" name="currency" value="￥">
<input type="hidden" class="goods_amount" name="goods_amount" value="0">
<input type="hidden" class="express_fee" name="express_fee" value="0">
<div class="row">
<p class="con-title"><span>商品总额：</span></p>
<p class="con-val goods_amount_val"></p>
......@@ -371,15 +367,25 @@
</p>
</div>
<div class="row preferential_price">
<p class="con-title"><span>优惠金额：</span></p>
<p class="con-val preferential_price_val">0.00</p>
</div>
<div class="row">
<p class="con-title"><span>运费：</span></p>
<p class="con-val express_fee_val">￥0.00</p>
<p class="con-val express_fee_val">0.00</p>
</div>
<div class="row">
<p class="con-title"><span>应付金额：</span></p>
<p class="con-val text-danger order_amount"></p>
</div>
<div class="row">
<p class="con-title"><span>备注信息：</span></p>
<textarea name="remark" id="remark" cols="50" rows="3" placeholder="填写订单备注信息"></textarea>
</div>
</div>
</div>
......
resources/views/addOrder/content.blade.php
......@@ -372,9 +372,6 @@
</div>
<div class="ibox-content">
<input type="hidden" class="currency" name="currency" value="">
<input type="hidden" class="goods_amount" name="goods_amount" value="">
<div class="row">
<p class="con-title"><span>商品总额：</span></p>
<p class="con-val goods_amount_val"></p>
......@@ -390,10 +387,20 @@
</p>
</div>
<div class="row preferential_price">
<p class="con-title"><span>优惠金额：</span></p>
<p class="con-val preferential_price_val">0.00</p>
</div>
<div class="row">
<p class="con-title"><span>应付金额：</span></p>
<p class="con-val text-danger order_amount"></p>
</div>
<div class="row">
<p class="con-title"><span>备注信息：</span></p>
<textarea name="remark" id="remark" cols="50" rows="3" placeholder="填写订单备注信息"></textarea>
</div>
</div>
</div>
......
resources/views/detail/changeOrder.blade.php
......@@ -102,6 +102,7 @@
<input class="only_positive_nubme only_number num" name="change_info[{{$v['rec_id']}}][goods_number]" value="{{$v['goods_number']}}">
</td>
<td>
<span>{{$currency}}</span>
<input class="price only_number" name="change_info[{{$v['rec_id']}}][goods_price]" data-origin="{{$v['original_price']}}" value="{{$v['goods_price']}}">
</td>
</tr>
......@@ -142,6 +143,7 @@
<p class="sup_amount_val">{{$v['amount']}}</p>
</td>
<td>
<span>{{$currency}}</span>
<input class="adjust_extend_fee only_number" name="change_extend_fee[{{$k}}][extend_fee]" value="{{$v['extend_fee']}}">
</td>
......
resources/views/detail/content.blade.php
......@@ -457,11 +457,19 @@
@endforeach
@endif
</tbody>
<tfoot>
</table>
</div>
</tfoot>
@if ($order_info['order_remark'])
<div class="tabs-box">
<table class="table table-bordered table-hover"">
<tr>
<td width="10%">订单备注信息：</td>
<td>{{$order_info['order_remark']}}</td>
</tr>
</table>
</div>
@endif
<div class="tabs-box order-total">
<div>
......
resources/views/selfOrder/content.blade.php
......@@ -242,7 +242,7 @@
<div class="btn-group btn-group-xs">
<a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a>
@if (in_array('download_contract', $userPerms))
@if (in_array('self_order_download_contract', $userPerms))
<a class="btn btn-default download-contract" data-id="{{$v['order_id']}}" href="javascript:;">下载合同</a>
@endif
</div>
......
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