pc

application/models/Business/Order/RefundService.php

@@ -23,7 +23,7 @@ use Our\OrderConst;
  */
 class RefundServiceModel extends \Business\AbstractModel
 {
-    private $orderField = "buyer_id as buyerId,buyer_name as buyerName,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,need_shipping_fee as needShippingFee,payment_code as paymentCode,delay_time as delayTime";
+    private $orderField = "buyer_id as buyerId,buyer_name as buyerName,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,need_shipping_fee as needShippingFee,payment_code as paymentCode,delay_time as delayTime,gmt_update as gmtUpdate";
     private $orderGoodsField = "commis_rate as commisRate,goods_type as goodsType,order_id as orderId,rec_id as recId,goods_id as goodsId,goods_name as goodsName,goods_price as goodsPrice,goods_num as goodsNum,goods_image as goodsImage,goods_pay_price as goodsPayPrice,sale_act_id as saleActId,sale_id as saleId,comment_state as commentState,is_refund as isRefund,goods_spec as goodsSpec,goods_group as goodsGroup,refund_id as refundId";
 
     private $addressField = " mob_phone as MobPhone,tel_phone as TelPhone,address as address,area_info as areaInfo,lng,lat,address_id as addressId,subaddress as subAddress";

application/models/DAO/Order/RefundReturn.php

@@ -229,12 +229,17 @@ class RefundReturnModel extends \DAO\AbstractModel {
             //已收货
             case  ApiConst::orderStateComplete:
                 $order_refund = ApiConst::canRefundDay;//15:收货完成后可以申请退款退货
+                if($order['delayTime']>ApiConst::zero){
                     $delay_time = $order['delayTime']+60*60*24*$order_refund;
-                if ($delay_time > time()) {
+                }else{
+                    $delay_time = $order['gmtUpdate']+60*60*24*$order_refund;
+                }
+                if ($delay_time > TIMESTAMP) {
                     $refund = TRUE;
                 }else{
                     ErrorModel::throwException(CodeConfigModel::returnBeyondTimeError);
                 }
+
                 break;
             default:
                 $refund = FALSE;