订单列表

parent ea7cb880
...@@ -298,14 +298,17 @@ class OrderService ...@@ -298,14 +298,17 @@ class OrderService
$ext_price = round($b["goods_number"]*$b["goods_price"],2); $ext_price = round($b["goods_number"]*$b["goods_price"],2);
$merchandise_total += $ext_price; $merchandise_total += $ext_price;
} }
$merchandise_total = round($merchandise_total,2);
$priceInfo = OrderPriceModel::selectRaw("price_type,price") $priceInfo = OrderPriceModel::selectRaw("price_type,price")
->where("order_id",$order_id) ->where("order_id",$order_id)
->get()->toArray(); //金额类型(正数ID大于0,负数ID小于0)-8活动优惠 -7支付优惠 -6运费优惠 -5尾款减款 -4优惠券优惠金额 -3尾款 -2预付款 -1付款,1货款 2附加费 3运费 4退款 5支付手续费 ->get()->toArray(); //金额类型(正数ID大于0,负数ID小于0)-8活动优惠 -7支付优惠 -6运费优惠 -5尾款减款 -4优惠券优惠金额 -3尾款 -2预付款 -1付款,1货款 2附加费 3运费 4退款 5支付手续费
$priceArr = array_column($priceInfo,"price","price_type"); $priceArr = array_column($priceInfo,"price","price_type");
# $sub_total = OrderPriceModel::getOrderSubTotal($order_id);
$payment_surcharge_paypal = round($merchandise_total*0.046+0.5,2);
$temp[]=[ $ts =[
"order_id"=>$order_id, "order_id"=>$order_id,
"order_sn"=>$v["order_sn"], "order_sn"=>$v["order_sn"],
"order_amount"=>$v["order_amount"], "order_amount"=>$v["order_amount"],
...@@ -317,13 +320,16 @@ class OrderService ...@@ -317,13 +320,16 @@ class OrderService
"phone"=>\Arr::get($orderAddress,"phone"), "phone"=>\Arr::get($orderAddress,"phone"),
"shipping_address"=>\Arr::get($orderAddress,"detail_address"), "shipping_address"=>\Arr::get($orderAddress,"detail_address"),
"shipping"=>\Arr::get($priceArr,3,0), //运费 "shipping"=>\Arr::get($priceArr,3,0), //运费
"payment_surcharge"=>\Arr::get($priceArr,5,0), //支付手续费 "payment_surcharge_paypal"=>$payment_surcharge_paypal, //paypal 支付手续费
"payment_surcharge_ttl"=>35, //ttl 支付手续费
"merchandise_total"=>$merchandise_total, //商品总额 "merchandise_total"=>$merchandise_total, //商品总额
"sub_total"=>OrderPriceModel::getOrderSubTotal($order_id), //小计
"create_time"=>date('Y-m-d H:i:s', $v['create_time']), //下单时间 "create_time"=>date('Y-m-d H:i:s', $v['create_time']), //下单时间
# "over_time"=> $v["status"] == OrderModel::status_waiting_pay ? date('Y-m-d H:i:s', $v['create_time']+48*3600):"", //截止时间
"over_time"=> date('Y-m-d H:i:s', $v['create_time']+48*3600), //截止时间 "over_time"=> date('Y-m-d H:i:s', $v['create_time']+48*3600), //截止时间
]; ];
$ts["sub_total_payal"] = round($ts["payment_surcharge_paypal"]+$merchandise_total+$ts["shipping"],2); //paypal 小计
$ts["sub_total_ttl"] = round($ts["payment_surcharge_ttl"]+$merchandise_total+$ts["shipping"],2); //ttl 小计
$temp[] = $ts;
} }
#统计当前用户各个状态数量 #统计当前用户各个状态数量
......
...@@ -16,7 +16,7 @@ define('class_p', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function ...@@ -16,7 +16,7 @@ define('class_p', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function
page: class_p.page, page: class_p.page,
page_size: class_p.limit, page_size: class_p.limit,
"class_id1/eq": $("#class_id_two").val(), "class_id1/eq": $("#class_id_two").val(),
"brand_name/like": $(".brandvals").val() "semour_brand/like": $(".brandvals").val()
} }
if ($(".eqsort").hasClass("act")) { if ($(".eqsort").hasClass("act")) {
data_["goods_name/eq"] = $(".classsearchvals").val() data_["goods_name/eq"] = $(".classsearchvals").val()
...@@ -59,7 +59,7 @@ define('class_p', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function ...@@ -59,7 +59,7 @@ define('class_p', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function
class_p.page=api.getCurrent() class_p.page=api.getCurrent()
class_p.getData(); class_p.getData();
} }
}); });
} else { } else {
tool.NoData(".data-td") tool.NoData(".data-td")
...@@ -215,4 +215,4 @@ define('class_p', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function ...@@ -215,4 +215,4 @@ define('class_p', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function
}) })
seajs.use(['class_p']) seajs.use(['class_p'])
\ No newline at end of file
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