@@ -30,7 +30,7 @@ class OrderServiceModel extends \Business\AbstractModel
private$storeField="offline_payway as offlinePayway";
private$orderMessageField="order_id as orderId,order_sn as orderSn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,buyer_id as buyerId,buyer_name as buyerName,accept_time as acceptTime";
private$orderMessageField="order_id as orderId,order_sn as orderSn,order_pay as orderPay,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,buyer_id as buyerId,buyer_name as buyerName,accept_time as acceptTime";
private$order;
...
...
@@ -54,7 +54,9 @@ class OrderServiceModel extends \Business\AbstractModel
{
return$this->orderGoodsField.',goods_commonid as goodsCommonid,goods_group as goodsGroup';
$where=Common::format(" han_order.buyer_id={0} and delete_state={1} and (order_id in({2}) or han_order.order_sn like '%{3}%')",$memberId,ApiConst::undeleteOrder,$orderIds,$keyword);
}else{
$where=Common::format(" han_order.buyer_id={0} and delete_state={1} and han_order.order_sn like '%{2}%'",$memberId,ApiConst::undeleteOrder,$keyword);
$where=Common::format(" han_order.buyer_id={0} and delete_state={1} and (order_id in({2}) or han_order.order_sn like '%{3}%')",$memberId,ApiConst::undeleteOrder,$orderIds,$keyword);
}else{
$where=Common::format(" han_order.buyer_id={0} and delete_state={1} and han_order.order_sn like '%{2}%'",$memberId,ApiConst::undeleteOrder,$keyword);