|
@@ -1222,10 +1222,10 @@ class StoreOrder extends BaseModel
|
|
public static function getUserOrderList($uid, $status = '', $page = 0, $limit = 8)
|
|
public static function getUserOrderList($uid, $status = '', $page = 0, $limit = 8)
|
|
{
|
|
{
|
|
if ($page) $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)
|
|
if ($page) $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)
|
|
- ->field('uid,add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type,gift_uid,store_id')
|
|
|
|
|
|
+ ->field('pay_postage_sh,uid,add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type,gift_uid,store_id')
|
|
->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
|
|
->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
|
|
else $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)
|
|
else $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid|gift_uid', $uid)
|
|
- ->field('uid,add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type,gift_uid,store_id')
|
|
|
|
|
|
+ ->field('pay_postage_sh,uid,add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type,gift_uid,store_id')
|
|
->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
|
|
->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
|
|
foreach ($list as $k => $order) {
|
|
foreach ($list as $k => $order) {
|
|
$list[$k] = self::tidyOrder($order, true);
|
|
$list[$k] = self::tidyOrder($order, true);
|
|
@@ -1257,7 +1257,7 @@ class StoreOrder extends BaseModel
|
|
*/
|
|
*/
|
|
public static function searchUserOrder($uid, $order_id)
|
|
public static function searchUserOrder($uid, $order_id)
|
|
{
|
|
{
|
|
- $order = self::where('uid|gift_uid', $uid)->where('order_id', $order_id)->where('is_del', 0)->field('seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,delivery_type,shipping_type')
|
|
|
|
|
|
+ $order = self::where('uid|gift_uid', $uid)->where('order_id', $order_id)->where('is_del', 0)->field('pay_postage_sh,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,delivery_type,shipping_type')
|
|
->order('add_time DESC')->find();
|
|
->order('add_time DESC')->find();
|
|
if (!$order)
|
|
if (!$order)
|
|
return false;
|
|
return false;
|