Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 709bc2c1 by 朱继来
Options

Merge branch 'zjl_order_gift_20210107'

parents 784c7247 0e942c37
Inline Side-by-side
Showing with 93 additions and 28 deletions
app/Http/Controllers/OrderController.php
...@@ -1716,9 +1716,10 @@ Class OrderController extends Controller ...@@ -1716,9 +1716,10 @@ Class OrderController extends Controller
'order_shipping_inside' => $temp['data']['order_shipping_inside'], 'order_shipping_inside' => $temp['data']['order_shipping_inside'],
'actionLog' => $actionLog, 'actionLog' => $actionLog,
'erpPayLog' => $erpPayLog, 'erpPayLog' => $erpPayLog,
'order_refund_info' => $temp['data']['order_refund_info'], // 'order_refund_info' => $temp['data']['order_refund_info'],
'order_refund_items' => $temp['data']['order_refund_items'], // 'order_refund_items' => $temp['data']['order_refund_items'],
'order_extra' => $temp['data']['order_extra'], 'order_extra' => $temp['data']['order_extra'],
'order_gift' => $temp['data']['order_gift'],
]; ];
// 自营物流信息 // 自营物流信息
......
public/css/detail.css
...@@ -119,7 +119,7 @@ li { ...@@ -119,7 +119,7 @@ li {
} }
/* 后台新增订单 start */ /* 后台新增订单 start */
.user-info, .address-content, .invoice-content, .order-info, .client-info { .user-info, .address-content, .invoice-content, .order-info, .client-info, .order-gift-info {
display: none; display: none;
} }
......
public/js/add_order.js
...@@ -355,8 +355,10 @@ ...@@ -355,8 +355,10 @@
case 1: html += '<th>限时限量</th>'; break; case 1: html += '<th>限时限量</th>'; break;
case 2: html += '<th>活动价</th>'; break; case 2: html += '<th>活动价</th>'; break;
case 3: html += '<th>会员价</th>'; break; case 3: html += '<th>会员价</th>'; break;
case 6: html += '<th>自营清库存</th>'; break;
case 7: html += '<th>团购价</th>'; break; case 7: html += '<th>团购价</th>'; break;
case 8: html += '<th>折扣价</th>'; break; case 8: html += '<th>折扣价</th>'; break;
case 10: html += '<th>活动打折</th>'; break;
default: html += '<th></th>'; break; default: html += '<th></th>'; break;
} }
} }
...@@ -944,8 +946,10 @@ ...@@ -944,8 +946,10 @@
var order_amount = 0; var order_amount = 0;
var currency = ''; var currency = '';
var cart_ids = []; var cart_ids = [];
var cart_gift = resp.data.cart_gift; // 订单赠品信息
if (len == 0) return false;
if (len > 0) {
var buyer = ''; var buyer = '';
// list = list.reverse(); // list = list.reverse();
// 购物车列表 // 购物车列表
...@@ -994,7 +998,7 @@ ...@@ -994,7 +998,7 @@
var address_id = $('.address_id').val(); var address_id = $('.address_id').val();
self.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type, is_online); // 确认订单信息 self.confirm(user_id, address_id, cart_ids, user_coupon_id, goods_type, is_online); // 确认订单信息
}
// 自营商品检查数量 // 自营商品检查数量
// if (goods_type == 2) { // 20200826 订单合并后，不以goods_type为判断条件 // if (goods_type == 2) { // 20200826 订单合并后，不以goods_type为判断条件
...@@ -1033,7 +1037,37 @@ ...@@ -1033,7 +1037,37 @@
self.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表 self.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表
} }
// } // }
// 赠品信息
if (cart_gift.err_code == 0) {
var gift_len = cart_gift.data.length;
var gift_data = cart_gift.data;
var str = '';
for (var i = 0; i < gift_len; i++) {
str += '<tr>\
<td>'+gift_data[i].activity_id+'</td>\
<td>\
<div class="layer-photos-demo">\
<a><img src="'+gift_data[i].pic+'" width="20" height="20"></a>\
</div>\
</td>\
<td>'+gift_data[i].item_name+'</td>\
<td>'+gift_data[i].num+'</td>\
<td>'+gift_data[i].content+'</td>\
</tr>';
}
$('.gift-table tbody').empty().append(str);
$('.order-gift-info').show();
} else { } else {
$('.order-gift-info').hide();
}
return false;
}
layer.msg(resp.errmsg || '网络异常'); layer.msg(resp.errmsg || '网络异常');
$('.shop-lists').hide(); $('.shop-lists').hide();
...@@ -1043,7 +1077,6 @@ ...@@ -1043,7 +1077,6 @@
} else { } else {
$('.amount-section').hide(); $('.amount-section').hide();
} }
}
}, },
}); });
}, },
...@@ -1099,7 +1132,7 @@ ...@@ -1099,7 +1132,7 @@
url: '/ajax/confirm', 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, is_online: is_online, business_type: business_type, zy_delivery_type: zy_delivery_type}, data: {uid: user_id, address_id: address_id, cart_ids: cart_ids, user_coupon_id: user_coupon_id, goods_type: goods_type, is_online: is_online, business_type: business_type, zy_delivery_type: zy_delivery_type},
dataType: "json", dataType: "json",
success: function(resp){console.log(resp); success: function(resp){
if (resp.errcode == 0) { if (resp.errcode == 0) {
var data = resp.data; var data = resp.data;
......
resources/views/addOrder/content.blade.php
...@@ -462,6 +462,27 @@ ...@@ -462,6 +462,27 @@
</div> </div>
</div> </div>
<div class="order-gift-info">
<div class="ibox-title">
<h3>赠品信息</h3>
</div>
<div class="ibox-content">
<table class="table table-bordered table-hover gift-table">
<thead>
<tr>
<th width="10%">活动ID</th>
<th width="20%">赠品图片</th>
<th width="20%">赠品名称</th>
<th width="20%">赠品数量</th>
<th width="30%">赠品说明</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
</div>
<div class="order-info"> <div class="order-info">
<div class="ibox-title"> <div class="ibox-title">
<h3>订单信息</h3> <h3>订单信息</h3>
......
resources/views/detail/detail_base_info.blade.php
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
@endif --> @endif -->
<th width="5%">订单编号</th> <th width="5%">订单编号</th>
@if ($order_info['order_goods_type'] == 1)
<th width="13%">ERP单号</th>
@endif
<th>订单状态</th> <th>订单状态</th>
<th>用户账号</th> <th>用户账号</th>
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
...@@ -42,6 +45,9 @@ ...@@ -42,6 +45,9 @@
<tr> <tr>
<td>{{ $order_info['order_sn'] }}</td> <td>{{ $order_info['order_sn'] }}</td>
@if ($order_info['order_goods_type'] == 1)
<td>{{ $order_temp_info['erp_sn'] }}</td>
@endif
<td>{{ Config('params.order_status')[$order_info['status']] }}</td> <td>{{ Config('params.order_status')[$order_info['status']] }}</td>
<td>{{ isset($user_info['mobile']) ? $user_info['mobile'] : $user_info['email'] }}</td> <td>{{ isset($user_info['mobile']) ? $user_info['mobile'] : $user_info['email'] }}</td>
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
......
resources/views/detail/detail_items_info.php
...@@ -211,39 +211,43 @@ ...@@ -211,39 +211,43 @@
<?php } ?> <?php } ?>
</tfoot> </tfoot>
</table> </table>
</div>
<!-- 退款已处理 --> <!-- 赠品信息 -->
<?php if ($order_refund_info['status'] == 10 && $order_price_info['refund_price'] != 0) { ?> <?php if (!empty($order_gift)) { ?>
<hr> <hr>
<table class="table"> <table class="table table-bordered">
<thead> <thead>
<tr class="caption"> <tr class="caption">
<th>退款型号</th> <th>赠品活动ID</th>
<th>退款数量</th> <th>赠品图片</th>
<th>价格</th> <th>赠品名称</th>
<th>小计</th> <th>数量</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($order_refund_items as $k=>$v) { ?> <?php foreach ($order_gift as $k=>$v) { ?>
<tr> <tr>
<td><?= $v['goods_name'] ?></td> <td><?= $v['gift_info']['activity_id'] ?></td>
<td><?= $v['refund_num'] ?></td> <td>
<td><?= $currency . $v['single_pre_price'] ?></td> <div class="layer-photos-demo">
<td><?= $currency . number_format($v['refund_num'] * $v['single_pre_price'], 4) ?></td> <a><img src="<?= $v['gift_info']['pic'] ?>" width="20" height="20"></a>
</div>
</td>
<td><?= $v['gift_info']['item_name'] ?></td>
<td><?= $v['gift_info']['num'] ?></td>
</tr> </tr>
<?php } ?> <?php } ?>
<tr>
<td>手动差价</td>
<td></td>
<td></td>
<td><?= '-' . $order_refund_info['price_fall'] ?></td>
</tr>
</tbody> </tbody>
<script>
layer.photos({
photos: '.layer-photos-demo'
,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
});
</script>
</table> </table>
<?php } ?> <?php } ?>
</div>
<div class="order-total" style="margin-top: 30px;"> <div class="order-total" style="margin-top: 30px;">
<div> <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