|
|
@@ -279,7 +279,7 @@ class Apipf extends Start_Controller{
|
|
|
//要求订单必须为线下单，并且为processing或complete
|
|
|
private function getOrderList($email,$shop,$type = 2){
|
|
|
//var_dump('email = "'.$email.'" and shop = "'.$shop.'" and source != 1 and state in (207,216) ');
|
|
|
- $fdata = $this->fullorder->find_all('email = "'.$email.'" and shop = "'.$shop.'" and source != 1 and state in (207,216) ','shop,orderinfo,issku,quantity,fpdata,state,product,name,email,dtime,shouldmoney,shipremarks,librarytime,source','id desc');
|
|
|
+ $fdata = $this->fullorder->find_all('email = "'.$email.'" and shop = "'.$shop.'" and source != 1 and state in (207,216) ','shop,orderinfo,issku,quantity,fpdata,state,product,name,email,dtime,shouldmoney,shipremarks,librarytime,source,shopify','id desc');
|
|
|
//var_dump($fdata);
|
|
|
$ret_list = [];
|
|
|
$order_mount = 0;//订单总金额
|
|
|
@@ -370,6 +370,9 @@ class Apipf extends Start_Controller{
|
|
|
if($tmp_qty > $max_order_qty ){
|
|
|
$max_order_qty = $tmp_qty;
|
|
|
}
|
|
|
+ if($v['shop'] == 5){
|
|
|
+ $v['orderinfo'] = isset($v['shopify'])?$v['shopify']:$v['orderinfo'];
|
|
|
+ }
|
|
|
if($type == 1){
|
|
|
$ret_list[] = [
|
|
|
'order_qty'=>$jisuan_qty,
|
