Browse Source

修改订单

邹景立 4 years ago
parent
commit
56b793ac5f
3 changed files with 3764 additions and 18 deletions
  1. 3759 13
      admin_v6.sql
  2. 3 3
      app/data/controller/api/auth/Order.php
  3. 2 2
      app/data/view/shop_goods/form.html

File diff suppressed because it is too large
+ 3759 - 13
admin_v6.sql


+ 3 - 3
app/data/controller/api/auth/Order.php

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

+ 2 - 2
app/data/view/shop_goods/form.html

@@ -42,9 +42,9 @@
         <label class="layui-form-item block relative">
             <span class="color-green font-w7 label-required-prev">邮费模板</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>
-                {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>
                 {else}
                 <option value="{$truck.code}">{$truck.code} - {$truck.name|default=''}</option>

Some files were not shown because too many files changed in this diff