storage

application/library/Our/ApiConst.php

@@ -192,7 +192,7 @@ class ApiConst
     const goodsStateWaitRecieve = 2;
     const goodsStateUnRecieve = 3;
     const goodsStateRecieved = 4;
-
+    const refundStateProccess = 1;
     const refundStateComplete = 3;
     //是否退款成功
     const refundSuccess = 1;

application/models/Business/Order/RefundService.php

@@ -234,7 +234,7 @@ class RefundServiceModel extends \Business\AbstractModel
             }
             $orderDao->setDb(DbNameConst::masterDBConnectName);
             $orderDao->db->doTransaction();
-            $order_info=$orderDao->findByOrderId($return['order_id'],$orderDao->getOrderDetailField());
+            $order_info=$orderDao->findByOrderId($return['order_id']);
             $refund_array = array();
             $refund_array['seller_time'] = TIMESTAMP;
             $refund_array['seller_state'] =$sellerState;//卖家处理状态:1为待审核,2为同意,3为不同意
@@ -259,7 +259,7 @@ class RefundServiceModel extends \Business\AbstractModel
                     ErrorModel::throwException(CodeConfigModel::updateIsRefundFail);
                 }
                 $push=\Our\Push::getInstance();
-                $pushData=array('storeId'=>$order_info['storeId'],
+                $pushData=array('storeId'=>$order_info['store_id'],
                     'type'=>ApiConst::messageRefund,
                     'waitReceiveCount'=>ApiConst::zero,
                     'waitDeliveryCount'=>ApiConst::zero,
@@ -297,6 +297,40 @@ class RefundServiceModel extends \Business\AbstractModel
                 $refund_array['seller_state'] = '2';
                 $refund_array['refund_state'] = ApiConst::refundStateComplete;
                 $refund_array['return_type'] = '1';//选择弃货
+                $storeDao=\DAO\StoreModel::getInstance();
+                $is_direct_refund = $storeDao->getInfoById($storeId, 'is_direct_refund', 'is_direct_refund');
+                if($is_direct_refund==ApiConst::one){
+                    $payment_type = $order_info['payment_type'];
+                    if(!in_array($payment_type,array(0,2))){
+                        $state = $refundReturnDao->storeRefund(array_merge($order_info, array('refund_order_no'=>$order_info['order_sn'], 'refund_amount'=> $refundAmount)));
+                        if (!$state) {
+                            //throw new Exception('更新订单信息失败');
+                            $orderDao->db->doRollback();
+                            return false;
+                        }
+                        if($payment_type==1) {  //微信支付
+                            $updateData = array('is_suc_refund'=>1,'gmt_update'=>TIMESTAMP,'seller_state'=>$refund_array['seller_state'],'refund_state'=>$refund_array['refund_state']);
+                        } else {
+                            $updateData = array('is_suc_refund'=>1,'gmt_update'=>TIMESTAMP);
+                        }
+                        $res=$refundReturnDao->update(array('refund_id'=>$returnDetail['refund_id']), $updateData);
+                        if(!$res){
+                            $refundReturnDao->db->doRollback();
+//                                showDialog('退款成功,退款表写入失败,请联系工作人员!',$reload,'error');
+                            return false;
+                        }
+                        $result= $orderGoodsDao->update(array('rec_id'=>$returnDetail['order_goods_id']), array('is_refund'=>1,'gmt_update'=>TIMESTAMP));
+                        if(!$result){
+                            $refundReturnDao->db->doRollback();
+//                            showDialog('refund_state_name',$reload,'error');
+                            return false;
+                        }
+                    }else{
+                        if(!in_array($payment_type,array(0,2))){
+                            $refund_array['refund_state']=ApiConst::refundStateProccess;
+                        }
+                    }
+                }
             }
             $refund_array['refund_amount']=$refundAmount;
             $state = $refundReturnDao->update($condition, $refund_array);
@@ -305,7 +339,7 @@ class RefundServiceModel extends \Business\AbstractModel
                 $sellerLogDao->record('退货处理，退货编号：'.$return['refund_sn']);
                 $orderDao->db->doCommit();
                 $push=\Our\Push::getInstance();
-                $pushData=array('storeId'=>$order_info['storeId'],
+                $pushData=array('storeId'=>$order_info['store_id'],
                     'type'=>ApiConst::messageRefund,
                     'waitReceiveCount'=>ApiConst::zero,
                     'waitDeliveryCount'=>ApiConst::zero,