|
@@ -1091,10 +1091,10 @@ class StoreOrder extends BaseModel
|
|
|
public static function getUserOrderList($uid, $status = '', $page = 0, $limit = 8)
|
|
|
{
|
|
|
if ($page) $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid', $uid)
|
|
|
- ->field('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')
|
|
|
+ ->field('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,can_up_level')
|
|
|
->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
|
|
|
else $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid', $uid)
|
|
|
- ->field('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')
|
|
|
+ ->field('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,can_up_level')
|
|
|
->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
|
|
|
foreach ($list as $k => $order) {
|
|
|
$list[$k] = self::tidyOrder($order, true);
|
|
@@ -1126,7 +1126,7 @@ class StoreOrder extends BaseModel
|
|
|
*/
|
|
|
public static function searchUserOrder($uid, $order_id)
|
|
|
{
|
|
|
- $order = self::where('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', $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,can_up_level')
|
|
|
->order('add_time DESC')->find();
|
|
|
if (!$order)
|
|
|
return false;
|
|
@@ -2091,7 +2091,7 @@ class StoreOrder extends BaseModel
|
|
|
$oneuser = User::field('uid,nickname,level,spread_uid,give_stock_right')->find($user['spread_uid']);
|
|
|
$twouser = null;
|
|
|
if($oneuser['spread_uid']>0) {
|
|
|
- $twouser = User::field('uid,nickname,level,spread_uid,give_stock_right')->find($user['spread_uid']);
|
|
|
+ $twouser = User::field('uid,nickname,level,spread_uid,give_stock_right')->find($oneuser['spread_uid']);
|
|
|
}
|
|
|
$upgrade = 0;
|
|
|
foreach ($cartlist as $v) {
|
|
@@ -2121,7 +2121,7 @@ class StoreOrder extends BaseModel
|
|
|
$levelinfo = SystemUserLevel::find($twouser['level']);
|
|
|
if($levelinfo && $levelinfo['two']>0)
|
|
|
{
|
|
|
- $brokerage = bcmul($order['total_price'],bcdiv($levelinfo['one'],100,3),2);
|
|
|
+ $brokerage = bcmul($order['total_price'],bcdiv($levelinfo['two'],100,3),2);
|
|
|
User::where('uid', $twouser['uid'])->inc('brokerage_price', $brokerage)->update();
|
|
|
$str = sprintf("推荐%s用户,订单金额%2.f,获得推荐奖:%.2f", $user['nickname'],$order['total_price'], $brokerage);
|
|
|
UserBill::income('间推奖', $twouser['uid'], 'now_money', 'brokerage_price',$brokerage , $order['id'], bcadd($twouser['brokerage_price'], $brokerage, 2), $str, 1);
|