wugg 7 tháng trước cách đây
mục cha
commit
e8445a149c

+ 1 - 0
app/admin/controller/Activity.php

@@ -320,6 +320,7 @@ class Activity extends Base
                    }else {
                       $orderTax->save($Tax);
                    }
+                   $order->save(['updatetime'=>date("Y-m-d H:i:s")]);
                 };
                  Db::commit();
                } else throw new \Exception("设置失败");

+ 1 - 1
app/admin/model/OrderTax.php

@@ -19,7 +19,7 @@ class OrderTax extends Model {
               $goods= GoodCombind::where('spuCode',$spuCode)->select();
               if($goods->isEmpty()) return $result;
               foreach ($goods as $item){
-               $temp = GoodTax::getInfobySpuCode($item->spuCode,$order_type);
+               $temp = GoodTax::getInfobySpuCode($item->childCode,$order_type);
                if(empty($temp)) continue;
                $result[]=$temp;
               }

+ 2 - 0
app/command/SplitSale.php

@@ -241,6 +241,7 @@ class SplitSale extends Command
             'gold_price' => $sale['gold_price'] ?? 0,
             'cost_price' => $sale['cost_price'] ?? 0,
             'status' => $sale['status'] ?? 0,
+             'open_type'=>$sale['open_type'],
             'updatetime' => $sale['updatetime'],
             'delivery_day' => $sale['delivery_day'] ?? 0,
             'th_fee' => round(bcmul($sale_price, $sale['th_num'] ?? 0, 3), 2),
@@ -345,6 +346,7 @@ class SplitSale extends Command
             'last_time' => $cgd['last_time'] ?? '',
             'send_type' => $sale['send_type'] ?? '',
             'send_status' => $sale['send_status'] ?? '',
+            "open_type"=>$sale['open_type'],
             'th_num' => $sale['th_num'] ?? 0,
             'th_fee' => round(bcmul($good_price, $sale['th_num'] ?? 0, 3), 2),
             'updatetime' => $sale['updatetime'],