blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

修改订单

Browse Source
This commit is contained in:
邹景立 2021-01-29 18:34:17 +08:00
parent 8fc6c788b7
commit 56b793ac5f
3 changed files with 3771 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3783
admin_v6.sql
View File

File diff suppressed because it is too large Load Diff

6
app/data/controller/api/auth/Order.php
View File

@ -114,7 +114,7 @@ class Order extends Auth
'goods_spec' => $goodsItem['goods_spec'], 'goods_spec' => $goodsItem['goods_spec'],
// 数量处理 // 数量处理
'stock_sales' => $count, 'stock_sales' => $count,
'truck_tcode' => $goodsInfo['truck_tcode'], 'truck_code' => $goodsInfo['truck_code'],
'truck_count' => $goodsItem['number_express'] * $count, 'truck_count' => $goodsItem['number_express'] * $count,
// 费用字段 // 费用字段
'price_market' => $goodsItem['price_market'], 'price_market' => $goodsItem['price_market'],
@ -184,7 +184,7 @@ class Order extends Auth
$tCount = $this->app->db->name('ShopOrderItem')->where($map)->sum('truck_count'); $tCount = $this->app->db->name('ShopOrderItem')->where($map)->sum('truck_count');
// 根据地址计算运费 // 根据地址计算运费
$map = ['status' => 1, 'deleted' => 0, 'order_no' => $data['order_no']]; $map = ['status' => 1, 'deleted' => 0, 'order_no' => $data['order_no']];
$tCode = $this->app->db->name('ShopOrderItem')->where($map)->column('truck_tcode'); $tCode = $this->app->db->name('ShopOrderItem')->where($map)->column('truck_code');
[$amount, , , $remark] = TruckService::instance()->amount($tCode, $addr['province'], $addr['city'], $tCount); [$amount, , , $remark] = TruckService::instance()->amount($tCode, $addr['province'], $addr['city'], $tCount);
$this->success('计算运费成功', ['amount' => $amount, 'remark' => $remark]); $this->success('计算运费成功', ['amount' => $amount, 'remark' => $remark]);
} }
@ -212,7 +212,7 @@ class Order extends Auth
if (empty($order)) $this->error('不能修改地址'); if (empty($order)) $this->error('不能修改地址');
// 根据地址计算运费 // 根据地址计算运费
$map = ['status' => 1, 'deleted' => 0, 'order_no' => $data['order_no']]; $map = ['status' => 1, 'deleted' => 0, 'order_no' => $data['order_no']];
$tCodes = $this->app->db->name('ShopOrderItem')->where($map)->column('truck_tcode'); $tCodes = $this->app->db->name('ShopOrderItem')->where($map)->column('truck_code');
[$amount, $tCount, $tCode, $remark] = TruckService::instance()->amount($tCodes, $addr['province'], $addr['city'], $tCount); [$amount, $tCount, $tCode, $remark] = TruckService::instance()->amount($tCodes, $addr['province'], $addr['city'], $tCount);
// 创建订单发货信息 // 创建订单发货信息
$express = [ $express = [

4
app/data/view/shop_goods/form.html
View File

@ -42,9 +42,9 @@
<label class="layui-form-item block relative"> <label class="layui-form-item block relative">
<span class="color-green font-w7 label-required-prev">邮费模板</span> <span class="color-green font-w7 label-required-prev">邮费模板</span>
<span class="color-desc margin-left-5">Truck Template</span> <span class="color-desc margin-left-5">Truck Template</span>
<select class="layui-select" name="truck_tcode" lay-search> <select class="layui-select" name="truck_code" lay-search>
<option value="">--- 包 邮 ---</option> <option value="">--- 包 邮 ---</option>
{foreach $truckitems as $truck}{if isset($vo.truck_tcode) and $vo.truck_tcode eq $truck.code} {foreach $truckitems as $truck}{if isset($vo.truck_code) and $vo.truck_code eq $truck.code}
<option selected value="{$truck.code}">{$truck.code} - {$truck.name|default=''}</option> <option selected value="{$truck.code}">{$truck.code} - {$truck.name|default=''}</option>
{else} {else}
<option value="{$truck.code}">{$truck.code} - {$truck.name|default=''}</option> <option value="{$truck.code}">{$truck.code} - {$truck.name|default=''}</option>