Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 6d4f21e1 by 朱继来
Options

Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_qihuo_20181015

parents 3b41c2e9 6b098035
Inline Side-by-side
Showing with 122 additions and 108 deletions
app/Http/Controllers/AddOrderController.php
......@@ -187,9 +187,9 @@ Class AddOrderController extends Controller
$invoice = DB::connection('order')->table('lie_taxinfo')->where('tax_id', $tax_id)->first();
$invoice->province_val = $this->getAddress($invoice->consignee_province);
$invoice->city_val = $this->getAddress($invoice->consignee_city);
$invoice->district_val = $this->getAddress($invoice->consignee_district);
$invoice->province_val = $invoice->consignee_province ? $this->getAddress($invoice->consignee_province) : '';
$invoice->city_val = $invoice->consignee_city ? $this->getAddress($invoice->consignee_city) : '';
$invoice->district_val = $invoice->consignee_district ? $this->getAddress($invoice->consignee_district) : '';
return ['errcode' => 0, 'errmsg' => '', 'data' => $invoice];
}
......@@ -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');
}
......@@ -612,6 +612,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', '运费'),
......@@ -772,7 +773,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();
......@@ -866,6 +867,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,14 @@ li {
text-align: right;
display: none;
}
#remark {
border-radius: 4px;
padding: 5px;
resize: none;
}
.preferential_price{ /* 优惠金额 */
display: none;
}
/*提交订单成功页面*/
.section-1, .section-3{
......
public/js/add_order.js
......@@ -87,11 +87,14 @@
$('.user-info').delegate('#address', 'change', function() {
var user_id = $('.user_id').val();
var address_id = $(this).val();
var user_coupon_id = $('.user_coupon_id').val();
var cart_ids = [];
var goods_amount = parseFloat($('.goods_amount').val());
var currency = $('.currency').val();
var coupon_amount = $('.user_coupon_id').val() != '' ? parseFloat($('#user_coupon').data('amount')) : 0;
$('.shop-table tbody').find('tr').each(function() {
var cid = $(this).data('cid');
cart_ids.push(cid);
})
if (address_id) {
$.ajax({
url: '/ajax/selectAddr',
......@@ -108,9 +111,9 @@
$('.address-consignee').text(data.consignee);
$('.address-mobile').text(data.mobile);
$('.address-detail').text(data.province_val + data.city_val + data.district_val + data.detail_address);
if (goods_type == 2 && address_id) {
loading.getExpressFee(user_id, address_id); // 获取自营运费
if (cart_ids.length > 0) {
loading.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type); // 确认订单信息
}
}
}
......@@ -119,15 +122,9 @@
$('.address-content').hide();
$('.address_id').val('');
if (goods_type == 2) {
$('.express_fee').val(0);
$('.express_fee_val').text('￥0.00');
}
var express_fee = parseFloat($('.express_fee').val());
var order_amount = parseFloat(goods_amount-coupon_amount+express_fee).toFixed(4);
$('.order_amount').text(currency+order_amount);
if (cart_ids.length > 0) {
loading.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type); // 确认订单信息
}
}
})
......@@ -359,7 +356,7 @@
dataType: "json",
success: function(resp){
layer.msg(resp.errmsg);
loading.lists(user_id, goods_type, is_online); // 加载购物车列表
loading.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表
return false;
},
})
......@@ -394,10 +391,6 @@
success: function(resp){
if (resp.errcode == 0) {
loading.lists(user_id, goods_type, is_online); // 加载购物车列表
// var data = resp.data;
// self.parents('tr').find('.goods_price').text(data.goods_price);
// self.parents('tr').find('.goods_amount').text(data.goods_amount_format);
}
layer.msg(resp.errmsg);
......@@ -444,26 +437,22 @@
// 选择优惠券
$('#user_coupon').change(function(){
var coupon_id = $(this).val();
var goods_amount = parseFloat($('.goods_amount').val());
var currency = $('.currency').val();
var coupon_amount = parseFloat($(this).data('amount'));
var express_fee = 0;
var address_id = $('.address_id').val();
var user_id = $('.user_id').val();
var cart_ids = [];
if (goods_type == 2) {
express_fee = parseFloat($('.express_fee').val());
}
$('.shop-table tbody').find('tr').each(function() {
var cid = $(this).data('cid');
cart_ids.push(cid);
})
if (coupon_id) {
var order_amount = parseFloat(goods_amount-coupon_amount+express_fee).toFixed(4);
$('.user_coupon_id').val(coupon_id);
$('.order_amount').text(currency+order_amount);
} else {
$('.user_coupon_id').val('');
var order_amount = parseFloat(goods_amount+express_fee).toFixed(4);
$('.order_amount').text(currency+order_amount);
}
loading.confirm(user_id, address_id, cart_ids, coupon_id, goods_type); // 确认订单信息
})
// 提交订单
......@@ -472,6 +461,7 @@
var type = $(this).data('type');
var cart_ids = [];
var user_id = 0;
var remark = $('#remark').val();
if (is_online) {
user_id = $('.user_id').val();
......@@ -491,6 +481,7 @@
address_id: address_id,
type: type,
cart_ids: cart_ids,
remark: remark,
}
if (type == 3) { // 自营线下订单
......@@ -540,6 +531,7 @@
// 购物车商品列表
lists: function(user_id, goods_type, is_online, delivery_place="1") { // type：1-联营，2-自营
var self = this;
var user_coupon_id = $('.user_coupon_id').val() ? $('.user_coupon_id').val() : 0;
$.ajax({
type: 'post',
......@@ -556,6 +548,7 @@
var cart_ids = [];
if (len > 0) {
// 购物车列表
for (var i = 0; i < len; i++) {
html += '<tr data-cid="'+list[i].cart_id+'">'+
'<td>'+list[i].goods_id+'</td>'+
......@@ -570,48 +563,19 @@
'</tr>';
cart_ids.push(list[i].cart_id); // 购物车ID集合
order_amount += list[i].goods_number * list[i].goods_price;
}
order_amount = parseFloat(order_amount).toFixed(4);
if (list[0].currency == 1) {
currency = '￥';
} else {
currency = '$';
}
$('.shop-lists').show();
$('.shop-table tbody').empty().append(html);
if (is_online) {
$('.order-info').show();
$('.goods_amount').val(order_amount);
$('.currency').val(currency);
$('.goods_amount_val').empty().text(currency+order_amount);
$('.order_amount').empty().text(currency+order_amount);
self.getCoupon(user_id, goods_type, cart_ids); // 获取最优的优惠券
var address_id = $('.address_id').val();
if (goods_type == 2 && address_id) {
self.getExpressFee(user_id, address_id); // 获取自营运费
var express_fee = $('.express_fee').val();
$('.order_amount').empty().text(currency+order_amount+express_fee);
}
} else {
$('.amount-section').show();
$('.order_amount').empty().text(currency+order_amount);
}
var address_id = $('.address_id').val();
self.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type, is_online); // 确认订单信息
}
} else {
$('.shop-lists').hide();
if (is_online) {
// $('.goods_amount').val(''); // 清空值
$('.order-info').hide();
$('.order-info').hide();
} else {
$('.amount-section').hide();
}
......@@ -653,26 +617,43 @@
})
},
// 获取自营运费
getExpressFee: function(user_id, address_id) {
// 确认订单信息
confirm: function(user_id, address_id, cart_ids, user_coupon_id, goods_type, is_online=1) {
var self = this;
$.ajax({
type: 'post',
url: '/ajax/getExpressFee',
data: {uid: user_id, address_id: address_id},
url: '/ajax/confirm',
data: {uid: user_id, address_id: address_id, cart_ids: cart_ids, user_coupon_id: user_coupon_id, goods_type: goods_type},
dataType: "json",
success: function(resp){
success: function(resp){console.log(resp);
if (resp.errcode == 0) {
var data = parseFloat(resp.data);
var data = resp.data;
if (is_online) {
$('.order-info').show();
$('.express_fee').val(data);
$('.express_fee_val').empty().text('￥' + data);
$('.goods_amount_val').empty().text(data.goods_total_format); // 商品总额
$('.order_amount').empty().text(data.order_amount_format); // 订单总额
var goods_amount = parseFloat($('.goods_amount').val());
var currency = $('.currency').val();
var coupon_amount = $('.user_coupon_id').val() != '' ? parseFloat($('#user_coupon').data('amount')) : 0;
var order_amount = parseFloat(goods_amount-coupon_amount+data).toFixed(4);
// 若优惠券ID存在，则不用再推荐
if (!user_coupon_id) {
$('.preferential_price').hide();
$('.preferential_price_val').empty();
self.getCoupon(user_id, goods_type, cart_ids); // 获取最优的优惠券
} else {
$('.preferential_price').show();
$('.preferential_price_val').empty().text(data.preferential_price_format);
}
$('.order_amount').empty().text(currency+order_amount);
if (goods_type == 2 && address_id) {
$('.express_fee_val').empty().text(data.finally_shipping_price_format); // 运费
}
} else {
$('.amount-section').show();
$('.order_amount').empty().text(data.order_amount_format);
}
}
return false;
......
resources/views/addOffline/content.blade.php
......@@ -197,6 +197,8 @@
</thead>
<tbody></tbody>
</table>
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</div>
<!-- 订单金额 -->
......
resources/views/addOnline/content.blade.php
......@@ -124,9 +124,9 @@
<label class="radio-inline">
<input type="radio" name="inv_type" class="radio-inv-type" value="4"> 增值税普通发票
</label>
<label class="radio-inline">
<!-- <label class="radio-inline">
<input type="radio" name="inv_type" class="radio-inv-type" value=""> 不开发票
</label>
</label> -->
</div>
</div>
......@@ -343,6 +343,8 @@
</thead>
<tbody></tbody>
</table>
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</div>
</div>
......@@ -351,11 +353,7 @@
<h3>订单信息</h3>
</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="ibox-content">
<div class="row">
<p class="con-title"><span>商品总额：</span></p>
<p class="con-val goods_amount_val"></p>
......@@ -371,15 +369,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 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>
</div>
</div>
......
resources/views/addOrder/content.blade.php
......@@ -361,8 +361,10 @@
<th width="5%">操作</th>
</tr>
</thead>
<tbody></tbody>
<tbody></tbody>
</table>
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</div>
</div>
......@@ -372,9 +374,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>
......@@ -389,11 +388,16 @@
</select>
</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>
</div>
</div>
......
resources/views/detail/changeOrder.blade.php
......@@ -110,6 +110,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>
<!-- 销售类型为预售时展示 -->
......@@ -160,6 +161,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
......@@ -458,7 +458,12 @@
@endif
</tbody>
<tfoot>
@if ($order_info['order_remark'])
<tr>
<td>订单备注信息：</td>
<td colspan="8">{{$order_info['order_remark']}}</td>
</tr>
@endif
</tfoot>
</table>
</div>
......
resources/views/selfOrder/content.blade.php
......@@ -256,7 +256,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