|
|
@@ -4836,6 +4836,8 @@ class StoreOrderRepository extends BaseRepository
|
|
4836
|
4836
|
if ($refund_order_id) {
|
|
4837
|
4837
|
$value['refund_order_id'] = $refund_order_id;
|
|
4838
|
4838
|
}
|
|
|
4839
|
+
|
|
|
4840
|
+ $value['fzone_paytype'] = json_decode($value['fzone_paytype'], true);
|
|
4839
|
4841
|
}
|
|
4840
|
4842
|
return compact('list', 'count');
|
|
4841
|
4843
|
}
|
|
|
@@ -6976,7 +6978,7 @@ class StoreOrderRepository extends BaseRepository
|
|
6976
|
6978
|
// $teshu_mer_id=implode(',',$teshu_mer_id);
|
|
6977
|
6979
|
$auto_close_order_timer = ((int)systemConfig('auto_close_order_timer')) ?: 15;
|
|
6978
|
6980
|
$appList = $this->dao->search(['uid' => $userId])
|
|
6979
|
|
- ->field('group_order_id,mer_id,cost,pay_price,pay_time,pay_type,distribution_mode,group_order_id,last_status,order_id,order_sn,paid,status,total_num,total_price,trade_no,coupon_price,create_time,pay_postage,real_name,total_postage,uid,user_address,user_phone,7 as source,seckill,delivery_type,exchange_phone,youhui_price,distribution_mode,verify_code,is_day_pay')
|
|
|
6981
|
+ ->field('group_order_id,fzone_paytype,user_address,user_phone,real_name,mer_id,cost,pay_price,pay_time,pay_type,distribution_mode,group_order_id,last_status,order_id,order_sn,paid,status,total_num,total_price,trade_no,coupon_price,create_time,pay_postage,real_name,total_postage,uid,user_address,user_phone,7 as source,seckill,delivery_type,exchange_phone,youhui_price,distribution_mode,verify_code,is_day_pay')
|
|
6980
|
6982
|
// ->whereNotIn('mer_id',$teshu_mer_id)
|
|
6981
|
6983
|
->where('test_order', 0)
|
|
6982
|
6984
|
->where('is_del', 0)
|
|
|
@@ -7006,6 +7008,7 @@ class StoreOrderRepository extends BaseRepository
|
|
7006
|
7008
|
$val['close_time'] = date('Y-m-d H:i:s', strtotime($val['create_time']) + 3 * 60);
|
|
7007
|
7009
|
}
|
|
7008
|
7010
|
$val['youhui_price'] = set_price_rtrim($val['youhui_price']);
|
|
|
7011
|
+ $val['fzone_paytype'] = json_decode($val['fzone_paytype'], true);
|
|
7009
|
7012
|
return $val;
|
|
7010
|
7013
|
});
|
|
7011
|
7014
|
if ($this->source == 'yhc') {
|