发货记录、添加工价、保温加收金额

app/admin/service/FengsuService.php

@@ -50,9 +50,9 @@ class FengsuService {
                     $getPackSpecsFee=JuShuiTanService::getPackSpecsFee($sku,$item['shopId'], $item['tradeOrderPrintVos'][0]['skuId'],$item['receiverProvince']);
                     $pack_specs=strval($getPackSpecsFee['surcharge_money']);
 
-                    $other_price=(string)$other_price;
-                    $other_price=strval($other_price);
-                    $other_price=bcadd($other_price,$pack_specs, 2);
+                    // $other_price=(string)$other_price;
+                    // $other_price=strval($other_price);
+                    // $other_price=bcadd($other_price,$pack_specs, 2);
 
                     //获取包装箱
                     $box = $customerSpec::getBoxId($shops->customer_id, $specs->variety_id, $specs->spec_id);
@@ -95,6 +95,9 @@ class FengsuService {
                         'region'        => $item['receiverProvince'].' '.$item['receiverCity'],
                         'other_price'   => $other_price,
                         'ship_date'     => substr($item['consignTime'], 0, 10),
+                        'incubator'   => $getPackSpecsFee['pack_specs_type'],
+                        'insulation_money'   => $getPackSpecsFee['surcharge_money'],
+                        'labor_cost_money'   => $getPackSpecsFee['data']['labor_cost_money']
                     ];
                 }
             }else{

app/admin/service/JuShuiTanService.php

@@ -43,9 +43,9 @@ class JuShuiTanService {
                     // 保温加收价格
                     $getPackSpecsFee=self::getPackSpecsFee($sku,$item['shopId'], $item['disInnerOrderGoodsViewList'][0]['shopSkuId'],$item['receiverState']);
                     $pack_specs=strval($getPackSpecsFee['surcharge_money']);
-                    $other_price=(string)$other_price;
-                    $other_price=strval($other_price);
-                    $other_price=bcadd($other_price,$pack_specs, 2);
+                    // $other_price=(string)$other_price;
+                    // $other_price=strval($other_price);
+                    // $other_price=bcadd($other_price,$pack_specs, 2);
 
                     //获取包装箱
                     $box = $customerSpec::getBoxId($shops->customer_id, $specs->variety_id, $specs->spec_id);
@@ -89,7 +89,9 @@ class JuShuiTanService {
                         'region'        => $item['receiverState'].' '.$item['receiverCity'],
                         'other_price'   => $other_price,
                         'ship_date'     => substr($item['deliveryDate'], 0, 10),
-                        'incubator'   => $getPackSpecsFee['pack_specs_type']
+                        'incubator'   => $getPackSpecsFee['pack_specs_type'],
+                        'insulation_money'   => $getPackSpecsFee['surcharge_money'],
+                        'labor_cost_money'   => $getPackSpecsFee['data']['labor_cost_money']
                     ];
                 }
             }else{
@@ -125,9 +127,9 @@ class JuShuiTanService {
         // 保温加收价格
         $getPackSpecsFee=self::getPackSpecsFee($sku,$shop_id, $sku_id,$item['province']);
         $pack_specs=strval($getPackSpecsFee['surcharge_money']);
-        $other_price=(string)$other_price;
-        $other_price=strval($other_price);
-        $other_price=bcadd($other_price,$pack_specs, 2);
+        // $other_price=(string)$other_price;
+        // $other_price=strval($other_price);
+        // $other_price=bcadd($other_price,$pack_specs, 2);
         //获取包装箱
         $box = $customerSpec::getBoxId($shops->customer_id, (int)$variety_id, (int)$spec_id);
         // $shopDelivery::create([
@@ -173,7 +175,9 @@ class JuShuiTanService {
             'region'        => $item['province'].' '.$item['city'],
             'other_price'   => $other_price,
             'ship_date'     => substr($item['consign_time'], 0, 10),
-            'incubator'   => $getPackSpecsFee['pack_specs_type']
+            'incubator'   => $getPackSpecsFee['pack_specs_type'],
+            'insulation_money'   => $getPackSpecsFee['surcharge_money'],
+            'labor_cost_money'   => $getPackSpecsFee['data']['labor_cost_money']
             
            
             

app/admin/view/shop/shop_delivery/index.html

@@ -58,6 +58,7 @@
                 {field: 'company_name', title: __('快递名称'),operate: 'LIKE'},
                 {field: 'waybill_no', title: __('快递单号'),operate: 'LIKE'},
                 {field: 'region', title: __('省市'),operate: false},
+                {field: 'labor_cost_money', title: __('工价'),operate: false},
                 {field: 'other_price', title: __('偏远加收金额'),operate: false},
                 { field: "incubator", title: "保温箱", operate: "select", searchList: { 0: "不是保温箱",1: "单层保温", 2: "双层保温" },formatter: function (data, row) {
                         let tag = Yunqi.formatter.tag;
@@ -73,6 +74,8 @@
                         }
                         return tag;
                     } },
+                {field: 'insulation_money', title: __('保温加收金额'),operate: false},
+                
                 {field: 'ship_date', title: __('录入时间'), width:80, operate:"date" },
                 {field: 'settlement_data', title: __('结算时间'),width: 100,operate:'date'},
                 {field: 'status', title: __('结算状态'), operate: 'select', width:85,searchList: {1: __('待结算'),2: __('已结算')},formatter:Yunqi.formatter.tag},